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/12/30 15:43:21 UTC

svn commit: r730136 - /ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml

Author: hansbak
Date: Tue Dec 30 06:43:21 2008
New Revision: 730136

URL: http://svn.apache.org/viewvc?rev=730136&view=rev
Log:
changed again but feels like i have done this before....

Modified:
    ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml

Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml?rev=730136&r1=730135&r2=730136&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml Tue Dec 30 06:43:21 2008
@@ -56,7 +56,7 @@
         <set-nonpk-fields map="parameters" value-field="newEntity"/>
         
         <if-empty field="parameters.communicationEventId">
-            <sequenced-id-to-env sequence-name="CommunicationEvent" env-name="newEntity.communicationEventId"/>
+            <sequenced-id sequence-name="CommunicationEvent" field="newEntity.communicationEventId"/>
             <else>
                 <set field="newEntity.communicationEventId" from-field="parameters.communicationEventId"/>
             </else>
@@ -75,7 +75,7 @@
             </if-not-empty>
         </if-empty>
         
-        <now-timestamp-to-env env-name="newEntity.entryDate"/>
+        <now-timestamp field="newEntity.entryDate"/>
         <create-value value-field="newEntity"/>
 
         <if-not-empty field="parameters.productId">
@@ -148,7 +148,7 @@
                     <field-map field-name="roleTypeId" value="ORIGINATOR" />
                 </entity-one>
                 <if-not-empty field="roleFrom">
-                    <remove-value value-name="roleFrom" />
+                    <remove-value value-field="roleFrom" />
                 </if-not-empty>
                 <!-- add new role -->
                 <set field="newRoleFrom.communicationEventId" from-field="event.communicationEventId" />
@@ -180,7 +180,7 @@
                     <field-map field-name="roleTypeId" value="ADDRESSEE" />
                 </entity-one>
                 <if-not-empty field="roleTo">
-                    <remove-value value-name="roleTo" />
+                    <remove-value value-field="roleTo" />
                 </if-not-empty>
                 <!-- add new role -->
                 <set field="newRoleTo.communicationEventId" from-field="event.communicationEventId" />
@@ -191,35 +191,35 @@
                     in-map-name="newRoleTo" />
             </if-compare>
         </if-not-empty>
-        <store-value value-name="event" />
+        <store-value value-field="event" />
     </simple-method>
 
     <simple-method method-name="deleteCommunicationEvent" short-description="Delete a CommunicationEvent">
         <entity-one entity-name="CommunicationEvent" value-field="event"/>
         <!-- remove related links to content -->
-        <get-related value-name="event" relation-name="CommEventContentAssoc" list-name="contentAssocs"/>
+        <get-related value-field="event" relation-name="CommEventContentAssoc" list="contentAssocs"/>
         <if-not-empty field="contentAssocs">
             <iterate entry="contentAssoc" list="contentAssocs">
-                <remove-value value-name="contentAssoc"/>
+                <remove-value value-field="contentAssoc"/>
                 <!-- delete content and dataresource too if requested -->
                 <if-compare field="parameters.delContentDataResource" value="Y" operator="equals">
-                    <get-related value-name="contentAssoc" relation-name="FromContent" list-name="contents"/>
+                    <get-related value-field="contentAssoc" relation-name="FromContent" list="contents"/>
                     <if-not-empty field="contents">
                         <iterate entry="content" list="contents">
-                            <remove-related value-name="content" relation-name="ContentRole"/>
-                            <remove-value value-name="content"/>
-                            <get-related-one value-name="content" relation-name="DataResource" to-value-name="dataResource"/>
+                            <remove-related value-field="content" relation-name="ContentRole"/>
+                            <remove-value value-field="content"/>
+                            <get-related-one value-field="content" relation-name="DataResource" to-value-field="dataResource"/>
                             <if-not-empty field="dataResource">
-                                <get-related-one value-name="dataResource" relation-name="ImageDataResource" to-value-name="imageDataResource"/>
+                                <get-related-one value-field="dataResource" relation-name="ImageDataResource" to-value-field="imageDataResource"/>
                                 <if-not-empty field="imageDataResource">
-                                    <remove-value value-name="imageDataResource"/>
+                                    <remove-value value-field="imageDataResource"/>
                                 </if-not-empty>
-                                <get-related-one value-name="dataResource" relation-name="ElectronicText" to-value-name="electronicText"/>
+                                <get-related-one value-field="dataResource" relation-name="ElectronicText" to-value-field="electronicText"/>
                                 <if-not-empty field="electronicText">
-                                    <remove-value value-name="electronicText"/>
+                                    <remove-value value-field="electronicText"/>
                                 </if-not-empty>
-                                <remove-related value-name="dataResource" relation-name="DataResourceRole"/>
-                                <remove-value value-name="dataResource"/>
+                                <remove-related value-field="dataResource" relation-name="DataResourceRole"/>
+                                <remove-value value-field="dataResource"/>
                             </if-not-empty>
                         </iterate>
                     </if-not-empty>
@@ -227,26 +227,26 @@
             </iterate>
         </if-not-empty>
         <!-- delete the roles when exist and the event itself -->
-        <remove-related value-name="event" relation-name="CommunicationEventRole"/>
-        <remove-value value-name="event"/>
+        <remove-related value-field="event" relation-name="CommunicationEventRole"/>
+        <remove-value value-field="event"/>
     </simple-method>
     <simple-method method-name="deleteCommunicationEventWorkEffort" short-description="delete commEvent and workEffort">
         
         <entity-one entity-name="CommunicationEvent" value-field="event"/>
         <!-- remove related workeffort when this is the only communicationevent connected to it -->
-        <get-related value-name="event" relation-name="CommunicationEventWorkEff" list-name="workEffortComs"/>
+        <get-related value-field="event" relation-name="CommunicationEventWorkEff" list="workEffortComs"/>
         <if-not-empty field="workEffortComs">
             <iterate entry="workEffortCom" list="workEffortComs">
-                <remove-value value-name="workEffortCom"/>
-                <get-related-one value-name="workEffortCom" relation-name="WorkEffort" to-value-name="workEffort"/>
-                <get-related value-name="workEffort" relation-name="CommunicationEventWorkEff" list-name="otherComs"/>
+                <remove-value value-field="workEffortCom"/>
+                <get-related-one value-field="workEffortCom" relation-name="WorkEffort" to-value-field="workEffort"/>
+                <get-related value-field="workEffort" relation-name="CommunicationEventWorkEff" list="otherComs"/>
                 <if-empty field="otherComs">
                     <log level="info" message="remove workeffort ${workEffort.workEffortId} and related parties and status"/>
-                    <remove-related value-name="workEffort" relation-name="WorkEffortPartyAssignment"/>
-                    <remove-related value-name="workEffort" relation-name="WorkEffortPartyAssignment"/>
-                    <remove-related value-name="workEffort" relation-name="WorkEffortStatus"/>
-                    <remove-related value-name="workEffort" relation-name="WorkEffortKeyword"/>
-                    <remove-value value-name="workEffort"/>
+                    <remove-related value-field="workEffort" relation-name="WorkEffortPartyAssignment"/>
+                    <remove-related value-field="workEffort" relation-name="WorkEffortPartyAssignment"/>
+                    <remove-related value-field="workEffort" relation-name="WorkEffortStatus"/>
+                    <remove-related value-field="workEffort" relation-name="WorkEffortKeyword"/>
+                    <remove-value value-field="workEffort"/>
                 </if-empty>
             </iterate>
         </if-not-empty>
@@ -264,7 +264,7 @@
     </simple-method>
     <simple-method method-name="removeCommunicationEventPurpose" short-description="Remove a CommunicationEventPurpose">
         <entity-one entity-name="CommunicationEventPurpose" value-field="eventPurpose"/>        
-        <remove-value value-name="eventPurpose"/>
+        <remove-value value-field="eventPurpose"/>
     </simple-method>
     <simple-method method-name="createCommunicationEventRole"
         short-description="Create a CommunicationEventRole">
@@ -291,20 +291,20 @@
         <entity-one value-field="eventRole" entity-name="CommunicationEventRole" />
         <if-not-empty field="eventRole">
             <set-nonpk-fields map="parameters" value-field="eventRole" />
-            <store-value value-name="eventRole" />
+            <store-value value-field="eventRole" />
         </if-not-empty>
     </simple-method>
     <simple-method method-name="removeCommunicationEventRole" short-description="Remove a CommunicationEventRole">
         <entity-one entity-name="CommunicationEventRole" value-field="eventRole"/>
         <if-not-empty field="eventRole">
-            <remove-value value-name="eventRole"/>
+            <remove-value value-field="eventRole"/>
             <if-compare field="parameters.deleteCommEventIfLast" operator="equals" value="Y">
                 <entity-and list="roles" entity-name="CommunicationEventRole">
                     <field-map field-name="communicationEventId" from-field="eventRole.communicationEventId"/>
                 </entity-and>
                 <if-empty field="roles">
                     <set-service-fields service-name="deleteCommunicationEvent" map="parameters" to-map="inMapDel"/>
-                    <call-service service-name="deleteCommunicationEvent" in-map="inMapDel"/>
+                    <call-service service-name="deleteCommunicationEvent" in-map-name="inMapDel"/>
                 </if-empty>
             </if-compare>
         </if-not-empty>        
@@ -333,7 +333,7 @@
                     </condition>
                     <then>
                         <set value="COM_READ" field="event.statusId"/>
-                        <store-value value-name="event"/>
+                        <store-value value-field="event"/>
                     </then>
                 </if>
             </then>
@@ -342,7 +342,7 @@
 
     <simple-method method-name="sendEmailDated"
         short-description="Checks for email communication events with the status COM_IN_PROGRESS and a startdate which is expired, then send the email">
-        <now-timestamp-to-env env-name="nowDate" />
+        <now-timestamp field="nowDate"/>
         <entity-condition entity-name="CommunicationEvent" list="communicationEvents">
             <condition-list combine="and">
                 <condition-list combine="or">
@@ -358,7 +358,7 @@
         </entity-condition>
         <iterate entry="communicationEvent" list="communicationEvents">
             <set-service-fields service-name="sendCommEventAsEmail" map="communicationEvent" to-map="inMap"/>
-            <call-service service-name="sendCommEventAsEmail" in-map="inMap" require-new-transaction="true"/>
+            <call-service service-name="sendCommEventAsEmail" in-map-name="inMap" require-new-transaction="true"/>
         </iterate>
     </simple-method>
 
@@ -389,8 +389,8 @@
         <!-- create partyId if not provided -->
         <if-empty field="parameters.partyId">
             <set-service-fields service-name="createPerson" map="parameters" to-map="newParty"/>
-            <call-service service-name="createPerson" in-map="newParty">
-                <result-to-field result-name="partyId" field-name="parameters.partyId"/>
+            <call-service service-name="createPerson" in-map-name="newParty">
+                <result-to-field result-name="partyId" field="parameters.partyId"/>
             </call-service>
         </if-empty>
 
@@ -408,7 +408,7 @@
             <set field="newEmail.emailAddress" from-field="parameters.emailAddress" />
             <call-service service-name="createPartyEmailAddress"
                 in-map-name="newEmail">
-                <result-to-field result-name="contactMechId" field-name="inCom.contactMechIdFrom" />
+                <result-to-field result-name="contactMechId" field="inCom.contactMechIdFrom" />
             </call-service>
         </if-not-empty>
 
@@ -418,7 +418,7 @@
         <set field="inCom.statusId" value="COM_ENTERED"/>
         <call-service service-name="updateCommunicationEvent" in-map-name="inCom"/>
 
-        <field-to-request field-name="parameters.communicationEventId" request-name="communicationEventId"/>
+        <field-to-request field="parameters.communicationEventId" request-name="communicationEventId"/>
         <entity-one entity-name="PartyNameView" value-field="nameView"/>
         <set field="_event_message_" value="Email addres: ${parameters.emailAddress} allocated to party: ${nameView.groupName}${nameView.firstName} ${nameView.middleName} ${nameView.lastName}[${parameters.partyId}]"/>
     </simple-method>
@@ -443,13 +443,13 @@
                 <check-errors/>
                 <else>
                     <set field="communicationEvent.statusId" from-field="parameters.statusId"/>
-                    <store-value value-name="communicationEvent"/>
+                    <store-value value-field="communicationEvent"/>
                     <!-- if complete, set all role status fields to 'complete' (intentionally ignoring the status change checking)-->
                     <if-compare operator="equals" value="COM_COMPLETE" field="parameters.statusId">
-                        <get-related value-name="communicationEvent" relation-name="CommunicationEventRole" list-name="updRoles"/>
+                        <get-related value-field="communicationEvent" relation-name="CommunicationEventRole" list="updRoles"/>
                         <iterate entry="updRole" list="updRoles">
                             <set field="updRole.statusId" value="COM_ROLE_COMPLETED"/>
-                            <store-value value-name="updRole"/>
+                            <store-value value-field="updRole"/>
                         </iterate>
                     </if-compare>
                 </else>
@@ -470,7 +470,7 @@
                 <check-errors/>
                 <else>
                     <set field="communicationEventRole.statusId" from-field="parameters.statusId"/>
-                    <store-value value-name="communicationEventRole"/>
+                    <store-value value-field="communicationEventRole"/>
                 </else>
             </if-empty>
         </if-compare-field>