[OFBiz] SVN: r5957 - in trunk/applications/workeffort: config
entitydef webapp/workeffort/WEB-INF
webapp/workeffort/calendar webapp/workeffort/task widget
jonesde at svn.ofbiz.org
jonesde at svn.ofbiz.org
Fri Oct 14 01:05:17 EDT 2005
Author: jonesde
Date: 2005-10-14 00:05:06 -0500 (Fri, 14 Oct 2005)
New Revision: 5957
Modified:
trunk/applications/workeffort/config/WorkEffortUiLabels.properties
trunk/applications/workeffort/entitydef/entitymodel.xml
trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml
trunk/applications/workeffort/webapp/workeffort/calendar/day.ftl
trunk/applications/workeffort/webapp/workeffort/calendar/month.ftl
trunk/applications/workeffort/webapp/workeffort/calendar/week.ftl
trunk/applications/workeffort/webapp/workeffort/task/mytasks.ftl
trunk/applications/workeffort/widget/WorkEffortForms.xml
trunk/applications/workeffort/widget/WorkEffortMenus.xml
trunk/applications/workeffort/widget/WorkEffortRelatedSummaryScreens.xml
Log:
More WorkEffort cleanups, made the WorkEffortSummary (was ListWorkEffortRelatedSummary) the target in more places and the leftmost item in the WorkEffort tab bar menu, plus more information on the WorkEffortSummary screen
Modified: trunk/applications/workeffort/config/WorkEffortUiLabels.properties
===================================================================
--- trunk/applications/workeffort/config/WorkEffortUiLabels.properties 2005-10-14 00:12:08 UTC (rev 5956)
+++ trunk/applications/workeffort/config/WorkEffortUiLabels.properties 2005-10-14 05:05:06 UTC (rev 5957)
@@ -80,7 +80,7 @@
PartyToName=To Name
PartyZipPostalCode=Zip/Postal Code
-WorkEffort=WorkEffort
+WorkEffort=Work Effort
WorkEffortAcceptAssignment=Accept Assignment
WorkEffortActivityDetail=Activity Detail
WorkEffortActivityName=Activity Name
@@ -207,6 +207,7 @@
WorkEffortShowAllNotes=Show All Notes
WorkEffortShowThisItemsNotes=Show This Item's Notes
WorkEffortStatus=Status
+WorkEffortSummary=Summary
WorkEffortTask=Task
WorkEffortTasks=Tasks
WorkEffortTaskDetail=TaskDetail
Modified: trunk/applications/workeffort/entitydef/entitymodel.xml
===================================================================
--- trunk/applications/workeffort/entitydef/entitymodel.xml 2005-10-14 00:12:08 UTC (rev 5956)
+++ trunk/applications/workeffort/entitydef/entitymodel.xml 2005-10-14 05:05:06 UTC (rev 5957)
@@ -1128,6 +1128,12 @@
<relation type="one-nofk" rel-entity-name="RoleType">
<key-map field-name="roleTypeId"/>
</relation>
+ <relation type="one-nofk" rel-entity-name="StatusItem">
+ <key-map field-name="statusId"/>
+ </relation>
+ <relation type="one" fk-name="WKEFF_PA_EXP_ENUM" title="Expectation" rel-entity-name="Enumeration">
+ <key-map field-name="expectationEnumId" rel-field-name="enumId"/>
+ </relation>
</view-entity>
<view-entity entity-name="WorkEffortCommunicationEventView"
package-name="org.ofbiz.workeffort.workeffort"
Modified: trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml
===================================================================
--- trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml 2005-10-14 00:12:08 UTC (rev 5956)
+++ trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml 2005-10-14 05:05:06 UTC (rev 5957)
@@ -355,9 +355,9 @@
<!-- WorkEffort Related Summary request mappings -->
- <request-map uri="ListWorkEffortRelatedSummary">
+ <request-map uri="WorkEffortSummary">
<security https="true" auth="true"/>
- <response name="success" type="view" value="ListWorkEffortRelatedSummary"/>
+ <response name="success" type="view" value="WorkEffortSummary"/>
</request-map>
<!-- Lookup request mappings -->
@@ -450,6 +450,8 @@
<view-map name="upcoming" type="screen" page="component://workeffort/widget/CalendarScreens.xml#CalendarUpcoming"/>
<!-- end project management views -->
+ <view-map name="WorkEffortSummary" type="screen" page="component://workeffort/widget/WorkEffortRelatedSummaryScreens.xml#WorkEffortSummary"/>
+
<view-map name="FindWorkEffort" type="screen" page="component://workeffort/widget/WorkEffortScreens.xml#FindWorkEffort"/>
<view-map name="EditWorkEffort" type="screen" page="component://workeffort/widget/WorkEffortScreens.xml#EditWorkEffort"/>
<view-map name="ListWorkEfforts" type="screen" page="component://workeffort/widget/WorkEffortScreens.xml#ListWorkEfforts"/>
@@ -458,8 +460,6 @@
<view-map name="AddWorkEffortAndAssoc" type="screen" page="component://workeffort/widget/WorkEffortScreens.xml#AddWorkEffortAndAssoc"/>
<view-map name="EditWorkEffortAndAssoc" type="screen" page="component://workeffort/widget/WorkEffortScreens.xml#EditWorkEffortAndAssoc"/>
- <view-map name="ListWorkEffortRelatedSummary" type="screen" page="component://workeffort/widget/WorkEffortRelatedSummaryScreens.xml#ListWorkEffortRelatedSummary"/>
-
<view-map name="ListWorkEffortPartyAssigns" type="screen" page="component://workeffort/widget/WorkEffortScreens.xml#ListWorkEffortPartyAssigns"/>
<view-map name="ListWorkEffortCommEvents" type="screen" page="component://workeffort/widget/WorkEffortScreens.xml#ListWorkEffortCommEvents"/>
<view-map name="ListWorkEffortShopLists" type="screen" page="component://workeffort/widget/WorkEffortScreens.xml#ListWorkEffortShopLists"/>
Modified: trunk/applications/workeffort/webapp/workeffort/calendar/day.ftl
===================================================================
--- trunk/applications/workeffort/webapp/workeffort/calendar/day.ftl 2005-10-14 00:12:08 UTC (rev 5956)
+++ trunk/applications/workeffort/webapp/workeffort/calendar/day.ftl 2005-10-14 05:05:06 UTC (rev 5957)
@@ -61,7 +61,7 @@
<#list periods as period>
<tr>
<td valign="top" nowrap width="1%" class="monthweekheader" height="36"><span class="monthweeknumber">${period.start?time?string.short}</span><br/>
- <a href="<@ofbizUrl>EditWorkEffort?workEffortTypeId=EVENT¤tStatusId=CAL_TENTATIVE&estimatedStartDate=${period.start?string("yyyy-MM-dd HH:mm:ss")}&estimatedCompletionDate=${period.end?string("yyyy-MM-dd HH:mm:ss")}</@ofbizUrl>">${uiLabelMap.CommonAddNew}</a></td>
+ <a href="<@ofbizUrl>WorkEffortSummary?workEffortTypeId=EVENT¤tStatusId=CAL_TENTATIVE&estimatedStartDate=${period.start?string("yyyy-MM-dd HH:mm:ss")}&estimatedCompletionDate=${period.end?string("yyyy-MM-dd HH:mm:ss")}</@ofbizUrl>">${uiLabelMap.CommonAddNew}</a></td>
<#list period.calendarEntries as calEntry>
<#if calEntry.startOfPeriod>
<td class="calendarentry" rowspan="${calEntry.periodSpan}" colspan="1" width="${entryWidth?string("#")}%" valign="top">
@@ -74,7 +74,7 @@
<#else>
${calEntry.workEffort.estimatedStartDate?time?string.short}-${calEntry.workEffort.estimatedCompletionDate?time?string.short}
</#if>
- <br/><a href="<@ofbizUrl>EditWorkEffort?workEffortId=${calEntry.workEffort.workEffortId}</@ofbizUrl>" class="event">${calEntry.workEffort.workEffortName?default("Undefined")}</a> </td>
+ <br/><a href="<@ofbizUrl>WorkEffortSummary?workEffortId=${calEntry.workEffort.workEffortId}</@ofbizUrl>" class="event">${calEntry.workEffort.workEffortName?default("Undefined")}</a> </td>
</#if>
</#list>
<#if period.calendarEntries?size < maxConcurrentEntries>
Modified: trunk/applications/workeffort/webapp/workeffort/calendar/month.ftl
===================================================================
--- trunk/applications/workeffort/webapp/workeffort/calendar/month.ftl 2005-10-14 00:12:08 UTC (rev 5956)
+++ trunk/applications/workeffort/webapp/workeffort/calendar/month.ftl 2005-10-14 05:05:06 UTC (rev 5957)
@@ -62,7 +62,7 @@
<table width="100%" cellspacing="0" cellpadding="0" border="0">
<tr>
<td nowrap class="monthdaynumber"><a href='<@ofbizUrl>day?start=${period.start.time?string("#")}</@ofbizUrl>' class="monthdaynumber">${period.start?date?string("d")?cap_first}</a></td>
- <td align="right"><a href='<@ofbizUrl>EditWorkEffort?workEffortTypeId=EVENT¤tStatusId=CAL_TENTATIVE&estimatedStartDate=${period.start?string("yyyy-MM-dd HH:mm:ss")}&estimatedCompletionDate=${period.end?string("yyyy-MM-dd HH:mm:ss")}</@ofbizUrl>' class="add">${uiLabelMap.CommonAddNew}</a> </td>
+ <td align="right"><a href='<@ofbizUrl>WorkEffortSummary?workEffortTypeId=EVENT¤tStatusId=CAL_TENTATIVE&estimatedStartDate=${period.start?string("yyyy-MM-dd HH:mm:ss")}&estimatedCompletionDate=${period.end?string("yyyy-MM-dd HH:mm:ss")}</@ofbizUrl>' class="add">${uiLabelMap.CommonAddNew}</a> </td>
</tr>
</table>
<#list period.calendarEntries as calEntry>
@@ -79,7 +79,7 @@
${calEntry.workEffort.estimatedStartDate?time?string.short}-${calEntry.workEffort.estimatedCompletionDate?time?string.short}
</#if>
<br/>
- <a href="<@ofbizUrl>EditWorkEffort?workEffortId=${calEntry.workEffort.workEffortId}</@ofbizUrl>" class="event">${calEntry.workEffort.workEffortName?default("Undefined")}</a>
+ <a href="<@ofbizUrl>WorkEffortSummary?workEffortId=${calEntry.workEffort.workEffortId}</@ofbizUrl>" class="event">${calEntry.workEffort.workEffortName?default("Undefined")}</a>
</td>
</tr>
</table>
Modified: trunk/applications/workeffort/webapp/workeffort/calendar/week.ftl
===================================================================
--- trunk/applications/workeffort/webapp/workeffort/calendar/week.ftl 2005-10-14 00:12:08 UTC (rev 5956)
+++ trunk/applications/workeffort/webapp/workeffort/calendar/week.ftl 2005-10-14 05:05:06 UTC (rev 5957)
@@ -60,7 +60,7 @@
<#list periods as period>
<tr>
<td valign="top" nowrap width="1%" class="monthweekheader" height="36"><a href="<@ofbizUrl>day?start=${period.start.time?string("#")}</@ofbizUrl>" class="monthweeknumber">${period.start?date?string("EEEE")?cap_first} ${period.start?date?string("d/M")?cap_first}</a><br/>
- <a href="<@ofbizUrl>EditWorkEffort?workEffortTypeId=EVENT¤tStatusId=CAL_TENTATIVE&estimatedStartDate=${period.start?string("yyyy-MM-dd HH:mm:ss")}&estimatedCompletionDate=${period.end?string("yyyy-MM-dd HH:mm:ss")}</@ofbizUrl>">${uiLabelMap.CommonAddNew}</a>
+ <a href="<@ofbizUrl>WorkEffortSummary?workEffortTypeId=EVENT¤tStatusId=CAL_TENTATIVE&estimatedStartDate=${period.start?string("yyyy-MM-dd HH:mm:ss")}&estimatedCompletionDate=${period.end?string("yyyy-MM-dd HH:mm:ss")}</@ofbizUrl>">${uiLabelMap.CommonAddNew}</a>
</td>
<#list period.calendarEntries as calEntry>
<#if calEntry.startOfPeriod>
@@ -76,7 +76,7 @@
<#else>
${calEntry.workEffort.estimatedStartDate?time?string.short}-${calEntry.workEffort.estimatedCompletionDate?time?string.short}
</#if>
- <br/><a href="<@ofbizUrl>EditWorkEffort?workEffortId=${calEntry.workEffort.workEffortId}</@ofbizUrl>" class="event">${calEntry.workEffort.workEffortName?default("Undefined")}</a> </td>
+ <br/><a href="<@ofbizUrl>WorkEffortSummary?workEffortId=${calEntry.workEffort.workEffortId}</@ofbizUrl>" class="event">${calEntry.workEffort.workEffortName?default("Undefined")}</a> </td>
</#if>
</#list>
<#if period.calendarEntries?size < maxConcurrentEntries>
Modified: trunk/applications/workeffort/webapp/workeffort/task/mytasks.ftl
===================================================================
--- trunk/applications/workeffort/webapp/workeffort/task/mytasks.ftl 2005-10-14 00:12:08 UTC (rev 5956)
+++ trunk/applications/workeffort/webapp/workeffort/task/mytasks.ftl 2005-10-14 05:05:06 UTC (rev 5957)
@@ -34,7 +34,7 @@
<div class="boxhead">${uiLabelMap.WorkEffortMyCurrentTaskList}</div>
</td>
<td align="right" width="60%">
- <a href="<@ofbizUrl>mytasks</@ofbizUrl>" class="submenutext">${uiLabelMap.WorkEffortTaskList}</a><a href="<@ofbizUrl>EditWorkEffort</@ofbizUrl>" class="submenutextright">${uiLabelMap.WorkEffortNewTask}</a>
+ <a href="<@ofbizUrl>EditWorkEffort?workEffortTypeId=TASK&currentStatusId=CAL_NEEDS_ACTION</@ofbizUrl>" class="submenutextright">${uiLabelMap.WorkEffortNewTask}</a>
</td>
</tr>
</table>
@@ -60,8 +60,8 @@
<td><div class="tabletext">${(workEffort.estimatedStartDate.toString())?if_exists}</div></td>
<td><div class="tabletext">${workEffort.priority?if_exists}</div></td>
<td><div class="tabletext">${(delegator.findByPrimaryKeyCache("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", workEffort.getString("currentStatusId"))).description)?if_exists}</div></td>
- <td><A class="buttontext" href="<@ofbizUrl>EditWorkEffort?workEffortId=${workEffort.workEffortId}</@ofbizUrl>">${workEffort.workEffortName}</a></div></td>
- <td align="right" width="1%"><A class="buttontext" href="<@ofbizUrl>EditWorkEffort?workEffortId=${workEffort.workEffortId}</@ofbizUrl>">${uiLabelMap.CommonEdit} [${workEffort.workEffortId}]</a></div></td>
+ <td><A class="linktext" href="<@ofbizUrl>WorkEffortSummary?workEffortId=${workEffort.workEffortId}</@ofbizUrl>">${workEffort.workEffortName}</a></div></td>
+ <td align="right" width="1%"><A class="buttontext" href="<@ofbizUrl>WorkEffortSummary?workEffortId=${workEffort.workEffortId}</@ofbizUrl>">${workEffort.workEffortId}</a></div></td>
</tr>
</#list>
</table>
@@ -97,10 +97,8 @@
<td><div class="tabletext">${(delegator.findByPrimaryKeyCache("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", workEffort.getString("statusId"))).description)?if_exists}</div></td>
<#-- <td><div class="tabletext">${workEffort.partyId}</div></td> -->
<td><div class="tabletext">${workEffort.roleTypeId}</div></td>
- <td><A class="buttontext" href="<@ofbizUrl>activity?workEffortId=${workEffort.workEffortId}</@ofbizUrl>">
- ${workEffort.workEffortName}</a></div></td>
- <td align="right"><A class="buttontext" href="<@ofbizUrl>activity?workEffortId=${workEffort.workEffortId}</@ofbizUrl>">
- ${uiLabelMap.CommonEdit} [${workEffort.workEffortId}]</a></div></td>
+ <td><A class="linktext" href="<@ofbizUrl>WorkEffortSummary?workEffortId=${workEffort.workEffortId}</@ofbizUrl>">${workEffort.workEffortName}</a></div></td>
+ <td align="right"><A class="buttontext" href="<@ofbizUrl>WorkEffortSummary?workEffortId=${workEffort.workEffortId}</@ofbizUrl>">${workEffort.workEffortId}</a></div></td>
</tr>
</#list>
</table>
@@ -137,10 +135,8 @@
<td><div class="tabletext">${(delegator.findByPrimaryKeyCache("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", workEffort.getString("statusId"))).description)?if_exists}</div></td>
<#-- <td><div class="tabletext">${workEffort.partyId}</div></td> -->
<td><div class="tabletext">${workEffort.roleTypeId}</div></td>
- <td><A class="buttontext" href="<@ofbizUrl>activity?workEffortId=${workEffort.workEffortId}</@ofbizUrl>">
- ${workEffort.workEffortName}</a></div></td>
- <td align="right"><A class="buttontext" href="<@ofbizUrl>acceptRoleAssignment?workEffortId=${workEffort.workEffortId}&partyId=${workEffort.partyId}&roleTypeId=${workEffort.roleTypeId}&fromDate=${workEffort.fromDate.toString()}</@ofbizUrl>">
- ${uiLabelMap.WorkEffortAcceptAssignment} [${workEffort.workEffortId}]</a></div></td>
+ <td><A class="buttontext" href="<@ofbizUrl>WorkEffortSummary?workEffortId=${workEffort.workEffortId}</@ofbizUrl>">${workEffort.workEffortName}</a></div></td>
+ <td align="right"><A class="buttontext" href="<@ofbizUrl>acceptRoleAssignment?workEffortId=${workEffort.workEffortId}&partyId=${workEffort.partyId}&roleTypeId=${workEffort.roleTypeId}&fromDate=${workEffort.fromDate.toString()}</@ofbizUrl>">${uiLabelMap.WorkEffortAcceptAssignment} [${workEffort.workEffortId}]</a></div></td>
</tr>
</#list>
</table>
@@ -177,7 +173,7 @@
<td><div class="tabletext">${(delegator.findByPrimaryKeyCache("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", workEffort.getString("statusId"))).description)?if_exists}</div></td>
<td><div class="tabletext">${workEffort.groupPartyId}</div></td>
<#-- <td><div class="tabletext">${workEffort.roleTypeId}</div></td> -->
- <td><A class="buttontext" href="<@ofbizUrl>activity?workEffortId=${workEffort.workEffortId}</@ofbizUrl>">
+ <td><A class="buttontext" href="<@ofbizUrl>WorkEffortSummary?workEffortId=${workEffort.workEffortId}</@ofbizUrl>">
${workEffort.workEffortName}</a></div></td>
<td align="right"><A class="buttontext" href="<@ofbizUrl>acceptassignment?workEffortId=${workEffort.workEffortId}&partyId=${workEffort.partyId}&roleTypeId=${workEffort.roleTypeId}&fromDate=${workEffort.fromDate}</@ofbizUrl>">
${uiLabelMap.WorkEffortAcceptAssignment} [${workEffort.workEffortId}]</a></div></td>
Modified: trunk/applications/workeffort/widget/WorkEffortForms.xml
===================================================================
--- trunk/applications/workeffort/widget/WorkEffortForms.xml 2005-10-14 00:12:08 UTC (rev 5956)
+++ trunk/applications/workeffort/widget/WorkEffortForms.xml 2005-10-14 05:05:06 UTC (rev 5957)
@@ -31,21 +31,21 @@
<field name="workEffortId" use-when="workEffort==null&&workEffortId!=null" title="${uiLabelMap.WorkEffortWorkEffortId}" tooltip="${uiLabelMap.CommonCannotBeFound}: [${workEffortId}]" widget-style="tabletext"><display/></field>
<field name="workEffortName" title="${uiLabelMap.CommonName}*"/>
- <field name="workEffortTypeId" title="${uiLabelMap.CommonType}*">
+ <field name="workEffortTypeId" title="${uiLabelMap.CommonType}*" position="1">
<drop-down>
<entity-options description="${description}" entity-name="WorkEffortType" key-field-name="workEffortTypeId">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
</field>
- <field name="workEffortPurposeTypeId" title="${uiLabelMap.CommonPurpose}">
+ <field name="workEffortPurposeTypeId" title="${uiLabelMap.CommonPurpose}" position="2">
<drop-down allow-empty="true">
<entity-options description="${description}" entity-name="WorkEffortPurposeType" key-field-name="workEffortPurposeTypeId">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
</field>
- <field name="currentStatusId" title="${uiLabelMap.CommonStatus}*">
+ <field name="currentStatusId" title="${uiLabelMap.CommonStatus}*" position="1">
<drop-down>
<entity-options entity-name="StatusItem" key-field-name="statusId" description="[General] ${description}">
<entity-constraint name="statusTypeId" value="CALENDAR_STATUS"/>
@@ -61,23 +61,31 @@
</entity-options>
</drop-down>
</field>
- <field name="priority">
+ <field name="percentComplete" position="2"/>
+
+ <field name="priority" position="1">
<drop-down allow-empty="true">
<option key="1" description="1 (High)"/><option key="2"/><option key="3"/><option key="4"/><option key="5"/>
<option key="6"/><option key="7"/><option key="8"/><option key="9" description="9 (Low)"/>
</drop-down>
</field>
-
- <field name="workEffortParentId"><lookup target-form-name="LookupWorkEffort"/></field>
- <field name="facilityId"><lookup target-form-name="LookupFacility"/></field>
- <field name="fixedAssetId"><lookup target-form-name="LookupFixedAsset"/></field>
- <field name="scopeEnumId">
- <drop-down>
+ <field name="scopeEnumId" title="Scope" position="2">
+ <drop-down no-current-selected-key="WES_PRIVATE">
<entity-options entity-name="Enumeration" key-field-name="enumId" description="${description}">
<entity-constraint name="enumTypeId" value="WORK_EFF_SCOPE"/>
</entity-options>
</drop-down>
</field>
+
+ <field name="estimatedStartDate" position="1"/>
+ <field name="estimatedCompletionDate" position="2"/>
+ <field name="actualStartDate" position="1"/>
+ <field name="actualCompletionDate" position="2"/>
+
+
+ <field name="workEffortParentId"><lookup target-form-name="LookupWorkEffort"/></field>
+ <field name="facilityId"><lookup target-form-name="LookupFacility"/></field>
+ <field name="fixedAssetId"><lookup target-form-name="LookupFixedAsset"/></field>
<field name="moneyUomId" title="${uiLabelMap.CommonCurrency}">
<drop-down allow-empty="true">
<entity-options description="[${uomId}] - ${description}" entity-name="Uom" key-field-name="uomId">
@@ -86,6 +94,21 @@
</drop-down>
</field>
+ <field name="estimatedMilliSeconds" position="1"/>
+ <field name="estimatedSetupMillis" position="2"/>
+ <field name="actualMilliSeconds" position="1"/>
+ <field name="actualSetupMillis" position="2"/>
+ <field name="totalMilliSecondsAllowed" position="1"/>
+ <field name="totalMoneyAllowed" position="2"/>
+
+ <field name="quantityToProduce" position="1"/>
+ <field name="quantityProduced" position="1"/>
+ <field name="quantityRejected" position="2"/>
+
+ <field name="reservPersons" position="1"/>
+ <field name="reserv2ndPPPerc" position="1"/>
+ <field name="reservNthPPPerc" position="2"/>
+
<field use-when="workEffort==null" name="quickAssignPartyId"><lookup target-form-name="LookupPartyName" default-value="${userLogin.partyId}"/></field>
<field use-when="workEffort==null" name="requirementId"><lookup target-form-name="LookupRequirement"/></field>
<field name="communicationEventId" title="Quick Add Comm. Event Id" map-name="context"><lookup target-form-name="LookupCommunicationEvent"/></field><!-- TODO: need to implement this -->
@@ -109,11 +132,15 @@
<sort-field name="workEffortName"/>
<sort-field name="description"/>
<sort-field name="workEffortTypeId"/>
+ <sort-field name="workEffortPurposeTypeId"/>
<sort-field name="currentStatusId"/>
+ <sort-field name="percentComplete"/>
<sort-field name="priority"/>
- <sort-field name="percentComplete"/>
+ <sort-field name="scopeEnumId"/>
<sort-field name="estimatedStartDate"/>
<sort-field name="estimatedCompletionDate"/>
+ <sort-field name="actualStartDate"/>
+ <sort-field name="actualCompletionDate"/>
</sort-order>
</form>
Modified: trunk/applications/workeffort/widget/WorkEffortMenus.xml
===================================================================
--- trunk/applications/workeffort/widget/WorkEffortMenus.xml 2005-10-14 00:12:08 UTC (rev 5956)
+++ trunk/applications/workeffort/widget/WorkEffortMenus.xml 2005-10-14 05:05:06 UTC (rev 5957)
@@ -45,12 +45,12 @@
<menu name="WorkEffortTabBar" default-menu-item-name="WorkEffort" default-selected-style="tabButtonSelected"
default-title-style="tabButton" default-tooltip-style="tabletext" default-widget-style="tabButton"
orientation="horizontal" type="simple">
+ <menu-item name="WorkEffortRelatedSummary" title="${uiLabelMap.WorkEffortSummary}">
+ <link target="WorkEffortSummary?workEffortId=${workEffortId}"/>
+ </menu-item>
<menu-item name="WorkEffort" title="${uiLabelMap.WorkEffort}">
<link target="EditWorkEffort?workEffortId=${workEffortId}"/>
</menu-item>
- <menu-item name="WorkEffortRelatedSummary" title="${uiLabelMap.WorkEffortRelatedSummary}">
- <link target="ListWorkEffortRelatedSummary?workEffortId=${workEffortId}"/>
- </menu-item>
<menu-item name="WorkEffortAssocs" title="${uiLabelMap.WorkEffortChildren}">
<link target="ChildWorkEfforts?workEffortId=${workEffortId}&trail=${workEffortId}"/>
</menu-item>
Modified: trunk/applications/workeffort/widget/WorkEffortRelatedSummaryScreens.xml
===================================================================
--- trunk/applications/workeffort/widget/WorkEffortRelatedSummaryScreens.xml 2005-10-14 00:12:08 UTC (rev 5956)
+++ trunk/applications/workeffort/widget/WorkEffortRelatedSummaryScreens.xml 2005-10-14 05:05:06 UTC (rev 5957)
@@ -25,15 +25,20 @@
<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-screen.xsd">
- <screen name="ListWorkEffortRelatedSummary">
+ <screen name="WorkEffortSummary">
<section>
<actions>
<set field="titleProperty" value="PageTitleWorkEffortRelatedSummary"/>
<set field="tabButtonItem" value="WorkEffortRelatedSummary"/>
<set field="labelTitleProperty" value="PageTitleWorkEffortRelatedSummary"/>
- <set field="donePage" from-field="parameters.DONE_PAGE" default-value="/workeffort/control/ListWorkEfforts"/>
<set field="workEffortId" from-field="parameters.workEffortId"/>
+ <entity-one entity-name="WorkEffort" value-name="workEffort"/>
+ <get-related-one value-name="workEffort" relation-name="WorkEffortType" to-value-name="workEffortType"/>
+ <get-related-one value-name="workEffort" relation-name="CurrentStatusItem" to-value-name="currentStatusItem"/>
+ <get-related-one value-name="workEffort" relation-name="WorkEffortPurposeType" to-value-name="workEffortPurposeType"/>
+ <get-related-one value-name="workEffort" relation-name="ScopeEnumeration" to-value-name="scopeEnumeration"/>
+
<entity-and entity-name="WorkEffortPartyAssignView" list-name="relatedPartyAssigns">
<field-map field-name="workEffortId"/>
</entity-and>
@@ -54,23 +59,46 @@
<decorator-screen name="CommonWorkEffortDecorator" location="component://workeffort/widget/WorkEffortScreens.xml">
<decorator-section name="body">
<label style="head1">${uiLabelMap.PageTitleWorkEffortRelatedSummary} for ID [${workEffortId}]</label>
- <container style="indent10Wrapper"><label style="head1">Party Assignments</label></container>
+ <container><label style="head2">${uiLabelMap.WorkEffort}</label></container>
+ <container>
+ <label text="Name: " style="tableheadtext"/><label text="${workEffort.workEffortName}" style="tabletext"/>
+ <label text="Type: " style="tableheadtext"/><label text="${workEffortType.description}" style="tabletext"/>
+ <label text="Purpose: " style="tableheadtext"/><label text="${workEffortPurposeType.description}" style="tabletext"/>
+ </container>
+ <container>
+ <label text="Status: " style="tableheadtext"/><label text="${currentStatusItem.description}" style="tabletext"/>
+ <label text="Percent Complete: " style="tableheadtext"/><label text="${workEffort.percentComplete}" style="tabletext"/>
+ <label text="Priority: " style="tableheadtext"/><label text="${workEffort.priority}" style="tabletext"/>
+ </container>
+ <container>
+ <label text="Estimated Start Date: " style="tableheadtext"/><label text="${workEffort.estimatedStartDate}" style="tabletext"/>
+ <label text="Estimated Completion Date: " style="tableheadtext"/><label text="${workEffort.estimatedCompletionDate}" style="tabletext"/>
+ </container>
+ <container><label style="head2">Party Assignments</label></container>
<iterate-section list-name="relatedPartyAssigns" entry-name="partyAssign">
<section>
+ <actions>
+ <get-related-one value-name="partyAssign" relation-name="RoleType" to-value-name="partyAssignRoleType" use-cache="true"/>
+ <get-related-one value-name="partyAssign" relation-name="StatusItem" to-value-name="partyAssignStatusItem" use-cache="true"/>
+ <get-related-one value-name="partyAssign" relation-name="ExpectationEnumeration" to-value-name="partyAssignExpectationEnumeration" use-cache="true"/>
+ </actions>
<widgets>
- <container style="treeWrapper">
+ <container>
<link target="/partymgr/control/viewprofile?partyId=${partyAssign.partyId}" url-mode="inter-app" text="[${partyAssign.partyId}]" style="linktext"/>
<label text="${partyAssign.firstName} ${partyAssign.lastName} ${partyAssign.groupName}" style="tabletext"/>
+ <label text="Role:" style="tableheadtext"/><label text="${partyAssignRoleType.description}" style="tabletext"/>
+ <label text="Status:" style="tableheadtext"/><label text="${partyAssignStatusItem.description}" style="tabletext"/>
+ <label text="Expectation:" style="tableheadtext"/><label text="${partyAssignExpectationEnumeration.description}" style="tabletext"/>
</container>
</widgets>
</section>
</iterate-section>
- <container style="indent10Wrapper"><label style="head1">Communication Events</label></container>
+ <container><label style="head2">Communication Events</label></container>
<iterate-section list-name="commEvents" entry-name="commEvent">
<section>
<widgets>
- <container style="treeWrapper">
+ <container>
<link target="/partymgr/control/EditCommunicationEvent?communicationEventId=${commEvent.communicationEventId}" url-mode="inter-app" text="[${commEvent.communicationEventId}]" style="linktext"/>
<label text="${commEvent.subject}" style="tabletext"/>
</container>
@@ -78,11 +106,11 @@
</section>
</iterate-section>
- <container style="indent10Wrapper"><label style="head1">Shopping Lists</label></container>
+ <container><label style="head2">Shopping Lists</label></container>
<iterate-section list-name="shoppingLists" entry-name="shopList">
<section>
<widgets>
- <container style="treeWrapper">
+ <container>
<link target="/partymgr/control/editShoppingList?shoppingListId=${shopList.shoppingListId}" url-mode="inter-app" text="[${shopList.shoppingListId}]" style="linktext"/>
<label text="${shopList.listName} ${shopList.description}" style="tabletext"/>
</container>
@@ -90,11 +118,11 @@
</section>
</iterate-section>
- <container style="indent10Wrapper"><label style="head1">Quotes</label></container>
+ <container><label style="head2">Quotes</label></container>
<iterate-section list-name="quotes" entry-name="quote">
<section>
<widgets>
- <container style="treeWrapper">
+ <container>
<link target="/ordermgr/control/EditQuote?quoteId=${quote.quoteId}" url-mode="inter-app" text="[${quote.quoteId}]" style="linktext"/>
<label text="${quote.quoteName} ${quote.description}" style="tabletext"/>
</container>
@@ -102,11 +130,11 @@
</section>
</iterate-section>
- <container style="indent10Wrapper"><label style="head1">Orders</label></container>
+ <container><label style="head2">Orders</label></container>
<iterate-section list-name="orderHeaders" entry-name="orderHeader">
<section>
<widgets>
- <container style="treeWrapper">
+ <container>
<link target="/ordermgr/control/orderview?orderId=${orderHeader.orderId}&order_id=${orderHeader.orderId}" url-mode="inter-app" text="[${orderHeader.orderId}]" style="linktext"/>
<label text="type: ${orderHeader.orderTypeDescription}, status: ${orderHeader.statusItemDescription}, total: ${orderHeader.grandTotal}, date: ${orderHeader.orderDate}" style="tabletext"/>
</container>
More information about the Svn
mailing list