svn commit: r1752219 - in /ofbiz/trunk/applications: datamodel/entitydef/order-entitymodel.xml order/minilang/request/CustRequestServices.xml order/servicedef/services_request.xml

[jnicolas]

Author: jnicolas
Date: Mon Jul 11 21:51:24 2016
New Revision: 1752219

URL: http://svn.apache.org/viewvc?rev=1752219&view=rev
Log:
OFBiz-7622 follow status change user follow up

Modified:
    ofbiz/trunk/applications/datamodel/entitydef/order-entitymodel.xml
    ofbiz/trunk/applications/order/minilang/request/CustRequestServices.xml
    ofbiz/trunk/applications/order/servicedef/services_request.xml

Modified: ofbiz/trunk/applications/datamodel/entitydef/order-entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/datamodel/entitydef/order-entitymodel.xml?rev=1752219&r1=1752218&r2=1752219&view=diff
==============================================================================
--- ofbiz/trunk/applications/datamodel/entitydef/order-entitymodel.xml (original)
+++ ofbiz/trunk/applications/datamodel/entitydef/order-entitymodel.xml Mon Jul 11 21:51:24 2016
@@ -1982,7 +1982,8 @@ under the License.
       <field name="statusId" type="id"></field>
       <field name="custRequestId" type="id"></field>
       <field name="custRequestItemSeqId" type="id"></field>
-      <field name="statusDatetime" type="date-time"></field>
+      <field name="statusDate" type="date-time"></field>
+      <field name="changeByUserLoginId" type="id-vlong"></field>
       <prim-key field="custRequestStatusId"/>
       <relation type="one" fk-name="CUST_REQST_STTS" rel-entity-name="StatusItem">
         <key-map field-name="statusId"/>
@@ -1994,6 +1995,9 @@ under the License.
         <key-map field-name="custRequestId"/>
         <key-map field-name="custRequestItemSeqId"/>
       </relation>
+      <relation type="one" fk-name="CUST_RQSTTS_USRLGN" title="ChangeBy" rel-entity-name="UserLogin">
+          <key-map field-name="changeByUserLoginId" rel-field-name="userLoginId"/>
+      </relation>
     </entity>
     <entity entity-name="CustRequestType"
             package-name="org.ofbiz.order.request"

Modified: ofbiz/trunk/applications/order/minilang/request/CustRequestServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/minilang/request/CustRequestServices.xml?rev=1752219&r1=1752218&r2=1752219&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/minilang/request/CustRequestServices.xml (original)
+++ ofbiz/trunk/applications/order/minilang/request/CustRequestServices.xml Mon Jul 11 21:51:24 2016
@@ -451,17 +451,6 @@ under the License.
         <check-errors/>
     </simple-method>
 
-    <simple-method method-name="createCustRequestStatus" short-description="Create Customer Request Status">
-        <make-value value-field="newEntity" entity-name="CustRequestStatus"/>
-        <sequenced-id sequence-name="CustRequestStatus" field="newEntity.custRequestStatusId"/>
-        <set-nonpk-fields map="parameters" value-field="newEntity"/>
-        <if-empty field="newEntity.statusDatetime">
-            <now-timestamp field="nowTimestamp"/>
-            <set from-field="nowTimestamp" field="newEntity.statusDatetime"/>
-        </if-empty>
-        <create-value value-field="newEntity"/>
-    </simple-method>
-
     <simple-method method-name="setCustRequestStatus" short-description="change the customer request Status">
         <entity-one entity-name="CustRequest" value-field="custRequest"/>
         <if-not-empty field="custRequest">
@@ -505,7 +494,8 @@ under the License.
         </if-not-empty>
         <now-timestamp field="custRequest.lastModifiedDate"/>
         <store-value value-field="custRequest"/>
-        <call-simple-method method-name="createCustRequestStatus"/>
+        <set-service-fields service-name="createCustRequestStatus" map="parameters" to-map="rqMap"/>
+        <call-service service-name="createCustRequestStatus" in-map-name="rqMap"/>
     </simple-method>
 
     <simple-method method-name="createCustRequestFromCommEvent" short-description="Create a Customer request from a commEvent(email)">

Modified: ofbiz/trunk/applications/order/servicedef/services_request.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/servicedef/services_request.xml?rev=1752219&r1=1752218&r2=1752219&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/servicedef/services_request.xml (original)
+++ ofbiz/trunk/applications/order/servicedef/services_request.xml Mon Jul 11 21:51:24 2016
@@ -202,6 +202,13 @@ under the License.
         <override name="content" allow-html="any"/>
     </service>
 
+    <service name="createCustRequestStatus" engine="entity-auto" default-entity-name="CustRequestStatus" invoke="create" auth="true">
+        <description>Create a Cust Request Status Record</description>
+        <auto-attributes mode="IN" include="pk" optional="false"/>
+        <auto-attributes mode="IN" include="nonpk" optional="true"/>
+        <override name="custRequestStatusId" mode="OUT" optional="false"/>
+    </service>
+
     <!-- custRequest content services -->
     <service name="createCustRequestContent" engine="simple"
         location="component://order/minilang/request/CustRequestServices.xml"