svn commit: r688731 - in /ofbiz/trunk: applications/workeffort/script/org/ofbiz/workeffort/workeffort/ applications/workeffort/servicedef/ applications/workeffort/widget/ specialpurpose/projectmgr/widget/ specialpurpose/projectmgr/widget/forms/

[ashish-18]

Author: ashish
Date: Mon Aug 25 07:20:53 2008
New Revision: 688731

URL: http://svn.apache.org/viewvc?rev=688731&view=rev
Log:
Applied patch from JIRA issue # https://issues.apache.org/jira/browse/OFBIZ-1931.
(Improvments in "updateWorkEffortNote" Service so that Work Effort Note (note info) can be editable.)

Thanks Ratnesh & Parimal for your patch.

Modified:
    ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml
    ofbiz/trunk/applications/workeffort/servicedef/services.xml
    ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml
    ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.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=688731&r1=688730&r2=688731&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 Mon Aug 25 07:20:53 2008
@@ -590,8 +590,11 @@
     </simple-method>
     <simple-method method-name="updateWorkEffortNote" short-description="Update Work Effort Note">
         <entity-one entity-name="WorkEffortNote" value-name="lookedUpValue"/>
+        <entity-one entity-name="NoteData" value-name="lookedUpValueForNoteData"/>
+        <set-nonpk-fields value-name="lookedUpValueForNoteData" map-name="parameters"/>
         <set-nonpk-fields value-name="lookedUpValue" map-name="parameters"/>
-        <store-value value-name="lookedUpValue"/>  
+        <store-value value-name="lookedUpValue"/>
+        <store-value value-name="lookedUpValueForNoteData"/>  
     </simple-method>    
     <simple-method method-name="createWorkEffortAndAssoc" short-description="Create a WorkEffort and association">
         <if-empty field="parameters.fromDate">

Modified: ofbiz/trunk/applications/workeffort/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/servicedef/services.xml?rev=688731&r1=688730&r2=688731&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/servicedef/services.xml (original)
+++ ofbiz/trunk/applications/workeffort/servicedef/services.xml Mon Aug 25 07:20:53 2008
@@ -171,6 +171,7 @@
         <attribute name="workEffortId" type="String" mode="IN" optional="false"/>
         <attribute name="noteId" type="String" mode="IN" optional="false"/>
         <attribute name="internalNote" type="String" mode="IN" optional="false"/>
+        <attribute name="noteInfo" type="String" mode="IN" optional="true"/>
     </service>    
     <!-- Services for finding Assigned WorkEfforts -->
     <service name="getWorkEffortAssignedEventsForRole" engine="java"

Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml?rev=688731&r1=688730&r2=688731&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml Mon Aug 25 07:20:53 2008
@@ -796,7 +796,9 @@
                 <order-by field-name="noteId"/>
             </entity-condition>
         </actions>
-        <field name="noteId"><display/></field>
+        <field name="noteId">
+            <hyperlink target="EditWorkEffortNotes?workEffortId=${workEffortId}&amp;noteId=${noteId}" also-hidden="false" description="${noteId}"/>
+        </field>
         <field name="workEffortId" entity-name="WorkEffort" widget-style="buttontext">
            <hyperlink target="EditWorkEffort?workEffortId=${workEffortId}" also-hidden="false" description="${workEffortId}"/>
         </field>
@@ -810,10 +812,11 @@
         </field>
     </form>
     
-    <form name="AddWorkEffortNote" type="single" target="createWorkEffortNote" title=""
+    <form name="AddWorkEffortNote" type="single" target="updateWorkEffortNote" title="" default-map-name="workEffortNoteAndData"
         header-row-style="header-row" default-table-style="basic-table">
+        <alt-target use-when="noteId == null" target="createWorkEffortNote"/>
         <auto-fields-service service-name="createWorkEffortNote"/>
-        <field name="noteId"><ignored/><!-- don't pass, will be sequenced --></field>
+        <field name="noteId" use-when="noteId != null"><hidden/></field>
         <field name="workEffortId"><hidden/></field>
         <field name="noteInfo" title="${uiLabelMap.CommonNote}"><textarea cols="70" rows="5" /></field>
         <field name="internalNote" title="${uiLabelMap.WorKEffortInternalNote}">
@@ -824,7 +827,8 @@
         </field>
         <field name="noteParty"><hidden/></field>
         <field name="noteName"><hidden/></field>
-        <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
+        <field name="submitButton" use-when="noteId == null" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
+        <field name="submitButton" use-when="noteId != null" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
 
     <!-- WorkEffortContent forms -->

Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml?rev=688731&r1=688730&r2=688731&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml Mon Aug 25 07:20:53 2008
@@ -695,6 +695,8 @@
                 <set field="tabButtonItem" value="WorkEffortNotes"/>
                 <set field="labelTitleProperty" value="PageTitleListWorkEffortNotes"/>
                 <set field="workEffortId" from-field="parameters.workEffortId"/>
+                <set field="noteId" from-field="parameters.noteId"/>
+                <entity-one entity-name="WorkEffortNoteAndData" value-name="workEffortNoteAndData"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonWorkEffortDecorator" location="${parameters.mainDecoratorLocation}">

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml?rev=688731&r1=688730&r2=688731&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml Mon Aug 25 07:20:53 2008
@@ -492,6 +492,8 @@
                 <set field="tabButtonItem" value="notes"/>
                 <set field="labelTitleProperty" value="PageTitleListProjectNotes"/>
                 <set field="workEffortId" from-field="parameters.projectId" default-value="${parameters.workEffortId}"/>
+                <set field="noteId" from-field="parameters.noteId"/>
+                <entity-one entity-name="WorkEffortNoteAndData" value-name="workEffortNoteAndData"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonProjectDecorator" location="${parameters.mainDecoratorLocation}">

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml?rev=688731&r1=688730&r2=688731&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml Mon Aug 25 07:20:53 2008
@@ -420,7 +420,6 @@
                 <order-by field-name="noteId"/>
             </entity-condition>
         </actions>
-        <field name="noteId"><hidden/></field>
         <field name="workEffortId"><hidden/></field>
         <field name="noteParty" title="${uiLabelMap.CommonBy}"><display description="${bsh:org.ofbiz.party.party.PartyHelper.getPartyName(delegator, noteParty, true)} at ${bsh: org.ofbiz.base.util.UtilDateTime.timeStampToString(noteDateTime, &quot;dd-MM-yyyy HH:mm&quot;, TimeZone.getDefault(), context.get(&quot;locale&quot;))}"/></field>
     </form>