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/11/09 00:28:08 UTC

svn commit: r712450 - in /ofbiz/trunk/applications: order/script/org/ofbiz/order/request/CustRequestServices.xml workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml

Author: hansbak
Date: Sat Nov  8 15:28:05 2008
New Revision: 712450

URL: http://svn.apache.org/viewvc?rev=712450&view=rev
Log:
copy attachements from communication event to customer request and then to work effort

Modified:
    ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml
    ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml

Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml?rev=712450&r1=712449&r2=712450&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml Sat Nov  8 15:28:05 2008
@@ -451,6 +451,16 @@
             <set field="newItem.story" from-field="parameters.content"/>
             <call-service service-name="createCustRequestItem" in-map-name="newItem"/>
         </if-not-empty>
+        
+        <!-- copy attachements/content -->
+        <entity-and entity-name="CommEventContentAssoc" list-name="custRequestContents">
+            <field-map field-name="communicationEventId" env-name="parameters.communicationEventId"/>
+        </entity-and>
+        <iterate entry-name="custRequestContent" list-name="custRequestContents">
+            <set field="reqContent.custRequestId" from-field="parameters.custRequestId"/>
+            <set field="reqContent.contentId" from-field="custRequestContent.contentId"/>
+            <call-service service-name="createCustRequestContent" in-map-name="reqContent"/>
+        </iterate>
 
         <!-- update status from communication event -->
         <set-service-fields service-name="setCommunicationEventStatus" map-name="parameters" to-map-name="updStat"/>

Modified: ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml?rev=712450&r1=712449&r2=712450&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml (original)
+++ ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml Sat Nov  8 15:28:05 2008
@@ -68,7 +68,7 @@
             <create-value value-name="workFullfillment"/>
         </if-not-empty>
 
-        <!-- attach to a customer request if passed and copy attached docs if customer request has communication events with attachments -->
+        <!-- attach to a customer request if passed and copy attached docs -->
         <if-not-empty field="parameters.custRequestId">
             <!-- check status of customer request if valid -->
             <entity-one entity-name="CustRequest" value-name="lookedUpValue"/>
@@ -87,19 +87,14 @@
             <set field="updCustReq.custRequestId" from-field="parameters.custRequestId"/>
             <set field="updCustReq.statusId" value="CRQ_REVIEWED"/>
             <call-service service-name="setCustRequestStatus" in-map-name="updCustReq"/>
-            <entity-and list-name="custRequestCommEvents" entity-name="CustRequestCommEvent">
+            <entity-and list-name="custRequestContents" entity-name="CustRequestContent">
                 <field-map field-name="custRequestId" env-name="parameters.custRequestId"/>
             </entity-and>
-            <iterate entry-name="custRequestCommEvent" list-name="custRequestCommEvents">
-                <get-related-one value-name="custRequestCommEvent" relation-name="CommunicationEvent" to-value-name="communicationEvent"/>
-                <get-related relation-name="CommEventContentAssoc" value-name="communicationEvent" list-name="allCommEventContents"/>
-                <filter-list-by-date list-name="allCommEventContents" to-list-name="commEventContents"/>            
-                <iterate entry-name="commEventContent" list-name="commEventContents">
-                    <set field="newWorkEffortContent.workEffortId" from-field="newEntity.workEffortId"/>
-                    <set field="newWorkEffortContent.contentId" from-field="commEventContent.contentId"/>
-                    <set field="newWorkEffortContent.workEffortContentTypeId" value="SUPPORTING_MEDIA"/>
-                    <call-service service-name="createWorkEffortContent" in-map-name="newWorkEffortContent"/>
-                </iterate>
+            <iterate entry-name="custRequestContent" list-name="custRequestContents">
+                <set field="newWorkEffortContent.workEffortId" from-field="newEntity.workEffortId"/>
+                <set field="newWorkEffortContent.contentId" from-field="custRequestContent.contentId"/>
+                <set field="newWorkEffortContent.workEffortContentTypeId" value="SUPPORTING_MEDIA"/>
+                <call-service service-name="createWorkEffortContent" in-map-name="newWorkEffortContent"/>
             </iterate>
         </if-not-empty>
     </simple-method>