The Party Profile page doesn't display in IE7.
-Adrian
[EMAIL PROTECTED] wrote:
Author: apatel
Date: Tue Apr 29 19:02:04 2008
New Revision: 652225
URL: http://svn.apache.org/viewvc?rev=652225&view=rev
Log:
Adding screenlet for mytasks. Also converted Party Profile page into two
column. Shubham thanks for your help.
Added:
ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/mytasks.ftl
(with props)
Removed:
ofbiz/trunk/applications/marketing/webapp/sfa/findSfaParty.ftl
Modified:
ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml
ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml
Added:
ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/mytasks.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/mytasks.ftl?rev=652225&view=auto
==============================================================================
---
ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/mytasks.ftl
(added)
+++
ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/mytasks.ftl
Tue Apr 29 19:02:04 2008
@@ -0,0 +1,138 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<#setting locale = locale.toString()>
+<#setting time_zone = timeZone.getID()>
+<div class="screenlet">
+ <div class="screenlet-title-bar">
+ <ul>
+ <li class="h3">${uiLabelMap.WorkEffortMyCurrentTaskList}</li>
+ <li><a
href="<@ofbizContentUrl>/workeffort/control/EditWorkEffort?workEffortTypeId=TASK&currentStatusId=CAL_NEEDS_ACTION</@ofbizContentUrl>">${uiLabelMap.WorkEffortNewTask}</a></li>
+ </ul>
+ <br class="clear"/>
+ </div>
+ <h3>${uiLabelMap.WorkEffortAssignedTasks}</h3>
+ <table class="basic-table hover-bar" cellspacing="0">
+ <tr class="header-row">
+ <td>${uiLabelMap.CommonStartDateTime}</td>
+ <td>${uiLabelMap.WorkEffortPriority}</td>
+ <td>${uiLabelMap.WorkEffortStatus}</td>
+ <td>${uiLabelMap.WorkEffortTaskName}</td>
+ <td>${uiLabelMap.CommonEdit}</td>
+ </tr>
+ <#assign alt_row = false>
+ <#list tasks as workEffort>
+ <tr<#if alt_row> class="alternate-row"</#if>>
+ <td>${(workEffort.estimatedStartDate.toString())?if_exists}</td>
+ <td>${workEffort.priority?if_exists}</td>
+ <td>${(delegator.findByPrimaryKeyCache("StatusItem",
Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId",
workEffort.getString("currentStatusId"))).get("description",locale))?if_exists}</td>
+ <td><a
href="<@ofbizContentUrl>/workeffort/control/WorkEffortSummary?workEffortId=${workEffort.workEffortId}</@ofbizContentUrl>">${workEffort.workEffortName}</a></td>
+ <td class="button-col"><a
href="<@ofbizContentUrl>/workeffort/control/WorkEffortSummary?workEffortId=${workEffort.workEffortId}</@ofbizContentUrl>">${workEffort.workEffortId}</a></td>
+ </tr>
+ <#assign alt_row = !alt_row>
+ </#list>
+ </table>
+ <#if (activities.size() > 0)>
+ <h3>${uiLabelMap.WorkEffortWorkflowActivitiesUser}</h3>
+ <table class="basic-table hover-bar" cellspacing="0">
+ <tr class="header-row">
+ <td>${uiLabelMap.CommonStartDateTime}</td>
+ <td>${uiLabelMap.WorkEffortPriority}</td>
+ <td>${uiLabelMap.WorkEffortActivityStatus}</td>
+ <td>${uiLabelMap.WorkEffortMyStatus}</td>
+ <#-- <td>${uiLabelMap.PartyPartyId}</td> -->
+ <td>${uiLabelMap.PartyRoleId}</td>
+ <td>${uiLabelMap.WorkEffortActivityName}</td>
+ <td>${uiLabelMap.CommonEdit}</td>
+ </tr>
+ <#assign alt_row = false>
+ <#list activities as workEffort>
+ <tr<#if alt_row> class="alternate-row"</#if>>
+ <td>${(workEffort.estimatedStartDate.toString())?if_exists}</td>
+ <td>${workEffort.priority?if_exists}</td>
+ <td>${(delegator.findByPrimaryKeyCache("StatusItem",
Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId",
workEffort.getString("currentStatusId"))).get("description",locale))?if_exists}</td>
+ <td>${(delegator.findByPrimaryKeyCache("StatusItem",
Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId",
workEffort.getString("statusId"))).get("description",locale))?if_exists}</td>
+ <#-- <td>${workEffort.partyId}</td> -->
+ <td>${workEffort.roleTypeId}</td>
+ <td><a
href="<@ofbizContentUrl>/workeffort/control/WorkEffortSummary?workEffortId=${workEffort.workEffortId}</@ofbizContentUrl>">${workEffort.workEffortName}</a></td>
+ <td class="button-col"><a
href="<@ofbizContentUrl>/workeffort/control/WorkEffortSummary?workEffortId=${workEffort.workEffortId}</@ofbizContentUrl>">${workEffort.workEffortId}</a></td>
+ </tr>
+ <#assign alt_row = !alt_row>
+ </#list>
+ </table>
+ </#if>
+ <#if (roleActivities.size() > 0)>
+ <h3>${uiLabelMap.WorkEffortWorkflowActivitiesUserRole}</h3>
+ <table class="basic-table hover-bar" cellspacing="0">
+ <tr class="header-row">
+ <td>${uiLabelMap.CommonStartDateTime}</td>
+ <td>${uiLabelMap.WorkEffortPriority}</td>
+ <td>${uiLabelMap.WorkEffortActivityStatus}</td>
+ <td>${uiLabelMap.WorkEffortMyStatus}</td>
+ <#-- <td>${uiLabelMap.PartyPartyId}</td> -->
+ <td>${uiLabelMap.PartyRoleId}</td>
+ <td>${uiLabelMap.WorkEffortActivityName}</td>
+ <td>${uiLabelMap.CommonEdit}</td>
+ </tr>
+ <#assign alt_row = false>
+ <#list roleActivities as workEffort>
+ <tr<#if alt_row> class="alternate-row"</#if>>
+ <td>${(workEffort.estimatedStartDate.toString())?if_exists}</td>
+ <td>${workEffort.priority?if_exists}</td>
+ <td>${(delegator.findByPrimaryKeyCache("StatusItem",
Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId",
workEffort.getString("currentStatusId"))).get("description",locale))?if_exists}</td>
+ <td>${(delegator.findByPrimaryKeyCache("StatusItem",
Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId",
workEffort.getString("statusId"))).get("description",locale))?if_exists}</td>
+ <#-- <td>${workEffort.partyId}</td> -->
+ <td>${workEffort.roleTypeId}</td>
+ <td><a
href="<@ofbizContentUrl>/workeffort/control/WorkEffortSummary?workEffortId=${workEffort.workEffortId}</@ofbizContentUrl>">${workEffort.workEffortName}</a></td>
+ <td class="button-col"><a
href="<@ofbizContentUrl>/workeffort/control/acceptRoleAssignment?workEffortId=${workEffort.workEffortId}&partyId=${workEffort.partyId}&roleTypeId=${workEffort.roleTypeId}&fromDate=${workEffort.fromDate.toString()}</@ofbizContentUrl>">${uiLabelMap.WorkEffortAcceptAssignment} [${workEffort.workEffortId}]</a></td>
+ </tr>
+ <#assign alt_row = !alt_row>
+ </#list>
+ </table>
+ </#if>
+ <#if (groupActivities.size() > 0)>
+ <h3>${uiLabelMap.WorkEffortWorkflowActivitiesUserGroup}</h3>
+ <table class="basic-table hover-bar" cellspacing="0">
+ <tr class="header-row">
+ <td>${uiLabelMap.CommonStartDateTime}</td>
+ <td>${uiLabelMap.WorkEffortPriority}</td>
+ <td>${uiLabelMap.WorkEffortActivityStatus}</td>
+ <td>${uiLabelMap.WorkEffortMyStatus}</td>
+ <td>${uiLabelMap.PartyGroupPartyId}</td>
+ <#-- <td>${uiLabelMap.PartyRoleId}</td> -->
+ <td>${uiLabelMap.WorkEffortActivityName}</td>
+ <td>${uiLabelMap.CommonEdit}</td>
+ </tr>
+ <#assign alt_row = false>
+ <#list groupActivities as workEffort>
+ <tr<#if alt_row> class="alternate-row"</#if>>
+ <td>${(workEffort.estimatedStartDate.toString())?if_exists}</td>
+ <td>${workEffort.priority?if_exists}</td>
+ <td>${(delegator.findByPrimaryKeyCache("StatusItem",
Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId",
workEffort.getString("currentStatusId"))).get("description",locale))?if_exists}</td>
+ <td>${(delegator.findByPrimaryKeyCache("StatusItem",
Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId",
workEffort.getString("statusId"))).get("description",locale))?if_exists}</td>
+ <td>${workEffort.groupPartyId}</td>
+ <#-- <td>${workEffort.roleTypeId}</td> -->
+ <td><a
href="<@ofbizContentUrl>/workeffort/control/WorkEffortSummary?workEffortId=${workEffort.workEffortId}</@ofbizContentUrl>">${workEffort.workEffortName}</a></td>
+ <td class="button-col"><a
href="<@ofbizContentUrl>/workeffort/control/acceptassignment?workEffortId=${workEffort.workEffortId}&partyId=${workEffort.partyId}&roleTypeId=${workEffort.roleTypeId}&fromDate=${workEffort.fromDate}</@ofbizContentUrl>">${uiLabelMap.WorkEffortAcceptAssignment} [${workEffort.workEffortId}]</a></td>
+ </tr>
+ <#assign alt_row = !alt_row>
+ </#list>
+ </table>
+ </#if>
+</div>
Propchange:
ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/mytasks.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/mytasks.ftl
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange:
ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/mytasks.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml?rev=652225&r1=652224&r2=652225&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml Tue Apr 29
19:02:04 2008
@@ -95,21 +95,30 @@
</container>
</fail-widgets>
</section>
- <include-screen name="Party"
location="component://party/widget/partymgr/ProfileScreens.xml"/>
- <include-screen name="Contact"
location="component://party/widget/partymgr/ProfileScreens.xml"/>
- <include-screen name="LoyaltyPoints"
location="component://party/widget/partymgr/ProfileScreens.xml"/>
- <include-screen name="PaymentMethods"
location="component://party/widget/partymgr/ProfileScreens.xml"/>
- <include-screen name="AvsSettings"
location="component://party/widget/partymgr/ProfileScreens.xml"/>
- <include-screen name="FinAccounts"
location="component://party/widget/partymgr/ProfileScreens.xml"/>
- <include-screen name="UserLogin"
location="component://party/widget/partymgr/ProfileScreens.xml"/>
- <include-screen name="Attributes"
location="component://party/widget/partymgr/ProfileScreens.xml"/>
- <include-screen name="Visits"
location="component://party/widget/partymgr/ProfileScreens.xml"/>
- <include-screen name="Cart"
location="component://party/widget/partymgr/ProfileScreens.xml"/>
- <include-screen name="SerializedInventory"
location="component://party/widget/partymgr/ProfileScreens.xml"/>
- <include-screen name="Subscriptions"
location="component://party/widget/partymgr/ProfileScreens.xml"/>
- <include-screen name="Content"
location="component://party/widget/partymgr/ProfileScreens.xml"/>
- <include-screen name="ShipperAccount"
location="component://party/widget/partymgr/ProfileScreens.xml"/>
- <include-screen name="Notes"
location="component://party/widget/partymgr/ProfileScreens.xml"/>
+ <section>
+ <widgets>
+ <container style="lefthalf">
+ <include-screen name="Party"
location="component://party/widget/partymgr/ProfileScreens.xml"/>
+ <include-screen name="Contact"
location="component://party/widget/partymgr/ProfileScreens.xml"/>
+ <include-screen name="LoyaltyPoints"
location="component://party/widget/partymgr/ProfileScreens.xml"/>
+ <include-screen name="PaymentMethods"
location="component://party/widget/partymgr/ProfileScreens.xml"/>
+ <include-screen name="AvsSettings"
location="component://party/widget/partymgr/ProfileScreens.xml"/>
+ </container>
+ <container style="righthalf">
+ <include-screen name="FinAccounts"
location="component://party/widget/partymgr/ProfileScreens.xml"/>
+ <include-screen name="UserLogin"
location="component://party/widget/partymgr/ProfileScreens.xml"/>
+ <include-screen name="Attributes"
location="component://party/widget/partymgr/ProfileScreens.xml"/>
+ <include-screen name="Visits"
location="component://party/widget/partymgr/ProfileScreens.xml"/>
+ <include-screen name="Cart"
location="component://party/widget/partymgr/ProfileScreens.xml"/>
+ <include-screen name="SerializedInventory"
location="component://party/widget/partymgr/ProfileScreens.xml"/>
+ <include-screen name="Subscriptions"
location="component://party/widget/partymgr/ProfileScreens.xml"/>
+ <include-screen name="Content"
location="component://party/widget/partymgr/ProfileScreens.xml"/>
+ <include-screen name="ShipperAccount"
location="component://party/widget/partymgr/ProfileScreens.xml"/>
+ <include-screen name="Notes"
location="component://party/widget/partymgr/ProfileScreens.xml"/>
+ <include-screen name="mytasks"
location="component://party/widget/partymgr/ProfileScreens.xml"/>
+ </container>
+ </widgets>
+ </section>
</widgets>
<fail-widgets>
<container>
Modified: ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml?rev=652225&r1=652224&r2=652225&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml Tue Apr
29 19:02:04 2008
@@ -382,4 +382,28 @@
</widgets>
</section>
</screen>
+
+ <screen name="mytasks">
+ <section>
+ <actions>
+ <service service-name="getWorkEffortAssignedActivities"/>
+ <service service-name="getWorkEffortAssignedActivitiesByRole"/>
+ <service
service-name="getWorkEffortAssignedActivitiesByGroup"/>
+ <service service-name="getWorkEffortAssignedTasks"/>
+ </actions>
+ <widgets>
+ <section>
+ <condition>
+ <if-has-permission permission="WORKEFFORTMGR"
action="_VIEW"/>
+ </condition>
+ <widgets>
+ <platform-specific><html><html-template
location="component://party/webapp/partymgr/party/profileblocks/mytasks.ftl"/></html></platform-specific>
+ </widgets>
+ <fail-widgets>
+ <label
style="h3">${uiLabelMap.WorkEffortViewPermissionError}</label>
+ </fail-widgets>
+ </section>
+ </widgets>
+ </section>
+ </screen>
</screens>
