svn commit: r680109 - in /ofbiz/trunk: applications/party/data/ applications/party/script/org/ofbiz/party/communication/ specialpurpose/mypage/config/ specialpurpose/mypage/widget/

[hansbak-2]

Author: hansbak
Date: Sun Jul 27 07:22:52 2008
New Revision: 680109

URL: http://svn.apache.org/viewvc?rev=680109&view=rev
Log:
changed the displayed status value from complete to closed in order not to confuse it with other statusvalues of other information in ofbiz

Modified:
    ofbiz/trunk/applications/party/data/PartyTypeData.xml
    ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml
    ofbiz/trunk/specialpurpose/mypage/config/MyPageUiLabels.xml
    ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml

Modified: ofbiz/trunk/applications/party/data/PartyTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/data/PartyTypeData.xml?rev=680109&r1=680108&r2=680109&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/data/PartyTypeData.xml (original)
+++ ofbiz/trunk/applications/party/data/PartyTypeData.xml Sun Jul 27 07:22:52 2008
@@ -302,7 +302,7 @@
     <StatusItem description="Read" sequenceId="03" statusCode="READ" statusId="COM_READ" statusTypeId="COM_EVENT_STATUS"/>
     <StatusItem description="In-Progress" sequenceId="05" statusCode="IN_PROGRESS" statusId="COM_IN_PROGRESS" statusTypeId="COM_EVENT_STATUS"/>
     <StatusItem description="Unknown Party" sequenceId="07" statusCode="UNKNOWN_PARTY" statusId="COM_UNKNOWN_PARTY" statusTypeId="COM_EVENT_STATUS"/>
-    <StatusItem description="Complete" sequenceId="20" statusCode="COMPLETE" statusId="COM_COMPLETE" statusTypeId="COM_EVENT_STATUS"/>
+    <StatusItem description="Closed" sequenceId="20" statusCode="COMPLETE" statusId="COM_COMPLETE" statusTypeId="COM_EVENT_STATUS"/>
     <StatusItem description="Resolved" sequenceId="21" statusCode="RESOLVED" statusId="COM_RESOLVED" statusTypeId="COM_EVENT_STATUS"/>
     <StatusItem description="Referred" sequenceId="22" statusCode="REFERRED" statusId="COM_REFERRED" statusTypeId="COM_EVENT_STATUS"/>
     <StatusItem description="Cancelled" sequenceId="99" statusCode="CANCELLED" statusId="COM_CANCELLED" statusTypeId="COM_EVENT_STATUS"/>
@@ -331,7 +331,7 @@
     <StatusType description="Communication Event Role" hasTable="N" parentTypeId="COM_EVENT_STATUS" statusTypeId="COM_EVENT_ROL_STATUS"/>
     <StatusItem description="Created" sequenceId="01" statusCode="ENTERED" statusId="COM_ROLE_CREATED" statusTypeId="COM_EVENT_ROL_STATUS"/>
     <StatusItem description="Read" sequenceId="02" statusCode="PENDING" statusId="COM_ROLE_READ" statusTypeId="COM_EVENT_ROL_STATUS"/>
-    <StatusItem description="Completed" sequenceId="03" statusCode="READ" statusId="COM_ROLE_COMPLETED" statusTypeId="COM_EVENT_ROL_STATUS"/>
+    <StatusItem description="Closed" sequenceId="03" statusCode="READ" statusId="COM_ROLE_COMPLETED" statusTypeId="COM_EVENT_ROL_STATUS"/>
     <StatusValidChange condition="" statusId="COM_ROLE_CREATED" statusIdTo="COM_ROLE_READ" transitionName="Read"/>
     <StatusValidChange condition="" statusId="COM_ROLE_CREATED" statusIdTo="COM_ROLE_COMPLETED" transitionName="Completed"/>
     <StatusValidChange condition="" statusId="COM_ROLE_READ" statusIdTo="COM_ROLE_COMPLETED" transitionName="Completed"/>

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=680109&r1=680108&r2=680109&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 Sun Jul 27 07:22:52 2008
@@ -313,6 +313,14 @@
         <set field="inCom.statusId" value="COM_ENTERED"/>
         <call-service service-name="updateCommunicationEvent" in-map-name="inCom"/>
         
+        <!-- and add a role -->
+        <set field="inComRole.communicationEventId" from-field="parameters.communicationEventId"/>
+        <set field="inComRole.partyId" from-field="parameters.partyId"/>
+        <set field="inComRole.roleTypeId" value="ORIGINATOR"/>
+        <set field="inComRole.statusId" value="COM_ROLE_CREATED"/>
+        <set field="inComRole.contactMechId" from-field="inCom.contactMechIdFrom" />
+        <call-service service-name="updateCommunicationEvent" in-map-name="inCom"/>
+        
         <field-to-request field-name="parameters.communicationEventId" request-name="communicationEventId"/>
     </simple-method>
     <simple-method method-name="createRequestFromCommEvent" short-description="Create a Customer request from a commEvent(email)">

Modified: ofbiz/trunk/specialpurpose/mypage/config/MyPageUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/config/MyPageUiLabels.xml?rev=680109&r1=680108&r2=680109&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/config/MyPageUiLabels.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/config/MyPageUiLabels.xml Sun Jul 27 07:22:52 2008
@@ -19,7 +19,7 @@
 -->
 <resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <property key="->Complete">
-        <value xml:lang="en">->Complete</value>
+        <value xml:lang="en">->Closed</value>
     </property>
     <property key="AllEvents">
         <value xml:lang="en">All Communications</value>

Modified: ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml?rev=680109&r1=680108&r2=680109&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml Sun Jul 27 07:22:52 2008
@@ -152,18 +152,7 @@
         </menu-item>
         <menu-item name="myTime" title="myTime"><link target="/projectmgr/control/MyTimesheet" url-mode="inter-app"/></menu-item>
     </menu>
-    
-    <!-- menu name="CommEventTabBar" default-selected-style="selected" type="simple"
-        menu-container-style="button-bar tab-bar" selected-menuitem-context-field-name="tabButtonItem">
-        <menu-item name="OverView" title="${uiLabelMap.CommonOverview}">
-            <condition><not><if-empty field-name="communicationEvent"/></not></condition>
-            <link target="ViewCommunicationEvent?communicationEventId=${parameters.communicationEventId}"/>
-        </menu-item>
-        <menu-item name="CommContent" title="${uiLabelMap.CommonContent}">
-            <condition><not><if-empty field-name="communicationEvent"/></not></condition>
-            <link target="ListCommContent?communicationEventId=${parameters.communicationEventId}"/>
-        </menu-item>
 
-    </menu-->
+
     
 </menus>
\ No newline at end of file