svn commit: r642674 - /ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml

[hansbak-2]

Author: hansbak
Date: Sat Mar 29 20:14:43 2008
New Revision: 642674

URL: http://svn.apache.org/viewvc?rev=642674&view=rev
Log:
ignore task assignments with an end date and check of status improved

Modified:
    ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.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=642674&r1=642673&r2=642674&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml Sat Mar 29 20:14:43 2008
@@ -774,19 +774,15 @@
         <!-- if lowlevel type equals TASK then get create the status first -->
         <if-compare field-name="lowInfo.workEffortTypeId" value="TASK" operator="equals">
             <if-compare field-name="lowInfo.currentStatusId" value="PTS_CREATED" operator="equals">
-                <get-related value-name="lowInfo" relation-name="WorkEffortPartyAssignment" list-name="assigns"/>
-                <if-empty field-name="assigns">
-                    <set field="lowInfo.currentStatusId" value="PTS_CREATED"/>
-                    <else>
-                        <get-related value-name="lowInfo" relation-name="TimeEntry" list-name="entries"/>
-                        <if-empty field-name="entries">
-                            <set field="lowInfo.currentStatusId" value="PTS_CREATED_AS"/>
-                            <else>
-                                <set field="lowInfo.currentStatusId" value="PTS_CREATED_IP"/>
-                            </else>
-                        </if-empty>
-                    </else>
-                </if-empty>
+                <get-related value-name="lowInfo" relation-name="WorkEffortPartyAssignment" list-name="assignsAll"/>
+                <filter-list-by-date list-name="assignsAll" to-list-name="assigns"/>
+                <if-not-empty field-name="assigns">
+                    <set field="lowInfo.currentStatusId" value="PTS_CREATED_AS"/><!-- task is assigned -->
+                </if-not-empty>
+                <get-related value-name="lowInfo" relation-name="TimeEntry" list-name="entries"/>
+                <if-not-empty field-name="entries">
+                    <set field="lowInfo.currentStatusId" value="PTS_CREATED_IP"/><!-- task is in progress -->
+                </if-not-empty>
             </if-compare>
         </if-compare>