You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ha...@apache.org on 2007/12/16 15:24:17 UTC
svn commit: r604626 - in /ofbiz/trunk/specialpurpose/projectmgr:
webapp/projectmgr/WEB-INF/controller.xml widget/TaskScreens.xml
widget/forms/TaskForms.xml
Author: hansbak
Date: Sun Dec 16 06:24:16 2007
New Revision: 604626
URL: http://svn.apache.org/viewvc?rev=604626&view=rev
Log:
status now shown on task partyassignlist with the possibility to update
Modified:
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml
Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml?rev=604626&r1=604625&r2=604626&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml Sun Dec 16 06:24:16 2007
@@ -125,6 +125,12 @@
<response name="success" type="view" value="EditTaskPartyAssigns"/>
<response name="error" type="view" value="EditTaskPartyAssigns"/>
</request-map>
+ <request-map uri="updateTaskPartyAssign">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="updatePartyToWorkEffortAssignment"/>
+ <response name="success" type="view" value="EditTaskPartyAssigns"/>
+ <response name="error" type="view" value="EditTaskPartyAssigns"/>
+ </request-map>
<request-map uri="createTask">
<security https="true" auth="true"/>
<event type="service" invoke="createWorkEffort"/>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml?rev=604626&r1=604625&r2=604626&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml Sun Dec 16 06:24:16 2007
@@ -253,7 +253,7 @@
<set field="labelTitleProperty" value="PageTitleListWorkEffortPartyAssigns"/>
<set field="workEffortId" from-field="parameters.workEffortId"/>
<entity-one entity-name="WorkEffortPartyAssignment" value-name="workEffortPartyAssignment"/>
- <set field="inTask" value="notnull"/>
+ <set field="nowDate" value="${bsh:org.ofbiz.base.util.UtilDateTime.nowDateString("yyyy-MM-dd HH:mm:ss.S")}" type="String"/>
</actions>
<widgets>
<decorator-screen name="CommonTaskDecorator" location="${parameters.mainDecoratorLocation}">
@@ -261,7 +261,7 @@
<container style="screenlet">
<container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.PageTitleListPartyAssigns}</label></container>
<container style="screenlet-body">
- <include-form name="EditWorkEffortPartyAssigns" location="component://projectmgr/widget/forms/ProjectForms.xml"/>
+ <include-form name="EditWorkEffortPartyAssigns" location="component://projectmgr/widget/forms/TaskForms.xml"/>
</container>
</container>
<container style="screenlet">
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml?rev=604626&r1=604625&r2=604626&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml Sun Dec 16 06:24:16 2007
@@ -262,4 +262,27 @@
<field name="actualHours"><display/></field>
<field name="createdDate"><display type="date"/></field>
</form>
+ <form name="EditWorkEffortPartyAssigns" target="deleteWorkEffortPartyAssign" title="" type="list" paginate-target="ListWorkEffortPartyAssigns">
+ <actions>
+ <entity-condition entity-name="WorkEffortPartyAssignment">
+ <condition-expr field-name="workEffortId" operator="equals" env-name="workEffortId"/>
+ <order-by field-name="roleTypeId"/>
+ </entity-condition>
+ </actions>
+ <field name="workEffortId"><hidden/></field>
+ <field name="projectId"><hidden/></field>
+ <field name="partyId" widget-style="buttontext">
+ <display-entity entity-name="PartyNameView" description="${firstName} ${middleName} ${lastName} ${groupName}">
+ <sub-hyperlink target="/partymgr/control/viewprofile?partyId=${partyId}" target-type="inter-app" description="${partyId}" link-style="buttontext"/>
+ </display-entity>
+ </field>
+ <field name="roleTypeId" title="${uiLabelMap.PartyRoleType}">
+ <display-entity entity-name="RoleType"/>
+ </field>
+ <field name="statusId"><display-entity entity-name="StatusItem"></display-entity></field>
+ <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display type="date"/></field>
+ <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><display type="date"/></field>
+ <field name="deleteButton" widget-style="smallSubmit"><submit button-type="button"/></field>
+ <field name="complete"><hyperlink description="set to Complete" target="updateTaskPartyAssign?workEffortId=${workEffortId}&partyId=${partyId}&roleTypeId=${roleTypeId}&fromDate=${fromDate}&statusId=CAL_COMPLETED&thruDate=${nowDate}"/></field>
+ </form>
</forms>