svn commit: r486370 - in /incubator/ofbiz/trunk/applications: content/widget/content/ product/webapp/catalog/product/ workeffort/widget/

[jonesde]

Author: jonesde
Date: Tue Dec 12 14:23:12 2006
New Revision: 486370

URL: http://svn.apache.org/viewvc?view=rev&rev=486370
Log:
Applied improvement patch from Anil/Ashish for WorkEffort* maint screens from Jira #OFBIZ-540; made one small change to this to make the 4 statusId fields on both sides of the WorkEffortGoodStandard entity optional (removed * and set allow-empty=true)

Modified:
    incubator/ofbiz/trunk/applications/content/widget/content/ContentForms.xml
    incubator/ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml
    incubator/ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml
    incubator/ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml
    incubator/ofbiz/trunk/applications/workeffort/widget/WorkEffortMenus.xml
    incubator/ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml

Modified: incubator/ofbiz/trunk/applications/content/widget/content/ContentForms.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/widget/content/ContentForms.xml?view=diff&rev=486370&r1=486369&r2=486370
==============================================================================
--- incubator/ofbiz/trunk/applications/content/widget/content/ContentForms.xml (original)
+++ incubator/ofbiz/trunk/applications/content/widget/content/ContentForms.xml Tue Dec 12 14:23:12 2006
@@ -468,11 +468,13 @@
             </entity-and>
         </actions>
         <auto-fields-service service-name="updateWorkEffortContent" default-field-type="edit" />
-        <field name="workEffortId" widget-style="buttontext">
-           <hyperlink target="/workeffort/control/EditWorkEffort?workEffortId=${workEffortId}" also-hidden="true" target-type="inter-app" description="${workEffortId}"/>
+        <field name="workEffortId" widget-style="tabletext">
+            <display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="${workEffortName}" also-hidden="true">
+                <sub-hyperlink target="/workeffort/control/EditWorkEffort?workEffortId=${workEffortId}" description="${workEffortId}" link-style="buttontext" target-type="inter-app"/>
+            </display-entity>
         </field>        
         <field name="contentId" widget-style="tabletext"><hidden/></field>
-        <field name="workEffortContentTypeId" widget-style="tabletext"><display/></field>
+        <field name="workEffortContentTypeId" widget-style="tabletext"><display-entity entity-name="WorkEffortContentType" description="${description}"/></field>
         <field name="fromDate" widget-style="tabletext"><display/></field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
         <field name="deleteLink" title="" widget-style="buttontext">

Modified: incubator/ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml?view=diff&rev=486370&r1=486369&r2=486370
==============================================================================
--- incubator/ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml (original)
+++ incubator/ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml Tue Dec 12 14:23:12 2006
@@ -1219,18 +1219,10 @@
         <field name="workEffortId">
             <lookup target-form-name="LookupWorkEffort"/>
         </field>
-        <field name="statusId" title="${uiLabelMap.CommonStatus}*">
-            <drop-down>
-                <entity-options entity-name="StatusItem" key-field-name="statusId" description="[${uiLabelMap.WorkEffortGeneral}] ${description}">
-                    <entity-constraint name="statusTypeId" value="CALENDAR_STATUS"/>
-                    <entity-order-by field-name="description"/>
-                </entity-options>
-                <entity-options entity-name="StatusItem" key-field-name="statusId" description="[${uiLabelMap.WorkEffortTask}] ${description}">
-                    <entity-constraint name="statusTypeId" value="TASK_STATUS"/>
-                    <entity-order-by field-name="description"/>
-                </entity-options>
-                <entity-options entity-name="StatusItem" key-field-name="statusId" description="[${uiLabelMap.WorkEffortEvent}] ${description}">
-                    <entity-constraint name="statusTypeId" value="EVENT_STATUS"/>
+        <field name="statusId" title="${uiLabelMap.CommonStatus}">
+            <drop-down allow-empty="true">
+                <entity-options entity-name="StatusItem" key-field-name="statusId" description="${description}">
+                    <entity-constraint name="statusTypeId" value="WEFG_STATUS"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -1252,24 +1244,18 @@
             </entity-and>
         </actions>
         <auto-fields-service service-name="updateWorkEffortGoodStandard" default-field-type="edit" />
-        <field name="workEffortId" widget-style="buttontext">
-           <hyperlink target="/workeffort/control/EditWorkEffort?workEffortId=${workEffortId}" also-hidden="true" target-type="inter-app" description="${workEffortId}"/>
+        <field name="workEffortId" widget-style="tabletext">
+            <display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="${workEffortName}" also-hidden="true">
+                <sub-hyperlink target="/workeffort/control/EditWorkEffort?workEffortId=${workEffortId}" description="${workEffortId}" link-style="buttontext" target-type="inter-app"/>
+            </display-entity>
         </field>        
-        <field name="workEffortGoodStdTypeId" widget-style="tabletext"><display/></field>
+        <field name="workEffortGoodStdTypeId" widget-style="tabletext"><display-entity entity-name="WorkEffortGoodStandardType" description="${description}"/></field>
         <field name="productId" widget-style="tabletext"><hidden/></field>
         <field name="fromDate" widget-style="tabletext"><display/></field>
-        <field name="statusId" title="${uiLabelMap.CommonStatus}*">
-            <drop-down>
-                <entity-options entity-name="StatusItem" key-field-name="statusId" description="[${uiLabelMap.WorkEffortGeneral}] ${description}">
-                    <entity-constraint name="statusTypeId" value="CALENDAR_STATUS"/>
-                    <entity-order-by field-name="description"/>
-                </entity-options>
-                <entity-options entity-name="StatusItem" key-field-name="statusId" description="[${uiLabelMap.WorkEffortTask}] ${description}">
-                    <entity-constraint name="statusTypeId" value="TASK_STATUS"/>
-                    <entity-order-by field-name="description"/>
-                </entity-options>
-                <entity-options entity-name="StatusItem" key-field-name="statusId" description="[${uiLabelMap.WorkEffortEvent}] ${description}">
-                    <entity-constraint name="statusTypeId" value="EVENT_STATUS"/>
+        <field name="statusId" title="${uiLabelMap.CommonStatus}">
+            <drop-down allow-empty="true">
+                <entity-options entity-name="StatusItem" key-field-name="statusId" description="${description}">
+                    <entity-constraint name="statusTypeId" value="WEFG_STATUS"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>

Modified: incubator/ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml?view=diff&rev=486370&r1=486369&r2=486370
==============================================================================
--- incubator/ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml (original)
+++ incubator/ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml Tue Dec 12 14:23:12 2006
@@ -27,6 +27,7 @@
                 <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
                 <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
                 <property-map resource="ContentUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
 
                 <set field="layoutSettings.companyName" from-field="uiLabelMap.WorkEffortCompanyName" global="true"/>
                 <set field="layoutSettings.companySubtitle" from-field="uiLabelMap.WorkEffortCompanySubtitle" global="true"/>

Modified: incubator/ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml?view=diff&rev=486370&r1=486369&r2=486370
==============================================================================
--- incubator/ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml (original)
+++ incubator/ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml Tue Dec 12 14:23:12 2006
@@ -796,14 +796,16 @@
         </actions>
         <auto-fields-service service-name="updateWorkEffortContent" default-field-type="edit" />
         <field name="workEffortId" widget-style="tabletext"><hidden/></field>        
-        <field name="contentId" widget-style="buttontext">
-           <hyperlink target="/content/control/editContent?contentId=${contentId}" also-hidden="true" target-type="inter-app" description="${contentId}"/>
+        <field name="contentId" widget-style="tabletext">
+            <display-entity entity-name="Content" key-field-name="contentId" description="${contentName}" also-hidden="true">
+                <sub-hyperlink target="/content/control/editContent?contentId=${contentId}" description="${contentId}" link-style="buttontext" target-type="inter-app"/>
+            </display-entity>
         </field>
-        <field name="workEffortContentTypeId" widget-style="tabletext"><display/></field>
+        <field name="workEffortContentTypeId" widget-style="tabletext"><display-entity entity-name="WorkEffortContentType" description="${description}"/></field>
         <field name="fromDate" widget-style="tabletext"><display/></field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
         <field name="deleteLink" title="" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="[${uiLabelMap.CommonDelete}]" target="deleteWorkEffortContent?workEffortContentTypeId=${workEffortContentTypeId}&amp;fromDate=${fromDate}&amp;workEffortId=${workEffortId}&amp;contentId=${contentId}"/>
+            <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteWorkEffortContent?workEffortContentTypeId=${workEffortContentTypeId}&amp;fromDate=${fromDate}&amp;workEffortId=${workEffortId}&amp;contentId=${contentId}"/>
         </field>
     </form>
 
@@ -823,18 +825,10 @@
                 </entity-options>
             </drop-down>
         </field>
-        <field name="statusId" title="${uiLabelMap.CommonStatus}*">
-            <drop-down>
-                <entity-options entity-name="StatusItem" key-field-name="statusId" description="[${uiLabelMap.WorkEffortGeneral}] ${description}">
-                    <entity-constraint name="statusTypeId" value="CALENDAR_STATUS"/>
-                    <entity-order-by field-name="description"/>
-                </entity-options>
-                <entity-options entity-name="StatusItem" key-field-name="statusId" description="[${uiLabelMap.WorkEffortTask}] ${description}">
-                    <entity-constraint name="statusTypeId" value="TASK_STATUS"/>
-                    <entity-order-by field-name="description"/>
-                </entity-options>
-                <entity-options entity-name="StatusItem" key-field-name="statusId" description="[${uiLabelMap.WorkEffortEvent}] ${description}">
-                    <entity-constraint name="statusTypeId" value="EVENT_STATUS"/>
+        <field name="statusId" title="${uiLabelMap.CommonStatus}">
+            <drop-down allow-empty="true">
+                <entity-options entity-name="StatusItem" key-field-name="statusId" description="${description}">
+                    <entity-constraint name="statusTypeId" value="WEFG_STATUS"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -850,30 +844,24 @@
         </actions>
         <auto-fields-service service-name="updateWorkEffortGoodStandard" default-field-type="edit" />
         <field name="workEffortId" widget-style="tabletext"><hidden/></field>        
-        <field name="workEffortGoodStdTypeId" widget-style="tabletext"><display/></field>
-        <field name="productId" widget-style="buttontext">
-           <hyperlink target="/catalog/control/EditProduct?productId=${productId}" also-hidden="true" target-type="inter-app" description="${productId}"/>
+        <field name="workEffortGoodStdTypeId" widget-style="tabletext"><display-entity entity-name="WorkEffortGoodStandardType" description="${description}"/></field>
+        <field name="productId" widget-style="tabletext">
+            <display-entity entity-name="Product" key-field-name="productId" description="${productName}" also-hidden="true">
+                <sub-hyperlink target="/catalog/control/EditProduct?productId=${productId}" description="${productId}" link-style="buttontext" target-type="inter-app"/>
+            </display-entity>
         </field>
         <field name="fromDate" widget-style="tabletext"><display/></field>
-        <field name="statusId" title="${uiLabelMap.CommonStatus}*">
-            <drop-down>
-                <entity-options entity-name="StatusItem" key-field-name="statusId" description="[${uiLabelMap.WorkEffortGeneral}] ${description}">
-                    <entity-constraint name="statusTypeId" value="CALENDAR_STATUS"/>
-                    <entity-order-by field-name="description"/>
-                </entity-options>
-                <entity-options entity-name="StatusItem" key-field-name="statusId" description="[${uiLabelMap.WorkEffortTask}] ${description}">
-                    <entity-constraint name="statusTypeId" value="TASK_STATUS"/>
-                    <entity-order-by field-name="description"/>
-                </entity-options>
-                <entity-options entity-name="StatusItem" key-field-name="statusId" description="[${uiLabelMap.WorkEffortEvent}] ${description}">
-                    <entity-constraint name="statusTypeId" value="EVENT_STATUS"/>
+        <field name="statusId" title="${uiLabelMap.CommonStatus}">
+            <drop-down allow-empty="true">
+                <entity-options entity-name="StatusItem" key-field-name="statusId" description="${description}">
+                    <entity-constraint name="statusTypeId" value="WEFG_STATUS"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
         <field name="deleteLink" title="" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="[${uiLabelMap.CommonDelete}]" target="removeWorkEffortGoodStandard?workEffortGoodStdTypeId=${workEffortGoodStdTypeId}&amp;productId=${productId}&amp;fromDate=${fromDate}&amp;workEffortId=${workEffortId}"/>
+            <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeWorkEffortGoodStandard?workEffortGoodStdTypeId=${workEffortGoodStdTypeId}&amp;productId=${productId}&amp;fromDate=${fromDate}&amp;workEffortId=${workEffortId}"/>
         </field>
     </form>
     
@@ -889,16 +877,8 @@
         <field name="reviewDate"><date-time/></field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}*" position="1">
             <drop-down>
-                <entity-options entity-name="StatusItem" key-field-name="statusId" description="[${uiLabelMap.WorkEffortGeneral}] ${description}">
-                    <entity-constraint name="statusTypeId" value="CALENDAR_STATUS"/>
-                    <entity-order-by field-name="description"/>
-                </entity-options>
-                <entity-options entity-name="StatusItem" key-field-name="statusId" description="[${uiLabelMap.WorkEffortTask}] ${description}">
-                    <entity-constraint name="statusTypeId" value="TASK_STATUS"/>
-                    <entity-order-by field-name="description"/>
-                </entity-options>
-                <entity-options entity-name="StatusItem" key-field-name="statusId" description="[${uiLabelMap.WorkEffortEvent}] ${description}">
-                    <entity-constraint name="statusTypeId" value="EVENT_STATUS"/>
+                <entity-options entity-name="StatusItem" key-field-name="statusId" description="${description}">
+                    <entity-constraint name="statusTypeId" value="WEFF_REVIEW_STTS"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -915,27 +895,23 @@
         </actions>
         <auto-fields-service service-name="updateWorkEffortReview" default-field-type="edit" />
         <field name="workEffortId" widget-style="buttontext"><hidden/></field>        
-        <field name="userLoginId" widget-style="buttontext"><display/></field>        
+        <field name="userLoginId" widget-style="buttontext">
+            <display-entity entity-name="PartyNameView" key-field-name="partyId" description="${firstName} ${middleName} ${lastName} ${groupName}" also-hidden="true">
+                <sub-hyperlink target="/partymgr/control/viewprofile?partyId=${partyId}" description="${userLoginId}" link-style="buttontext" target-type="inter-app"/>
+            </display-entity>
+        </field>        
         <field name="reviewDate" widget-style="tabletext"><display/></field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}*">
             <drop-down>
-                <entity-options entity-name="StatusItem" key-field-name="statusId" description="[${uiLabelMap.WorkEffortGeneral}] ${description}">
-                    <entity-constraint name="statusTypeId" value="CALENDAR_STATUS"/>
-                    <entity-order-by field-name="description"/>
-                </entity-options>
-                <entity-options entity-name="StatusItem" key-field-name="statusId" description="[${uiLabelMap.WorkEffortTask}] ${description}">
-                    <entity-constraint name="statusTypeId" value="TASK_STATUS"/>
-                    <entity-order-by field-name="description"/>
-                </entity-options>
-                <entity-options entity-name="StatusItem" key-field-name="statusId" description="[${uiLabelMap.WorkEffortEvent}] ${description}">
-                    <entity-constraint name="statusTypeId" value="EVENT_STATUS"/>
+                <entity-options entity-name="StatusItem" key-field-name="statusId" description="${description}">
+                    <entity-constraint name="statusTypeId" value="WEFF_REVIEW_STTS"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
         <field name="deleteLink" title="" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="[${uiLabelMap.CommonDelete}]" target="deleteWorkEffortReview?workEffortId=${workEffortId}&amp;userLoginId=${userLoginId}&amp;reviewDate=${reviewDate}"/>
+            <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteWorkEffortReview?workEffortId=${workEffortId}&amp;userLoginId=${userLoginId}&amp;reviewDate=${reviewDate}"/>
         </field>
     </form>
 </forms>

Modified: incubator/ofbiz/trunk/applications/workeffort/widget/WorkEffortMenus.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/workeffort/widget/WorkEffortMenus.xml?view=diff&rev=486370&r1=486369&r2=486370
==============================================================================
--- incubator/ofbiz/trunk/applications/workeffort/widget/WorkEffortMenus.xml (original)
+++ incubator/ofbiz/trunk/applications/workeffort/widget/WorkEffortMenus.xml Tue Dec 12 14:23:12 2006
@@ -83,7 +83,7 @@
         <menu-item name="WorkEffortContents" title="${uiLabelMap.ContentContent}">
             <link target="EditWorkEffortContents?workEffortId=${workEffortId}"/>
         </menu-item>
-        <menu-item name="WorkEffortGoodStandards" title="${uiLabelMap.WorkEffortGoodStandard}">
+        <menu-item name="WorkEffortGoodStandards" title="${uiLabelMap.ProductProduct}">
             <link target="EditWorkEffortGoodStandards?workEffortId=${workEffortId}"/>
         </menu-item>
         <menu-item name="WorkEffortReviews" title="${uiLabelMap.WorkEffortReviews}">

Modified: incubator/ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml?view=diff&rev=486370&r1=486369&r2=486370
==============================================================================
--- incubator/ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml (original)
+++ incubator/ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml Tue Dec 12 14:23:12 2006
@@ -551,6 +551,7 @@
                 <set field="labelTitleProperty" value="PageTitleListWorkEffortReviews"/>
                 <set field="workEffortId" from-field="parameters.workEffortId"/>
                 <set field="defaultUserLoginId" from-field="parameters.userLogin.userLoginId"/>
+                <set field="partyId" from-field="parameters.userLogin.partyId"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonWorkEffortDecorator" location="${parameters.mainDecoratorLocation}">