svn commit: r575258 - in /ofbiz/trunk/applications/workeffort: script/org/ofbiz/workeffort/workeffort/ servicedef/ webapp/workeffort/WEB-INF/ widget/

[jacopoc]

Author: jacopoc
Date: Thu Sep 13 04:24:18 2007
New Revision: 575258

URL: http://svn.apache.org/viewvc?rev=575258&view=rev
Log:
Added ability to manage the information in the WorkEffortContactMech entity.

Modified:
    ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml
    ofbiz/trunk/applications/workeffort/servicedef/services.xml
    ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml
    ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml
    ofbiz/trunk/applications/workeffort/widget/WorkEffortMenus.xml
    ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml

Modified: ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml?rev=575258&r1=575257&r2=575258&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml (original)
+++ ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml Thu Sep 13 04:24:18 2007
@@ -278,17 +278,15 @@
         <check-errors/>
         <make-value value-name="newValue" entity-name="WorkEffortContactMech"/>
         <if-empty map-name="parameters" field-name="contactMechId">
-            <if-not-empty map-name="parameters" field-name="addToParty">
-                <call-map-processor xml-resource="org/ofbiz/party/contact/PartyContactMechMapProcs.xml"
-                    processor-name="partyContactMech" in-map-name="parameters" out-map-name="context"/>
+            <if-not-empty field-name="parameters.partyId">
+                <set-service-fields service-name="createPartyContactMech" map-name="parameters" to-map-name="context"/>
                 <call-service service-name="createPartyContactMech" in-map-name="context">
                     <default-message>Party Contact Mechanism successfully created.</default-message>
                     <result-to-field result-name="contactMechId" map-name="newValue"/>
                 </call-service>
                 <log level="info" message="Party ContactMech created"/>            
                 <else>
-                    <call-map-processor xml-resource="org/ofbiz/party/contact/ContactMechMapProcs.xml"
-                        processor-name="contactMech" in-map-name="parameters" out-map-name="context"/>
+                    <set-service-fields service-name="createContactMech" map-name="parameters" to-map-name="context"/>
                     <call-service service-name="createContactMech" in-map-name="context">
                         <default-message>Contact Mechanism successfully created.</default-message>
                         <result-to-field result-name="contactMechId" map-name="newValue"/>

Modified: ofbiz/trunk/applications/workeffort/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/servicedef/services.xml?rev=575258&r1=575257&r2=575258&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/servicedef/services.xml (original)
+++ ofbiz/trunk/applications/workeffort/servicedef/services.xml Thu Sep 13 04:24:18 2007
@@ -556,19 +556,37 @@
     <!-- WorkEffort Skill Standard Services -->
     <service name="createWorkEffortSkillStandard" engine="simple" default-entity-name="WorkEffortSkillStandard"
             location="org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml" invoke="createWorkEffortSkillStandard" auth="true">
-        <description>Create WOrkEffortSkillStandard</description>        
+        <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="org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml" invoke="updateWorkEffortSkillStandard" auth="true">
-        <description>Update WOrkEffortSkillStandard</description>
+        <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="org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml" invoke="deleteWorkEffortSkillStandard" auth="true">
-        <description>Delete WOrkEffortSkillStandard</description>
+        <description>Delete WorkEffortSkillStandard</description>
+        <auto-attributes mode="IN" include="pk" optional="false"/>
+    </service>
+
+    <!-- WorkEffort Contact Mech Services -->
+    <service name="createWorkEffortContactMech" engine="simple"
+            location="org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml" invoke="createWorkEffortContactMech" auth="true">
+        <description>Create WorkEffortContactMech; if contactMechId is not provided, a new contact mech is created (if partyId is set then the new contact mech is also associated to the party)</description>
+        <auto-attributes entity-name="WorkEffortContactMech" mode="IN" include="nonpk" optional="true"/>
+        <auto-attributes entity-name="PartyContactMech" include="all" mode="IN" optional="true"/>
+        <attribute name="workEffortId" mode="IN" type="String" optional="false"></attribute>
+        <attribute name="contactMechTypeId" mode="IN" type="String" optional="true"></attribute>
+        <attribute name="infoString" mode="IN" type="String" optional="true"></attribute>
+        <attribute name="contactMechPurposeTypeId" type="String" mode="IN" optional="true"/>
+        <attribute name="contactMechId" type="String" mode="INOUT" optional="true"/>
+    </service>
+    <service name="deleteWorkEffortContactMech" engine="simple" default-entity-name="WorkEffortContactMech"
+            location="org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml" invoke="deleteWorkEffortContactMech" auth="true">
+        <description>Delete WorkEffortContactMech</description>
         <auto-attributes mode="IN" include="pk" optional="false"/>
     </service>
 </services>

Modified: ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml?rev=575258&r1=575257&r2=575258&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml Thu Sep 13 04:24:18 2007
@@ -574,6 +574,24 @@
         <response name="error" type="view" value="EditWorkEffortKeywords"/>
     </request-map>
 
+    <!-- WorkEffort ContactMechs -->
+    <request-map uri="EditWorkEffortContactMechs">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="EditWorkEffortContactMechs"/>
+    </request-map>      
+    <request-map uri="createWorkEffortContactMech">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="createWorkEffortContactMech"/>
+        <response name="success" type="view" value="EditWorkEffortContactMechs"/>
+        <response name="error" type="view" value="EditWorkEffortContactMechs"/>
+    </request-map>
+    <request-map uri="deleteWorkEffortContactMech">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="deleteWorkEffortContactMech"/>
+        <response name="success" type="view" value="EditWorkEffortContactMechs"/>
+        <response name="error" type="view" value="EditWorkEffortContactMechs"/>
+    </request-map>
+
     <!-- Work Efort Advanced Search -->
      <request-map uri="WorkEffortSearchOptions">
         <security https="true" auth="true"/>
@@ -599,7 +617,8 @@
     <request-map uri="LookupPartyGroup"><security https="true" auth="true"/><response name="success" type="view" value="LookupPartyGroup"/></request-map>
     <request-map uri="LookupPartyAndUserLoginAndPerson"><security https="true" auth="true"/><response name="success" type="view" value="LookupPartyAndUserLoginAndPerson"/></request-map>    
     <request-map uri="LookupCommEvent"><security https="true" auth="true"/><response name="success" type="view" value="LookupCommEvent"/></request-map>
-    
+    <request-map uri="LookupContactMech"><security https="true" auth="true"/><response name="success" type="view" value="LookupContactMech"/></request-map>
+
     <request-map uri="LookupProduct"><security https="true" auth="true"/><response name="success" type="view" value="LookupProduct"/></request-map>
     <request-map uri="LookupVariantProduct"><security https="true" auth="true"/><response name="success" type="view" value="LookupVariantProduct"/></request-map>
     <request-map uri="LookupProductFeature"><security auth="true" https="true"/><response name="success" type="view" value="LookupProductFeature"/></request-map>
@@ -674,6 +693,7 @@
     <view-map name="EditWorkEffortReviews" type="screen" page="component://workeffort/widget/WorkEffortScreens.xml#EditWorkEffortReviews"/>    
     
     <view-map name="EditWorkEffortKeywords" type="screen" page="component://workeffort/widget/WorkEffortScreens.xml#EditWorkEffortKeywords"/>
+    <view-map name="EditWorkEffortContactMechs" type="screen" page="component://workeffort/widget/WorkEffortScreens.xml#EditWorkEffortContactMechs"/>
     <view-map name="WorkEffortSearchOptions" type="screen" page="component://workeffort/widget/WorkEffortScreens.xml#WorkEffortSearchOptions"/>
     <view-map name="WorkEffortSearchResults" type="screen" page="component://workeffort/widget/WorkEffortScreens.xml#WorkEffortSearchResults"/>
 
@@ -703,5 +723,6 @@
     <view-map name="LookupOrderHeader" type="screen" page="component://order/widget/ordermgr/LookupScreens.xml#LookupOrderHeader"/>
     <view-map name="LookupInvoice" page="component://accounting/widget/LookupScreens.xml#LookupInvoice" type="screen"/>
     <view-map name="LookupContent" page="component://content/widget/content/ContentScreens.xml#LookupContent" type="screen"/>
+    <view-map name="LookupContactMech" type="screen" page="component://party/widget/partymgr/LookupScreens.xml#LookupContactMech"/>
     <!-- end of view mappings -->
 </site-conf>

Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml?rev=575258&r1=575257&r2=575258&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml Thu Sep 13 04:24:18 2007
@@ -926,7 +926,7 @@
             <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteWorkEffortReview?workEffortId=${workEffortId}&amp;userLoginId=${userLoginId}&amp;reviewDate=${reviewDate}"/>
         </field>
     </form>
-        <!-- WorkEffortKeyword forms -->
+    <!-- WorkEffortKeyword forms -->
     <form name="AddWorkEffortKeyword" target="createWorkEffortKeyword" title="" type="single">
         <auto-fields-service service-name="createWorkEffortKeyword"/>
         <field name="workEffortId"><hidden value="${parameters.workEffortId}"/></field>
@@ -948,4 +948,23 @@
         </field>
     </form>
 
+    <!-- WorkEffortKeyword forms -->
+    <form name="AddWorkEffortContactMech" target="createWorkEffortContactMech" title="" type="single">
+        <field name="workEffortId"><hidden value="${parameters.workEffortId}"/></field>
+        <field name="contactMechId"><lookup target-form-name="LookupContactMech"/></field>
+        <field name="comments"><text size="50"/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field>
+    </form>
+    <form name="ListWorkEffortContactMechs" type="list" target="" list-name="workEffortContactMechs">
+        <actions>
+            <entity-and entity-name="WorkEffortContactMech" list-name="workEffortContactMechs">
+                <field-map env-name="workEffortId" field-name="workEffortId" />
+            </entity-and>
+        </actions>
+        <auto-fields-entity entity-name="WorkEffortContactMech" default-field-type="display"/>
+        <field name="workEffortId"><hidden/></field>
+        <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
+            <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteWorkEffortContactMech?workEffortId=${workEffortId}&amp;contactMechId=${contactMechId}"/>
+        </field>
+    </form>
 </forms>

Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortMenus.xml?rev=575258&r1=575257&r2=575258&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/WorkEffortMenus.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/WorkEffortMenus.xml Thu Sep 13 04:24:18 2007
@@ -91,6 +91,9 @@
         <menu-item name="WorkEffortKeywords" title="${uiLabelMap.WorkEffortKeywords}">
             <link target="EditWorkEffortKeywords?workEffortId=${workEffortId}"/>
         </menu-item>
+        <menu-item name="WorkEffortContactMechs" title="${uiLabelMap.WorkEffortContactMechs}">
+            <link target="EditWorkEffortContactMechs?workEffortId=${workEffortId}"/>
+        </menu-item>
     </menu>
     
 </menus>

Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml?rev=575258&r1=575257&r2=575258&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml Thu Sep 13 04:24:18 2007
@@ -625,6 +625,26 @@
             </widgets>
         </section>
     </screen>
+    <screen name="EditWorkEffortContactMechs">
+        <section>
+            <actions>
+                <set field="titleProperty" value="PageTitleEditWorkEffortContactMechs"/>
+                <set field="tabButtonItem" value="WorkEffortContactMechs"/>
+                <set field="labelTitleProperty" value="PageTitleEditWorkEffortContactMechs"/>
+                <set field="workEffortId" from-field="parameters.workEffortId"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="CommonWorkEffortDecorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <container><label style="head1">${uiLabelMap.CommonCreate}</label></container>
+                        <include-form name="AddWorkEffortContactMech" location="component://workeffort/widget/WorkEffortForms.xml"/>
+                        <container><label style="head1">${uiLabelMap.WorkEffortContactMechs}</label></container>
+                        <include-form name="ListWorkEffortContactMechs" location="component://workeffort/widget/WorkEffortForms.xml"/>                        
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
 
     <screen name="WorkEffortSearchResults">
         <section>