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 2008/08/27 10:23:53 UTC
svn commit: r689407 - in /ofbiz/trunk/specialpurpose/projectmgr:
script/org/ofbiz/project/ProjectServices.xml widget/forms/TaskForms.xml
Author: hansbak
Date: Wed Aug 27 01:23:53 2008
New Revision: 689407
URL: http://svn.apache.org/viewvc?rev=689407&view=rev
Log:
make all party assignements dated
Modified:
ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml
Modified: ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml?rev=689407&r1=689406&r2=689407&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml Wed Aug 27 01:23:53 2008
@@ -104,7 +104,7 @@
<set-nonpk-fields value-name="assignment" map-name="parameters"/>
<store-value value-name="assignment"/>
<if-compare field="assignment.statusId" value="PAS_COMPLETED" operator="equals">
- <call-simple-method method-name="updateTaskStatus"/>
+ <call-simple-method method-name="updateTaskStatusToComplete"/>
</if-compare>
<else>
<!-- new assignment -->
@@ -115,7 +115,7 @@
</if>
</simple-method>
- <simple-method method-name="updateTaskStatus"
+ <simple-method method-name="updateTaskStatusToComplete"
short-description="Check partyassignments on a task, if all completes set task status to completed and set actual completiondate to now">
<entity-and entity-name="WorkEffortPartyAssignment" list-name="assignments" filter-by-date="true">
<field-map field-name="workEffortId" env-name="parameters.workEffortId"/>
@@ -368,7 +368,8 @@
<set field="newProjectId" from-field="newEntity.workEffortId"/>
<!-- copy assigned parties -->
- <get-related value-name="project" relation-name="WorkEffortPartyAssignment" list-name="parties"/>
+ <get-related value-name="project" relation-name="WorkEffortPartyAssignment" list-name="partiesAll"/>
+ <filter-list-by-date list-name="partiesAll" to-list-name="parties"/>
<if-not-empty field="parties">
<iterate entry-name="party" list-name="parties">
<set field="parameters.workEffortId" from-field="newProjectId"/>
@@ -672,7 +673,7 @@
<if-empty field="parameters.workEffortId">
<set field="parameters.workEffortId" value="%"/>
</if-empty>
- <entity-condition entity-name="WorkEffortPartyAssignment" list-name="tasks">
+ <entity-condition entity-name="WorkEffortPartyAssignment" list-name="tasks" filter-by-date="true">
<condition-list combine="and">
<condition-expr field-name="partyId" operator="like" env-name="parameters.partyId"/>
<condition-expr field-name="workEffortId" operator="like" env-name="parameters.workEffortId"/>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml?rev=689407&r1=689406&r2=689407&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml Wed Aug 27 01:23:53 2008
@@ -514,7 +514,7 @@
<form name="EditWorkEffortPartyAssigns" target="deleteTaskPartyAssign" title="" type="list" paginate-target="EditTaskPartyAssigns"
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<actions>
- <entity-condition entity-name="WorkEffortPartyAssignment">
+ <entity-condition entity-name="WorkEffortPartyAssignment" filter-by-date="true">
<condition-expr field-name="workEffortId" operator="equals" env-name="workEffortId"/>
<order-by field-name="roleTypeId"/>
</entity-condition>