svn commit: r776217 - in /ofbiz/trunk: applications/order/servicedef/ applications/workeffort/servicedef/ specialpurpose/myportal/webapp/myportal/WEB-INF/ specialpurpose/projectmgr/script/org/ofbiz/project/ specialpurpose/projectmgr/widget/forms/

[hansbak-2]

Author: hansbak
Date: Tue May 19 07:20:55 2009
New Revision: 776217

URL: http://svn.apache.org/viewvc?rev=776217&view=rev
Log:
 some error corrections on r775883: create custreq,task and assign from commevent all in one screen

Modified:
    ofbiz/trunk/applications/order/servicedef/services_request.xml
    ofbiz/trunk/applications/workeffort/servicedef/secas.xml
    ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml
    ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectSimpleEvents.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml

Modified: ofbiz/trunk/applications/order/servicedef/services_request.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/servicedef/services_request.xml?rev=776217&r1=776216&r2=776217&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/servicedef/services_request.xml (original)
+++ ofbiz/trunk/applications/order/servicedef/services_request.xml Tue May 19 07:20:55 2009
@@ -168,6 +168,7 @@
         <description>Create a Customer request from a commEvent(email)</description>
         <auto-attributes mode="IN" include="pk" optional="false"/>
         <auto-attributes mode="IN" include="nonpk" optional="true"/>
+        <attribute name="custRequestId" type="String" mode="INOUT"/>
         <attribute name="custRequestTypeId" mode="IN" type="String" optional="true"/>
         <attribute name="custRequestName" mode="IN" type="String" optional="true"/>
         <attribute name="custRequestId" mode="OUT" type="String" optional="false"/>

Modified: ofbiz/trunk/applications/workeffort/servicedef/secas.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/servicedef/secas.xml?rev=776217&r1=776216&r2=776217&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/servicedef/secas.xml (original)
+++ ofbiz/trunk/applications/workeffort/servicedef/secas.xml Tue May 19 07:20:55 2009
@@ -26,6 +26,7 @@
     </eca>
     <eca service="createWorkEffort" event="commit">
         <condition field-name="communicationEventId" operator="is-not-empty"/>
+        <condition field-name="custRequestId" operator="is-empty"/><!-- otherwise link is made over the customer request -->
         <action service="makeCommunicationEventWorkEffort" mode="sync"/>
     </eca>
 

Modified: ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml?rev=776217&r1=776216&r2=776217&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml Tue May 19 07:20:55 2009
@@ -26,9 +26,9 @@
     <include location="component://common/webcommon/WEB-INF/portal-controller.xml"/>
     <include location="component://party/webapp/partymgr/WEB-INF/controller.xml"/>
     <include location="component://order/webapp/ordermgr/WEB-INF/controller.xml"/>
-    <include location="component://projectmgr/webapp/projectmgr/WEB-INF/controller.xml"/>
     <include location="component://workeffort/webapp/workeffort/WEB-INF/controller.xml"/>
-
+    <include location="component://projectmgr/webapp/projectmgr/WEB-INF/controller.xml"/>
+    
     <description>Show personal information in the system</description>
 
     <request-map uri="main">

Modified: ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectSimpleEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectSimpleEvents.xml?rev=776217&r1=776216&r2=776217&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectSimpleEvents.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectSimpleEvents.xml Tue May 19 07:20:55 2009
@@ -21,10 +21,19 @@
 <simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd">
     <simple-method method-name="CreateCustRequestAndAssignTaskToPerson" short-description="">
         <set field="parameters.statusId" value="CRQ_ACCEPTED"/><!-- entered by employee, should only enter accepted customer requests -->
-        <set-service-fields service-name="createCustRequest" map="parameters" to-map="eventCreateCust"/>
-        <call-service service-name="createCustRequest" in-map-name="eventCreateCust">
-            <result-to-field result-name="custRequestId" field="custRequestId"/>
-        </call-service>
+        <if-not-empty field="parameters.communicationEventId">
+            <set-service-fields service-name="createCustRequestFromCommEvent" map="parameters" to-map="eventCreateCust"/>
+            <call-service service-name="createCustRequestFromCommEvent" in-map-name="eventCreateCust">
+                <result-to-field result-name="custRequestId"/>
+            </call-service>
+            <else>
+                <set-service-fields service-name="createCustRequest" map="parameters" to-map="eventCreateCust"/>
+                <call-service service-name="createCustRequest" in-map-name="eventCreateCust">
+                    <result-to-field result-name="custRequestId"/>
+                </call-service>
+            </else>
+        </if-not-empty>
+        <set field="eventMessage" value="Customer request: ${custRequestId} created"/>
         <if-not-empty field="parameters.workEffortParentId">
             <set-service-fields service-name="createWorkEffort" map="parameters" to-map="createTask"/>
             <set field="createTask.custRequestId" from-field="custRequestId"/>
@@ -32,6 +41,7 @@
             <call-service service-name="createWorkEffort" in-map-name="createTask" >
                 <result-to-field result-name="workEffortId" field="workEffortId"/>
             </call-service>
+            <set field="eventMessage" value="${eventMessage} and attached to task: ${workEffortId}"/>
             <set field="updCust.statusId" value="CRQ_REVIEWED"/>
             <set field="updCust.custRequestId" from-field="custRequestId"/>
             <call-service service-name="updateCustRequest" in-map-name="updCust"/>
@@ -41,8 +51,10 @@
                 <set field="assignParty.roleTypeId" from-field="parameters.roleTypeId"/>
                 <set field="assignParty.statusId" value="PAS_ASSIGNED"/>
                 <call-service service-name="assignPartyToWorkEffort" in-map-name="assignParty"/>
+                <set field="eventMessage" value="${eventMessage} and assigned to party: ${parameters.partyId}"/>
             </if-not-empty>
         </if-not-empty>
+        <set field="_event_message_" from-field="eventMessage"/>
     </simple-method>
     <simple-method method-name="acceptRequestAndConnectToTask" short-description="Accept a customer request and connect to an existing task">
         <entity-one entity-name="WorkEffort" value-field="workEffort"/>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml?rev=776217&r1=776216&r2=776217&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml Tue May 19 07:20:55 2009
@@ -28,8 +28,9 @@
             </hyperlink>
         </field>
     </form>
-    <form name="EditCustRequest" type="single" target="updaterequest" title="Request" default-map-name="custRequest"
+    <form name="EditCustRequest" type="single" target="createrequest" title="Request" default-map-name="custRequest"
         extends="EditSmallCustRequest" extends-resource="component://order/webapp/ordermgr/request/RequestForms.xml">
+        <alt-target use-when="custRequest!=null" target="updateRequest"/>
         <field name="custRequestName"><text default-value="${communicationEvent.subject}"/></field>
         <field name="description" parameter-name="story" use-when="custRequest==null" encode-output="false"><textarea cols="60" rows="12" default-value="${communicationEvent.content}"/></field>
         <field name="workEffortName"><hidden value="${custRequestName}"/></field>
@@ -37,6 +38,7 @@
         <field name="statusId"><hidden value="PAS_ASSIGNED"/></field>
         <field name="workEffortTypeId"><hidden value="TASK"/></field>
         <field name="currentStatusId"><hidden value="PTS_CREATED"/></field>
+        <field name="communicationEventId"><hidden value="${communicationEvent.communicationEventId}"/></field>
         <field name="childWorkEffortId" parameter-name="workEffortParentId" title="${uiLabelMap.ProjectMgrProjectAndPhaseName}*">
             <drop-down allow-empty="true">
                 <entity-options entity-name="WorkEffortAndChild" description="${workEffortName} -- ${childWorkEffortName}">