Author: deepak
Date: Mon Oct 17 18:57:33 2016
New Revision: 1765352

URL: http://svn.apache.org/viewvc?rev=1765352&view=rev
Log:
Improved: Converted some WorkEffort related CRUD services from simple to 
entity-auto.
(OFBIZ-8394)(OFBIZ-8395)(OFBIZ-8396)(OFBIZ-8397)(OFBIZ-8398)(OFBIZ-8399)(OFBIZ-8400)(OFBIZ-8401)(OFBIZ-8402)(OFBIZ-8403)(OFBIZ-8404)(OFBIZ-8405)(OFBIZ-8406)

Thanks Pawan Verma for your contribution.

Modified:
    
ofbiz/trunk/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml
    ofbiz/trunk/applications/workeffort/servicedef/services.xml

Modified: 
ofbiz/trunk/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml?rev=1765352&r1=1765351&r2=1765352&view=diff
==============================================================================
--- 
ofbiz/trunk/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml
 (original)
+++ 
ofbiz/trunk/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml
 Mon Oct 17 18:57:33 2016
@@ -401,10 +401,6 @@ under the License.
         <now-timestamp field="del.thruDate"/>
         <call-service service-name="updatePartyToWorkEffortAssignment" 
in-map-name="del"/>
     </simple-method>
-    <simple-method method-name="unassignPartyFromWorkEffort" 
short-description="Service that deletes a WorkEffortPartyAssignment entity">
-        <entity-one entity-name="WorkEffortPartyAssignment" 
value-field="workEffortPartyAssignment"/>
-        <remove-value value-field="workEffortPartyAssignment"/>
-    </simple-method>
 
     <!-- Create a WorkEffortContactMech -->
     <simple-method method-name="createWorkEffortContactMech" 
short-description="Create a WorkEffortContactMech">
@@ -738,15 +734,6 @@ under the License.
         </else>
         </if-not-empty>
     </simple-method>
-    <simple-method method-name="updateWorkEffortAssoc" 
short-description="Update a WorkEffort association">
-        <entity-one entity-name="WorkEffortAssoc" value-field="lookedUpValue"/>
-        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
-        <store-value value-field="lookedUpValue"/>
-    </simple-method>
-    <simple-method method-name="removeWorkEffortAssoc" 
short-description="Remove a WorkEffort association">
-        <entity-one entity-name="WorkEffortAssoc" value-field="lookedUpValue"/>
-        <remove-value value-field="lookedUpValue"/>
-    </simple-method>
 
     <simple-method method-name="copyWorkEffortAssocs" short-description="Copy 
WorkEffort associations">
         <set field="deepCopy" from-field="parameters.deepCopy" 
default-value="N" />
@@ -795,15 +782,6 @@ under the License.
         </else>
         </if-not-empty>
     </simple-method>
-    <simple-method method-name="updateWorkEffortGoodStandard" 
short-description="Update a link between a WorkEffort and a Product">
-        <entity-one entity-name="WorkEffortGoodStandard" 
value-field="lookedUpValue"/>
-        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
-        <store-value value-field="lookedUpValue"/>
-    </simple-method>
-    <simple-method method-name="removeWorkEffortGoodStandard" 
short-description="Remove a link between a WorkEffort and a Product">
-        <entity-one entity-name="WorkEffortGoodStandard" 
value-field="lookedUpValue"/>
-        <remove-value value-field="lookedUpValue"/>
-    </simple-method>
     <simple-method method-name="assignInventoryToWorkEffort" 
short-description="Create or update WorkEffortInventoryAssign">
         <set value="Create or update WorkEffortInventoryAssign" 
field="operationName"/>
 
@@ -1387,31 +1365,6 @@ under the License.
         <field-to-result field="workEffortId"/>
     </simple-method>
 
-                  <!-- WorkEffortSkillStandard Services-->
-    <simple-method  method-name="createWorkEffortSkillStandard" 
short-description="Create WorkEffortSkillStandard">
-        <make-value entity-name="WorkEffortSkillStandard" 
value-field="newEntity"/>
-        <set-pk-fields map="parameters" value-field="newEntity"/>
-        <set-nonpk-fields map="parameters" value-field="newEntity"/>
-        <create-value value-field="newEntity"/>
-    </simple-method>
-    <simple-method  method-name="updateWorkEffortSkillStandard" 
short-description="Update WorkEffortSkillStandard">
-        <entity-one entity-name="WorkEffortSkillStandard" 
value-field="lookedUpValue"/>
-        <set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
-        <store-value value-field="lookedUpValue"/>
-    </simple-method>
-    <simple-method  method-name="deleteWorkEffortSkillStandard" 
short-description="Delete WorkEffortSkillStandard">
-        <entity-one entity-name="WorkEffortSkillStandard" 
value-field="lookedUpValue"/>
-        <remove-value value-field="lookedUpValue"/>
-    </simple-method>
-    <simple-method method-name="createWorkEffortInventoryProduced" 
short-description="Create Work Effort InventoryProduced">
-        <make-value entity-name="WorkEffortInventoryProduced" 
value-field="newEntity"/>
-        <set-pk-fields map="parameters" value-field="newEntity"/>
-        <create-value value-field="newEntity"/>
-    </simple-method>
-    <simple-method method-name="deleteWorkEffortInventoryProduced" 
short-description="Delete Work Effort InventoryProduced">
-        <entity-one entity-name="WorkEffortInventoryProduced" 
value-field="lookedUpValue"/>
-        <remove-value value-field="lookedUpValue"/>
-    </simple-method>
     <!-- WorkEffort ServiceTest Services -->
     <simple-method method-name="testCreateEventService" 
short-description="test to create new event (workeffort) service" 
login-required="false">
         <log level="info" message="====================Create an event test 
case=========================================="/>
@@ -1641,30 +1594,6 @@ under the License.
             </iterate>
         </if-not-empty>
     </simple-method>
-    
-    <!-- Work Effort Survey Services -->
-    <simple-method method-name="createWorkEffortSurveyAppl" 
short-description="Create WorkEffortSurvey">
-        <make-value entity-name="WorkEffortSurveyAppl" 
value-field="newEntity"/>
-        <set-pk-fields map="parameters" value-field="newEntity"/>
-        <set-nonpk-fields map="parameters" value-field="newEntity"/>
-        <if-empty field="newEntity.fromDate">
-            <now-timestamp field="nowTimeStamp"/>
-            <set field="newEntity.fromDate" from-field="nowTimeStamp"/>
-        </if-empty>        
-        <create-value value-field="newEntity"/>
-    </simple-method>
-    <simple-method method-name="updateWorkEffortSurveyAppl" 
short-description="Update WorkEffortSurvey">
-        <entity-one entity-name="WorkEffortSurveyAppl" 
value-field="lookedUpValue"/>
-        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
-        <store-value value-field="lookedUpValue"/>
-    </simple-method>
-    <simple-method method-name="deleteWorkEffortSurveyAppl" 
short-description="Delete Work Effort Survey">
-        <entity-one entity-name="WorkEffortSurveyAppl" 
value-field="lookedUpValue"/>
-        <now-timestamp field="nowTimestamp"/>
-        <set field="lookedUpValue.thruDate" from-field="nowTimestamp"/>
-        <store-value value-field="lookedUpValue"/>
-    </simple-method>
-
     <!-- iCalendar services -->
 
     <simple-method method-name="getICalWorkEfforts" short-description="Get All 
Work Efforts Related To An iCalendar Publish Point" login-required="false">

Modified: ofbiz/trunk/applications/workeffort/servicedef/services.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/servicedef/services.xml?rev=1765352&r1=1765351&r2=1765352&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/servicedef/services.xml (original)
+++ ofbiz/trunk/applications/workeffort/servicedef/services.xml Mon Oct 17 
18:57:33 2016
@@ -171,8 +171,7 @@ under the License.
         <permission-service service-name="workEffortGenericPermission" 
main-action="UPDATE"/>
         <auto-attributes mode="IN" include="pk" optional="false"/>
     </service>
-    <service name="unassignPartyFromWorkEffort" 
default-entity-name="WorkEffortPartyAssignment" engine="simple"
-            
location="component://workeffort/minilang/workeffort/WorkEffortSimpleServices.xml"
 invoke="unassignPartyFromWorkEffort">
+    <service name="unassignPartyFromWorkEffort" 
default-entity-name="WorkEffortPartyAssignment" engine="entity-auto" 
invoke="delete">
         <description>Delete a WorkEffortPartyAssignment Entity</description>
         <permission-service service-name="workEffortGenericPermission" 
main-action="DELETE"/>
         <auto-attributes mode="IN" include="pk" optional="false"/>
@@ -316,8 +315,7 @@ under the License.
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
         <override name="fromDate" optional="true"/>
     </service>
-    <service name="updateWorkEffortAssoc" 
default-entity-name="WorkEffortAssoc" engine="simple"
-            
location="component://workeffort/minilang/workeffort/WorkEffortSimpleServices.xml"
 invoke="updateWorkEffortAssoc">
+    <service name="updateWorkEffortAssoc" 
default-entity-name="WorkEffortAssoc" engine="entity-auto" invoke="update">
         <description>
             Update a WorkEffort Assoc, for linking task to describe a project 
or
             for linking routing with its routingTasks
@@ -326,8 +324,7 @@ under the License.
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
-    <service name="removeWorkEffortAssoc" engine="simple" 
default-entity-name="WorkEffortAssoc"
-            
location="component://workeffort/minilang/workeffort/WorkEffortSimpleServices.xml"
 invoke="removeWorkEffortAssoc">
+    <service name="removeWorkEffortAssoc" engine="entity-auto" 
default-entity-name="WorkEffortAssoc" invoke="delete">
         <description>
             Remove a WorkEffort Assoc, for linking task to describe a project 
or
             for linking routing with its routingTasks
@@ -387,8 +384,7 @@ under the License.
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
         <override name="fromDate" optional="true"/>
     </service>
-    <service name="updateWorkEffortGoodStandard" engine="simple" 
default-entity-name="WorkEffortGoodStandard"
-            
location="component://workeffort/minilang/workeffort/WorkEffortSimpleServices.xml"
 invoke="updateWorkEffortGoodStandard">
+    <service name="updateWorkEffortGoodStandard" engine="entity-auto" 
default-entity-name="WorkEffortGoodStandard" invoke="update">
         <description>
             Update a WorkEffort - Product Assoc, for linking WorkEffort to In 
or Out  Product,
             for routing it's the link between Manufactured Product with its 
routings
@@ -397,8 +393,7 @@ under the License.
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
-    <service name="removeWorkEffortGoodStandard" engine="simple" 
default-entity-name="WorkEffortGoodStandard"
-            
location="component://workeffort/minilang/workeffort/WorkEffortSimpleServices.xml"
 invoke="removeWorkEffortGoodStandard">
+    <service name="removeWorkEffortGoodStandard" engine="entity-auto" 
default-entity-name="WorkEffortGoodStandard" invoke="delete">
         <description>Remove a WorkEffort - Product Assoc, for linking 
WorkEffort to In or Out  Product,
             for routing it's the link between Manufactured Product with its 
routings
         </description>
@@ -689,20 +684,17 @@ under the License.
     </service>
 
     <!-- WorkEffort Skill Standard Services -->
-    <service name="createWorkEffortSkillStandard" engine="simple" 
default-entity-name="WorkEffortSkillStandard"
-            
location="component://workeffort/minilang/workeffort/WorkEffortSimpleServices.xml"
 invoke="createWorkEffortSkillStandard" auth="true">
+    <service name="createWorkEffortSkillStandard" engine="entity-auto" 
default-entity-name="WorkEffortSkillStandard" invoke="create" auth="true">
         <description>Create WorkEffortSkillStandard</description>
         <auto-attributes mode="IN" include="pk" optional="false"/>
         <auto-attributes mode="IN" include="nonpk" optional="true"/>
     </service>
-    <service name="updateWorkEffortSkillStandard" engine="simple" 
default-entity-name="WorkEffortSkillStandard"
-            
location="component://workeffort/minilang/workeffort/WorkEffortSimpleServices.xml"
 invoke="updateWorkEffortSkillStandard" auth="true">
+    <service name="updateWorkEffortSkillStandard" engine="entity-auto" 
default-entity-name="WorkEffortSkillStandard" invoke="update" auth="true">
         <description>Update WorkEffortSkillStandard</description>
         <auto-attributes mode="IN" include="pk" optional="false"/>
         <auto-attributes mode="IN" include="nonpk" optional="true"/>
     </service>
-    <service name="deleteWorkEffortSkillStandard" engine="simple" 
default-entity-name="WorkEffortSkillStandard"
-            
location="component://workeffort/minilang/workeffort/WorkEffortSimpleServices.xml"
 invoke="deleteWorkEffortSkillStandard" auth="true">
+    <service name="deleteWorkEffortSkillStandard" engine="entity-auto" 
default-entity-name="WorkEffortSkillStandard" invoke="delete" auth="true">
         <description>Delete WorkEffortSkillStandard</description>
         <auto-attributes mode="IN" include="pk" optional="false"/>
     </service>
@@ -748,14 +740,12 @@ under the License.
     </service>
 
     <!--WorkEffortInventoryProduced Services   -->
-    <service name="createWorkEffortInventoryProduced" engine="simple" 
default-entity-name="WorkEffortInventoryProduced"
-            
location="component://workeffort/minilang/workeffort/WorkEffortSimpleServices.xml"
 invoke="createWorkEffortInventoryProduced" auth="true">
+    <service name="createWorkEffortInventoryProduced" engine="entity-auto" 
default-entity-name="WorkEffortInventoryProduced" invoke="create" auth="true">
         <description>Create WorkEffortInventoryProduced</description>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="false"/>
     </service>
-    <service name="deleteWorkEffortInventoryProduced" engine="simple" 
default-entity-name="WorkEffortInventoryProduced"
-            
location="component://workeffort/minilang/workeffort/WorkEffortSimpleServices.xml"
 invoke="deleteWorkEffortInventoryProduced" auth="true">
+    <service name="deleteWorkEffortInventoryProduced" engine="entity-auto" 
default-entity-name="WorkEffortInventoryProduced" invoke="delete" auth="true">
         <description>Delete WorkEffortInventoryProduced</description>
         <auto-attributes mode="IN" include="pk" optional="false"/>
     </service>
@@ -831,23 +821,19 @@ under the License.
     </service>
 
     <!-- WorkEffort and Survey Services -->
-    <service name="createWorkEffortSurveyAppl" engine="simple" 
default-entity-name="WorkEffortSurveyAppl"
-        
location="component://workeffort/minilang/workeffort/WorkEffortSimpleServices.xml"
 invoke="createWorkEffortSurveyAppl" auth="true">
+    <service name="createWorkEffortSurveyAppl" 
default-entity-name="WorkEffortSurveyAppl" engine="entity-auto" invoke="create" 
auth="true">
         <description>Create a WorkEffort Survey</description>
         <permission-service service-name="workEffortGenericPermission" 
main-action="CREATE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
-        <override name="fromDate" optional="true"/>
     </service>
-    <service name="updateWorkEffortSurveyAppl" 
default-entity-name="WorkEffortSurveyAppl" engine="simple"
-        
location="component://workeffort/minilang/workeffort/WorkEffortSimpleServices.xml"
 invoke="updateWorkEffortSurveyAppl" auth="true">
+    <service name="updateWorkEffortSurveyAppl" 
default-entity-name="WorkEffortSurveyAppl" engine="entity-auto" invoke="update" 
auth="true">
         <description>Update a WorkEffort Survey</description>
         <permission-service service-name="workEffortGenericPermission" 
main-action="UPDATE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
-    <service name="deleteWorkEffortSurveyAppl" 
default-entity-name="WorkEffortSurveyAppl" engine="simple"
-        
location="component://workeffort/minilang/workeffort/WorkEffortSimpleServices.xml"
 invoke="deleteWorkEffortSurveyAppl" auth="true">
+    <service name="deleteWorkEffortInventoryProduced" engine="entity-autp" 
default-entity-name="WorkEffortInventoryProduced" invoke="delete" auth="true">
         <description>Delete a WorkEffort Survey</description>
         <permission-service service-name="workEffortGenericPermission" 
main-action="DELETE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>


Reply via email to