svn commit: r789334 - in /ofbiz/branches/release09.04: ./ specialpurpose/projectmgr/script/org/ofbiz/project/ specialpurpose/projectmgr/servicedef/ specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/ specialpurpose/projectmgr/widget/forms/

[hansbak-2]

Author: hansbak
Date: Mon Jun 29 14:07:40 2009
New Revision: 789334

URL: http://svn.apache.org/viewvc?rev=789334&view=rev
Log:
Applied fix from trunk for revision: 789329
 assign resource with start and enddate gave error, reported by farouk alhassan on the mailinglist

Modified:
    ofbiz/branches/release09.04/   (props changed)
    ofbiz/branches/release09.04/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml
    ofbiz/branches/release09.04/specialpurpose/projectmgr/servicedef/services.xml
    ofbiz/branches/release09.04/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml
    ofbiz/branches/release09.04/specialpurpose/projectmgr/widget/forms/TaskForms.xml

Propchange: ofbiz/branches/release09.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 29 14:07:40 2009
@@ -1 +1 @@
-/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922,777004,777020,777768,777792,777893,777947,778078,778094,778107,778278,778280,778364,778374,778402,778576,778594,778628,779020,779477,779496,779639,779834,779856,779866,779873,780111,780138,780180,780199,780203,780906,780945,781201,781534,781549,781669,781680,781694,782663,783257,783266,783833,783913,783917,785123,785764,785967,786778,787126,787435-787436,787442,787520,788965,788983,788987
+/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922,777004,777020,777768,777792,777893,777947,778078,778094,778107,778278,778280,778364,778374,778402,778576,778594,778628,779020,779477,779496,779639,779834,779856,779866,779873,780111,780138,780180,780199,780203,780906,780945,781201,781534,781549,781669,781680,781694,782663,783257,783266,783833,783913,783917,785123,785764,785967,786778,787126,787435-787436,787442,787520,788965,788983,788987,789329

Modified: ofbiz/branches/release09.04/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml?rev=789334&r1=789333&r2=789334&view=diff
==============================================================================
--- ofbiz/branches/release09.04/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml (original)
+++ ofbiz/branches/release09.04/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml Mon Jun 29 14:07:40 2009
@@ -124,15 +124,11 @@
             <condition>
                 <or>
                     <and>
-                        <not>
-                            <if-empty field="parameters.newPartyId"/>
-                        </not>
+                        <not><if-empty field="parameters.newPartyId"/></not>
                         <if-compare-field field="parameters.partyId" to-field="parameters.newPartyId" operator="not-equals"/>
                     </and>
                     <and>
-                        <not>
-                            <if-empty field="parameters.newRoleTypeId"/>
-                        </not>
+                        <not><if-empty field="parameters.newRoleTypeId"/></not>
                         <if-compare-field field="parameters.roleTypeId" to-field="parameters.newRoleTypeId" operator="not-equals"/>
                     </and>
                 </or>
@@ -156,14 +152,15 @@
                 <create-value value-field="newAssign"/>
             </then>
             <else>
-                <if-not-empty field="parameters.fromDate">
+                <set field="fromDate" from-field="parameters.fromDate" type="Timestamp"/>
+                <entity-one entity-name="WorkEffortPartyAssignment" value-field="assignment">
+                    <field-map field-name="workEffortId" from-field="parameters.workEffortId"/>
+                    <field-map field-name="partyId" from-field="parameters.partyId"/>
+                    <field-map field-name="roleTypeId" from-field="parameters.roleTypeId"/>
+                    <field-map field-name="fromDate" from-field="fromDate"/>
+                </entity-one>
+                <if-not-empty field="assignment">
                     <!-- status changed or assignment ended -->
-                    <entity-one entity-name="WorkEffortPartyAssignment" value-field="assignment">
-                        <field-map field-name="workEffortId" from-field="parameters.workEffortId"/>
-                        <field-map field-name="partyId" from-field="parameters.partyId"/>
-                        <field-map field-name="roleTypeId" from-field="parameters.roleTypeId"/>
-                        <field-map field-name="fromDate" from-field="parameters.fromDate"/>
-                    </entity-one>
                     <if-compare field="parameters.statusId" value="PAS_ENDED" operator="equals">
                         <!-- special case to indicate end of assignment -->
                         <now-timestamp field="assignment.thruDate"/>

Modified: ofbiz/branches/release09.04/specialpurpose/projectmgr/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/specialpurpose/projectmgr/servicedef/services.xml?rev=789334&r1=789333&r2=789334&view=diff
==============================================================================
--- ofbiz/branches/release09.04/specialpurpose/projectmgr/servicedef/services.xml (original)
+++ ofbiz/branches/release09.04/specialpurpose/projectmgr/servicedef/services.xml Mon Jun 29 14:07:40 2009
@@ -230,6 +230,7 @@
         <attribute name="roleTypeId" type="String" mode="IN" optional="false"/>
         <attribute name="statusId" type="String" mode="IN"/>
         <attribute name="fromDate" type="Timestamp" mode="INOUT" optional="true"/>
+        <attribute name="thruDate" type="Timestamp" mode="IN" optional="true"/>
         <attribute name="delegateReasonEnumId" type="String" mode="IN" optional="true"/>
         <attribute name="comments" type="String" mode="IN" optional="true"/>
     </service>

Modified: ofbiz/branches/release09.04/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml?rev=789334&r1=789333&r2=789334&view=diff
==============================================================================
--- ofbiz/branches/release09.04/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml (original)
+++ ofbiz/branches/release09.04/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml Mon Jun 29 14:07:40 2009
@@ -187,6 +187,12 @@
         <response name="success" type="view" value="EditTaskPartyAssigns"/>
         <response name="error" type="view" value="EditTaskPartyAssigns"/>
     </request-map>
+    <request-map uri="removeTaskPartyAssign">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="unassignPartyFromWorkEffort"/>
+        <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="createProjectTask"/>

Modified: ofbiz/branches/release09.04/specialpurpose/projectmgr/widget/forms/TaskForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/specialpurpose/projectmgr/widget/forms/TaskForms.xml?rev=789334&r1=789333&r2=789334&view=diff
==============================================================================
--- ofbiz/branches/release09.04/specialpurpose/projectmgr/widget/forms/TaskForms.xml (original)
+++ ofbiz/branches/release09.04/specialpurpose/projectmgr/widget/forms/TaskForms.xml Mon Jun 29 14:07:40 2009
@@ -537,8 +537,9 @@
     </form>
     <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">
+        <alt-target use-when="thruDate!=null" target="removeTaskPartyAssign"/>
         <actions>
-            <entity-condition entity-name="WorkEffortPartyAssignment" filter-by-date="true">
+            <entity-condition entity-name="WorkEffortPartyAssignment">
                 <condition-expr field-name="workEffortId" operator="equals" from-field="workEffortId"/>
                 <order-by field-name="roleTypeId"/>
             </entity-condition>