[OFBiz] SVN: r7810 - in trunk/applications/workeffort: script/org/ofbiz/workeffort/workeffort servicedef widget
jonesde@svn.ofbiz.org
jonesde at svn.ofbiz.org
Sat Jun 17 19:13:55 CDT 2006
Author: jonesde
Date: 2006-06-17 19:13:49 -0500 (Sat, 17 Jun 2006)
New Revision: 7810
Modified:
trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml
trunk/applications/workeffort/servicedef/secas.xml
trunk/applications/workeffort/servicedef/service_groups.xml
trunk/applications/workeffort/servicedef/services.xml
trunk/applications/workeffort/widget/WorkEffortForms.xml
Log:
Applied patch from Anil Patel to fix and cleanup the createWorkEffortAndAssoc service; beyond the patch I removed the old ID mapping service that is no longer needed or used
Modified: trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml
===================================================================
--- trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml 2006-06-17 22:39:04 UTC (rev 7809)
+++ trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml 2006-06-18 00:13:49 UTC (rev 7810)
@@ -511,6 +511,31 @@
<set from-field="parameters.workEffortId" field="newWorkEffortNote.workEffortId"/>
<create-value value-name="newWorkEffortNote"/>
</simple-method>
+
+ <simple-method method-name="createWorkEffortAndAssoc" short-description="Create a WorkEffort and association">
+ <if-empty field-name="parameters.fromDate">
+ <now-timestamp-to-env env-name="parameters.fromDate"/>
+ <else>
+ <entity-one entity-name="WorkEffortAssoc" value-name="lookedUpValue"/>
+ </else>
+ </if-empty>
+ <if-not-empty field-name="lookedUpValue">
+ <add-error><fail-property resource="WorkEffortUiLabels" property="WorkEffortWorkEffortAssocIdAlreadyExist"/></add-error>
+ <check-errors/>
+ <else>
+ <if-empty field-name="parameters.workEffortIdFrom">
+ <set-service-fields service-name="createWorkEffort" map-name="parameters" to-map-name="createWorkeEffortParams"/>
+ <call-service in-map-name="createWorkeEffortParams" service-name="createWorkEffort">
+ <result-to-result result-name="workEffortId"/>
+ <result-to-field result-name="workEffortId" field-name="workEffortIdFrom"/>
+ </call-service>
+ <field-to-field field-name="workEffortIdFrom" to-field-name="workEffortIdFrom" to-map-name="parameters"/>
+ </if-empty>
+ <set-service-fields service-name="createWorkEffortAssoc" map-name="parameters" to-map-name="createWorkEffortAssocParams"/>
+ <call-service in-map-name="createWorkEffortAssocParams" service-name="createWorkEffortAssoc" />
+ </else>
+ </if-not-empty>
+ </simple-method>
<simple-method method-name="createWorkEffortAssoc" short-description="Create a WorkEffort association">
<if-empty field-name="parameters.fromDate">
@@ -587,20 +612,7 @@
</else>
</if-not-empty>
</simple-method>
- <simple-method method-name="assignAssocWorkEffortId" short-description="Assign workEffortId to empty workEffortIdTo/From">
- <if-empty field-name="workEffortId" map-name="parameters">
- <add-error><fail-property resource="WorkEffortUiLabels" property="WorkEffortWorkEffortIdEmpty"/></add-error>
- <check-errors/>
- </if-empty>
- <if-empty field-name="parameters.workEffortIdTo">
- <field-to-result field-name="parameters.workEffortId" result-name="workEffortIdTo"/>
- <else>
- <if-empty field-name="parameters.workEffortIdFrom">
- <field-to-result field-name="parameters.workEffortId" result-name="workEffortIdFrom"/>
- </if-empty>
- </else>
- </if-empty>
- </simple-method>
+
<!-- CustRequest workeffort -->
<simple-method method-name="createWorkEffortRequest" short-description="Create a CustRequestWorkEffort">
<make-value entity-name="CustRequestWorkEffort" value-name="lookupMap"/>
Modified: trunk/applications/workeffort/servicedef/secas.xml
===================================================================
--- trunk/applications/workeffort/servicedef/secas.xml 2006-06-17 22:39:04 UTC (rev 7809)
+++ trunk/applications/workeffort/servicedef/secas.xml 2006-06-18 00:13:49 UTC (rev 7810)
@@ -36,12 +36,6 @@
<condition field-name="communicationEventId" operator="is-not-empty"/>
<action service="makeCommunicationEventWorkEffort" mode="sync"/>
</eca>
-
- <eca service="createWorkEffortAndAssoc" event="invoke">
- <condition field-name="workEffortIdFrom" operator="is-empty"/>
- <action service="createWorkEffort" mode="sync" />
- <action service="assignAssocWorkEffortId" mode="sync" />
- </eca>
<eca service="createCommunicationEventWorkEff" event="invoke">
<condition field-name="communicationEventId" operator="is-empty"/>
<action service="createCommunicationEvent" mode="sync" />
Modified: trunk/applications/workeffort/servicedef/service_groups.xml
===================================================================
--- trunk/applications/workeffort/servicedef/service_groups.xml 2006-06-17 22:39:04 UTC (rev 7809)
+++ trunk/applications/workeffort/servicedef/service_groups.xml 2006-06-18 00:13:49 UTC (rev 7810)
@@ -23,11 +23,6 @@
<service-group xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/service-group.xsd">
- <group name="createWorkEffortAndAssoc" send-mode="all" >
- <service name="createWorkEffort" mode="sync" result-to-context="true"/>
- <service name="assignAssocWorkEffortId" mode="sync" result-to-context="true"/>
- <service name="createWorkEffortAssoc" mode="sync"/>
- </group>
<group name="updateWorkEffortAndAssoc" send-mode="all" >
<service name="updateWorkEffort" mode="sync" />
Modified: trunk/applications/workeffort/servicedef/services.xml
===================================================================
--- trunk/applications/workeffort/servicedef/services.xml 2006-06-17 22:39:04 UTC (rev 7809)
+++ trunk/applications/workeffort/servicedef/services.xml 2006-06-18 00:13:49 UTC (rev 7810)
@@ -208,14 +208,7 @@
</description>
<auto-attributes include="pk" mode="IN" optional="false"/>
</service>
- <service name="assignAssocWorkEffortId" engine="simple"
- location="org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml" invoke="assignAssocWorkEffortId" auth="true">
- <description>Assign workEffortId to empty workEffortIdTo/From</description>
- <attribute name="workEffortId" type="java.lang.String" mode="IN" optional="false"/>
- <attribute name="workEffortIdFrom" type="java.lang.String" mode="INOUT" optional="true"/>
- <attribute name="workEffortIdTo" type="java.lang.String" mode="INOUT" optional="true"/>
- </service>
- <service name="createWorkEffortAndAssoc" engine="simple" location="org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml" invoke="createWorkEffortAssoc" auth="true">
+ <service name="createWorkEffortAndAssoc" engine="simple" location="org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml" invoke="createWorkEffortAndAssoc" auth="true">
<description>Creates a WorkEffort entity and WorkEffortAssoc</description>
<auto-attributes include="pk" mode="INOUT" optional="true" entity-name="WorkEffort"/>
<auto-attributes include="nonpk" mode="IN" optional="true" entity-name="WorkEffort"/>
Modified: trunk/applications/workeffort/widget/WorkEffortForms.xml
===================================================================
--- trunk/applications/workeffort/widget/WorkEffortForms.xml 2006-06-17 22:39:04 UTC (rev 7809)
+++ trunk/applications/workeffort/widget/WorkEffortForms.xml 2006-06-18 00:13:49 UTC (rev 7810)
@@ -230,7 +230,7 @@
<form name="AddWorkEffortAndAssoc" extends="EditWorkEffort" default-map-name="workEffort"
default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox"
target="createWorkEffortAndAssoc" title="" type="single">
- <field name="workEffortId"><hidden/></field>
+ <!-- <field name="workEffortId"><hidden/></field> -->
<field name="workEffortIdTo"><text/></field>
<field name="workEffortIdFrom"><lookup target-form-name="LookupWorkEffort"/></field>
<field name="workEffortAssocTypeId">
More information about the Svn
mailing list