From ofbiz-commits-return-1453-apmail-incubator-ofbiz-commits-archive=incubator.apache.org@incubator.apache.org Tue Dec 12 05:20:23 2006
Return-Path: <ofbiz-commits-return-1453-apmail-incubator-ofbiz-commits-archive=incubator.apache.org@incubator.apache.org>
Delivered-To: apmail-incubator-ofbiz-commits-archive@locus.apache.org
Received: (qmail 38212 invoked from network); 12 Dec 2006 05:20:23 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 12 Dec 2006 05:20:23 -0000
Received: (qmail 16392 invoked by uid 500); 12 Dec 2006 05:20:31 -0000
Delivered-To: apmail-incubator-ofbiz-commits-archive@incubator.apache.org
Received: (qmail 16316 invoked by uid 500); 12 Dec 2006 05:20:30 -0000
Mailing-List: contact ofbiz-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:ofbiz-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:ofbiz-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:ofbiz-commits@incubator.apache.org>
List-Id: <ofbiz-commits.incubator.apache.org>
Reply-To: ofbiz-dev@incubator.apache.org
Delivered-To: mailing list ofbiz-commits@incubator.apache.org
Received: (qmail 16307 invoked by uid 99); 12 Dec 2006 05:20:30 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 11 Dec 2006 21:20:30 -0800
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 11 Dec 2006 21:20:20 -0800
Received: by eris.apache.org (Postfix, from userid 65534)
	id 51E561A981A; Mon, 11 Dec 2006 21:19:36 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r486033 - in /incubator/ofbiz/trunk/applications:
 content/config/ content/webapp/content/WEB-INF/ content/widget/
 content/widget/content/ product/config/ product/webapp/catalog/WEB-INF/
 product/webapp/catalog/product/ product/widget/catalog...
Date: Tue, 12 Dec 2006 05:19:35 -0000
To: ofbiz-commits@incubator.apache.org
From: jonesde@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20061212051936.51E561A981A@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: jonesde
Date: Mon Dec 11 21:19:30 2006
New Revision: 486033

URL: http://svn.apache.org/viewvc?view=rev&rev=486033
Log:
Applied patch from Anil Patel and Ashish Vijaywargiya with admin screens, service, etc for the WorkEffortReview, WorkEffortContent, and WorkEffortGoodStandard entities; Jira #OFBIZ-540

Modified:
    incubator/ofbiz/trunk/applications/content/config/ContentUiLabels.properties
    incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml
    incubator/ofbiz/trunk/applications/content/widget/CommonScreens.xml
    incubator/ofbiz/trunk/applications/content/widget/content/ContentForms.xml
    incubator/ofbiz/trunk/applications/content/widget/content/ContentMenus.xml
    incubator/ofbiz/trunk/applications/content/widget/content/ContentScreens.xml
    incubator/ofbiz/trunk/applications/product/config/ProductUiLabels.properties
    incubator/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml
    incubator/ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml
    incubator/ofbiz/trunk/applications/product/webapp/catalog/product/ProductTabBar.ftl
    incubator/ofbiz/trunk/applications/product/widget/catalog/CatalogCommonScreens.xml
    incubator/ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml
    incubator/ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.properties
    incubator/ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml
    incubator/ofbiz/trunk/applications/workeffort/servicedef/services.xml
    incubator/ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.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/config/ContentUiLabels.properties
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/config/ContentUiLabels.properties?view=diff&rev=486033&r1=486032&r2=486033
==============================================================================
--- incubator/ofbiz/trunk/applications/content/config/ContentUiLabels.properties (original)
+++ incubator/ofbiz/trunk/applications/content/config/ContentUiLabels.properties Mon Dec 11 21:19:30 2006
@@ -87,6 +87,7 @@
 PageTitleAddMetaData=Add a metadata
 PageTitleAddPurpose=Add a Purpose
 PageTitleAddRole=Add a Role
+PageTitleAddWorkEffortContent=Add workeffort content
 PageTitleEditAssociation=Edit an association
 PageTitleEditContent=Edit Content
 PageTitleEditContentAssoc=Edit Content Association
@@ -102,6 +103,7 @@
 PageTitleEditContentRole=Edit Content Role
 PageTitleEditContentType=Edit Content Type
 PageTitleEditContentUserPermissions=Permissions
+PageTitleEditContentWorkEffort=Edit Content WorkEffort
 PageTitleEditDataResource=Edit Data Resource
 PageTitleEditDataResourceAttribute=Edit Data Resource Attribute
 PageTitleEditDataResourceProductFeatures=Edit Data Resource Product Features

Modified: incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml?view=diff&rev=486033&r1=486032&r2=486033
==============================================================================
--- incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml (original)
+++ incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml Mon Dec 11 21:19:30 2006
@@ -888,6 +888,32 @@
         <response name="error" type="view" value="EditContentPurposeOperation"/>
     </request-map>
 
+    <!-- ================ ContentWorkEffort Requests ================= -->
+    <request-map uri="EditContentWorkEfforts">
+        <security auth="true" https="true"/>
+        <response name="success" type="view" value="EditContentWorkEfforts"/>
+    </request-map>
+    <request-map uri="createWorkEffortContent">
+        <security auth="true" https="true"/>
+        <event invoke="createWorkEffortContent" path="" type="service"/>
+        <response name="success" type="view" value="EditContentWorkEfforts"/>
+        <response name="error" type="view" value="EditContentWorkEfforts"/>
+    </request-map>
+
+    <request-map uri="updateWorkEffortContent">
+        <security auth="true" https="true"/>
+        <event invoke="updateWorkEffortContent" path="" type="service"/>
+        <response name="success" type="view" value="EditContentWorkEfforts"/>
+        <response name="error" type="view" value="EditContentWorkEfforts"/>
+    </request-map>
+
+    <request-map uri="deleteWorkEffortContent">
+        <security auth="true" https="true"/>
+        <event invoke="deleteWorkEffortContent" path="" type="service"/>
+        <response name="success" type="view" value="EditContentWorkEfforts"/>
+        <response name="error" type="view" value="EditContentWorkEfforts"/>
+    </request-map>
+
     <!-- ================ CompDoc Requests ================= -->
     <request-map uri="FindCompDoc"><security auth="true" https="true"/><response name="success" type="view" value="FindCompDoc"/></request-map>
     <!-- combined with FindCompDoc: <request-map uri="ListCompDoc"><security auth="true" https="true"/><response name="success" type="view" value="ListCompDoc"/></request-map> -->
@@ -1529,7 +1555,7 @@
     <request-map uri="LookupPartyAndUserLoginAndPerson"><security auth="true" https="true"/><response name="success" type="view" value="LookupPartyAndUserLoginAndPerson"/></request-map>
     <request-map uri="LookupProductFeature"><security auth="true" https="true"/><response name="success" type="view" value="LookupProductFeature"/></request-map>
     <request-map uri="LookupPartyName"><security https="true" auth="true"/><response name="success" type="view" value="LookupPartyName"/></request-map>
-    
+    <request-map uri="LookupWorkEffort"><security https="true" auth="true"/><response name="success" type="view" value="LookupWorkEffort"/></request-map>
     <!-- View Mappings -->
     <view-map name="error" page="/error/error.jsp"/>
     <view-map name="main" type="screen" page="component://content/widget/CommonScreens.xml#main"/>
@@ -1566,7 +1592,8 @@
     <view-map name="EditContentAssocPredicate" page="component://content/widget/contentsetup/ContentSetupScreens.xml#EditContentAssocPredicate" type="screen"/>
     <view-map name="EditContentOperation" page="component://content/widget/contentsetup/ContentSetupScreens.xml#EditContentOperation" type="screen"/>
     <view-map name="EditContentPurposeOperation"  page="component://content/widget/contentsetup/ContentSetupScreens.xml#EditContentPurposeOperation" type="screen"/>
-
+    <view-map name="EditContentWorkEfforts" page="component://content/widget/content/ContentScreens.xml#EditContentWorkEfforts" type="screen"/>
+    
     <view-map name="FindDataResource"  page="component://content/widget/content/DataResourceScreens.xml#FindDataResource" type="screen"/>
     <view-map name="UploadImage"  page="component://content/widget/content/DataResourceScreens.xml#UploadImage" type="screen"/>
     <view-map name="EditDataResource"  page="component://content/widget/content/DataResourceScreens.xml#EditDataResource" type="screen"/>
@@ -1673,5 +1700,6 @@
     <view-map name="LookupPartyAndUserLoginAndPerson" page="component://party/widget/partymgr/LookupScreens.xml#LookupPartyAndUserLoginAndPerson" type="screen"/>
     <view-map name="LookupProductFeature" page="component://product/widget/catalog/LookupScreens.xml#LookupProductFeature" type="screen"/>
     <view-map name="LookupPartyName" type="screen" page="component://party/widget/partymgr/LookupScreens.xml#LookupPartyName"/>
+    <view-map name="LookupWorkEffort" type="screen" page="component://workeffort/widget/LookupScreens.xml#LookupWorkEffort"/>
     <!-- end of view mappings -->
 </site-conf>

Modified: incubator/ofbiz/trunk/applications/content/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/widget/CommonScreens.xml?view=diff&rev=486033&r1=486032&r2=486033
==============================================================================
--- incubator/ofbiz/trunk/applications/content/widget/CommonScreens.xml (original)
+++ incubator/ofbiz/trunk/applications/content/widget/CommonScreens.xml Mon Dec 11 21:19:30 2006
@@ -23,6 +23,7 @@
                 <!-- base/top/specific map first, then more common map added for shared labels --> 
                 <property-map resource="ContentUiLabels" map-name="uiLabelMap" global="true"/>
                 <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="WorkEffortUiLabels" map-name="uiLabelMap" global="true"/>
 
                 <set field="layoutSettings.companyName" from-field="uiLabelMap.ContentCompanyName" global="true"/>
                 <set field="layoutSettings.companySubtitle" from-field="uiLabelMap.ContentCompanySubtitle" global="true"/>

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=486033&r1=486032&r2=486033
==============================================================================
--- incubator/ofbiz/trunk/applications/content/widget/content/ContentForms.xml (original)
+++ incubator/ofbiz/trunk/applications/content/widget/content/ContentForms.xml Mon Dec 11 21:19:30 2006
@@ -441,4 +441,42 @@
         <field name="firstName" title="" widget-style="buttontext"> <display/> </field>
         <field name="lastName" title="" widget-style="buttontext"> <display/> </field>
     </form>
+
+    <!-- ContentWorkEffort forms -->
+    <form name="AddWorkEffortContent" default-title-style="tableheadtext"
+        default-tooltip-style="tabletext" default-widget-style="inputBox"
+        target="createWorkEffortContent" title="" type="single">
+        <auto-fields-service service-name="createWorkEffortContent"/>
+        <field name="contentId"><hidden value="${parameters.contentId}"/></field>
+        <field name="workEffortId">
+            <lookup target-form-name="LookupWorkEffort"/>
+        </field>
+        <field name="workEffortContentTypeId">
+            <drop-down no-current-selected-key="">
+                <entity-options entity-name="WorkEffortContentType" description="${description}" key-field-name="workEffortContentTypeId">
+                    <entity-order-by field-name="description"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
+    </form>
+    <form name="ListWorkEffortContents" type="list" target="updateWorkEffortContent" list-name="workEffortContents" 
+         default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
+        <actions>
+            <entity-and entity-name="WorkEffortContent" use-cache="true" list-name="workEffortContents">
+                <field-map env-name="contentId" field-name="contentId" />
+            </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>        
+        <field name="contentId" widget-style="tabletext"><hidden/></field>
+        <field name="workEffortContentTypeId" widget-style="tabletext"><display/></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}"/>
+        </field>
+    </form>
 </forms>

Modified: incubator/ofbiz/trunk/applications/content/widget/content/ContentMenus.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/widget/content/ContentMenus.xml?view=diff&rev=486033&r1=486032&r2=486033
==============================================================================
--- incubator/ofbiz/trunk/applications/content/widget/content/ContentMenus.xml (original)
+++ incubator/ofbiz/trunk/applications/content/widget/content/ContentMenus.xml Mon Dec 11 21:19:30 2006
@@ -97,6 +97,13 @@
             </condition>
             <link target="EditContentMetaData?contentId=${contentId}"/>
         </menu-item>
+
+        <menu-item name="workEffort" title="${uiLabelMap.WorkEffortWorkEffort}" >
+            <condition>
+                <not><if-empty field-name="currentValue.contentId"/></not>
+            </condition>
+            <link target="EditContentWorkEfforts?contentId=${contentId}"/>
+        </menu-item>
         
     </menu>
     <menu name="contentSub" default-title-style="buttontext"

Modified: incubator/ofbiz/trunk/applications/content/widget/content/ContentScreens.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/widget/content/ContentScreens.xml?view=diff&rev=486033&r1=486032&r2=486033
==============================================================================
--- incubator/ofbiz/trunk/applications/content/widget/content/ContentScreens.xml (original)
+++ incubator/ofbiz/trunk/applications/content/widget/content/ContentScreens.xml Mon Dec 11 21:19:30 2006
@@ -235,6 +235,29 @@
             </widgets>
         </section>
     </screen>
+
+    <screen name="EditContentWorkEfforts">
+        <section>
+            <actions>
+                <script location="component://content/widget/getMenuContext.bsh"/>                
+                <set field="titleProperty" value="PageTitleEditContentWorkEffort"/>
+                <set field="tabButtonItem" value="workEffort"/>
+                <set field="contentId" from-field="parameters.contentId"  />
+                <entity-one entity-name="Content" value-name="currentValue">
+                    <field-map field-name="contentId" env-name="parameters.contentId"/>
+                </entity-one>
+            </actions>
+            <widgets>
+                <decorator-screen name="commonContentDecorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <include-form name="ListWorkEffortContents" location="component://content/widget/content/ContentForms.xml"/>
+                        <label style="head1" text="${uiLabelMap.PageTitleAddWorkEffort}"></label>
+                        <include-form name="AddWorkEffortContent" location="component://content/widget/content/ContentForms.xml"/>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
     
     <screen name="LookupContent">
         <section>

Modified: incubator/ofbiz/trunk/applications/product/config/ProductUiLabels.properties
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/config/ProductUiLabels.properties?view=diff&rev=486033&r1=486032&r2=486033
==============================================================================
--- incubator/ofbiz/trunk/applications/product/config/ProductUiLabels.properties (original)
+++ incubator/ofbiz/trunk/applications/product/config/ProductUiLabels.properties Mon Dec 11 21:19:30 2006
@@ -61,6 +61,7 @@
 OrderShipGroup=Ship Group
 OrderShipping=Shipping
 PageTitleAddItemsFromOrder=Add Items From Order
+PageTitleAddProductWorkEffort=Add Product Work Effort
 PageTitleAdvancedSearch=Advanced Search
 PageTitleApplyFeaturesFromCategory=Apply Features From Category
 PageTitleCatalogManagerMainPage=Catalog Manager Main Page

Modified: incubator/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml?view=diff&rev=486033&r1=486032&r2=486033
==============================================================================
--- incubator/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml (original)
+++ incubator/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml Mon Dec 11 21:19:30 2006
@@ -2178,6 +2178,35 @@
         <response name="success" type="view" value="EditProductConfigItemContent"/>
         <response name="error" type="view" value="EditProductConfigItemContentContent"/>
     </request-map>
+    
+    <!-- ================ Product Work Effort Requests ================= -->
+    <request-map uri="EditProductWorkEfforts">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="EditProductWorkEfforts"/>
+        <response name="error" type="view" value="EditProductWorkEfforts"/>
+    </request-map>
+
+    <request-map uri="createWorkEffortGoodStandard">
+        <security https="true" auth="true"/>
+        <event type="service" path="" invoke="createWorkEffortGoodStandard"/>
+        <response name="success" type="view" value="EditProductWorkEfforts"/>
+        <response name="error" type="view" value="EditProductWorkEfforts"/>
+    </request-map>
+
+    <request-map uri="updateWorkEffortGoodStandard">
+        <security https="true" auth="true"/>
+        <event type="service" path="" invoke="updateWorkEffortGoodStandard"/>
+        <response name="success" type="view" value="EditProductWorkEfforts"/>
+        <response name="error" type="view" value="EditProductWorkEfforts"/>
+    </request-map>
+
+    <request-map uri="removeWorkEffortGoodStandard">
+        <security https="true" auth="true"/>
+        <event type="service" path="" invoke="removeWorkEffortGoodStandard"/>
+        <response name="success" type="view" value="EditProductWorkEfforts"/>
+        <response name="error" type="view" value="EditProductWorkEfforts"/>
+    </request-map>
+   
 
    <!-- ================ Lookup Requests ================= -->
     <request-map uri="LookupContent"><security auth="true" https="true"/><response name="success" type="view" value="LookupContent"/></request-map>
@@ -2194,7 +2223,7 @@
     <request-map uri="LookupProductFeature"><security auth="true" https="true"/><response name="success" type="view" value="LookupProductFeature"/></request-map>
     <request-map uri="LookupProductStore"><security auth="true" https="true"/><response name="success" type="view" value="LookupProductStore"/></request-map>
     <request-map uri="LookupFacilityLocation"><security auth="true" https="true"/><response name="success" type="view" value="LookupFacilityLocation"/></request-map>
-   
+    <request-map uri="LookupWorkEffort"><security https="true" auth="true"/><response name="success" type="view" value="LookupWorkEffort"/></request-map>      
 
     <!-- end of request mappings -->
 
@@ -2314,6 +2343,8 @@
     <view-map name="EditProductConfigOptions" type="screen" page="component://product/widget/catalog/ConfigScreens.xml#EditProductConfigOptions"/>
     <view-map name="EditProductConfigItemContent" type="screen" page="component://product/widget/catalog/ConfigScreens.xml#EditProductConfigItemContent"/>
     <view-map name="EditProductConfigItemContentContent" type="screen" page="component://product/widget/catalog/ConfigScreens.xml#EditProductConfigItemContentContent"/>
+    
+    <view-map name="EditProductWorkEfforts" type="screen" page="component://product/widget/catalog/ProductScreens.xml#EditProductWorkEfforts"/>        
 
     <!-- Lookup request mappings -->
     <view-map name="LookupContent" page="component://content/widget/content/ContentScreens.xml#LookupContent" type="screen"/>
@@ -2330,6 +2361,7 @@
     <view-map name="LookupProductFeature" type="screen" page="component://product/widget/catalog/LookupScreens.xml#LookupProductFeature"/>
     <view-map name="LookupProductStore" type="screen" page="component://product/widget/catalog/LookupScreens.xml#LookupProductStore"/>
     <view-map name="LookupFacilityLocation" page="component://product/widget/facility/LookupScreens.xml#LookupFacilityLocation" type="screen"/>
-
+    <view-map name="LookupWorkEffort" type="screen" page="component://workeffort/widget/LookupScreens.xml#LookupWorkEffort"/>
+    
     <!-- end of view mappings -->
 </site-conf>

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=486033&r1=486032&r2=486033
==============================================================================
--- incubator/ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml (original)
+++ incubator/ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml Mon Dec 11 21:19:30 2006
@@ -1210,4 +1210,74 @@
         <field name="price"><display/></field>
     </form>
 
+    <!-- ProductWorkEfforts forms -->
+    <form name="AddProductWorkEffort" default-title-style="tableheadtext"
+        default-tooltip-style="tabletext" default-widget-style="inputBox"
+        target="createWorkEffortGoodStandard" title="" type="single">
+        <auto-fields-service service-name="createWorkEffortGoodStandard"/>
+        <field name="productId"><hidden value="${parameters.productId}"/></field>
+        <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"/>
+                    <entity-order-by field-name="description"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="workEffortGoodStdTypeId">
+            <drop-down no-current-selected-key="">
+                <entity-options entity-name="WorkEffortGoodStandardType" description="${description}" key-field-name="workEffortGoodStdTypeId">
+                    <entity-order-by field-name="description"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
+    </form>
+    <form name="ListProductWorkEfforts" type="list" target="updateWorkEffortGoodStandard" list-name="productWorkEfforts" 
+         default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
+        <actions>
+            <entity-and entity-name="WorkEffortGoodStandard" use-cache="true" list-name="productWorkEfforts">
+                <field-map env-name="productId" field-name="productId" />
+            </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>        
+        <field name="workEffortGoodStdTypeId" widget-style="tabletext"><display/></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"/>
+                    <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}"/>
+        </field>
+    </form>
+
 </forms>

Modified: incubator/ofbiz/trunk/applications/product/webapp/catalog/product/ProductTabBar.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/webapp/catalog/product/ProductTabBar.ftl?view=diff&rev=486033&r1=486032&r2=486033
==============================================================================
--- incubator/ofbiz/trunk/applications/product/webapp/catalog/product/ProductTabBar.ftl (original)
+++ incubator/ofbiz/trunk/applications/product/webapp/catalog/product/ProductTabBar.ftl Mon Dec 11 21:19:30 2006
@@ -51,5 +51,6 @@
         <#if product?exists && product.productTypeId?if_exists == "ASSET_USAGE">
             <a href="<@ofbizUrl>EditProductAssetUsage?productId=${productId}</@ofbizUrl>" class="${selectedClassMap.EditProductAssetUsage?default(unselectedClassName)}">${uiLabelMap.ProductAssetUsage}</a>
         </#if>
+        <a href="<@ofbizUrl>EditProductWorkEfforts?productId=${productId}</@ofbizUrl>" class="${selectedClassMap.EditProductWorkEfforts?default(unselectedClassName)}">${uiLabelMap.WorkEffortWorkEffort}</a>        
     </div>
 </#if>

Modified: incubator/ofbiz/trunk/applications/product/widget/catalog/CatalogCommonScreens.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/widget/catalog/CatalogCommonScreens.xml?view=diff&rev=486033&r1=486032&r2=486033
==============================================================================
--- incubator/ofbiz/trunk/applications/product/widget/catalog/CatalogCommonScreens.xml (original)
+++ incubator/ofbiz/trunk/applications/product/widget/catalog/CatalogCommonScreens.xml Mon Dec 11 21:19:30 2006
@@ -24,6 +24,7 @@
                 <!-- base/top/specific map first, then more common map added for shared labels --> 
                 <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
                 <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="WorkEffortUiLabels" map-name="uiLabelMap" global="true"/>
                 
                 <set field="MainColumnStyle" value="nocolumns" global="true"/>
 

Modified: incubator/ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml?view=diff&rev=486033&r1=486032&r2=486033
==============================================================================
--- incubator/ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml (original)
+++ incubator/ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml Mon Dec 11 21:19:30 2006
@@ -883,4 +883,24 @@
             </widgets>
         </section>
     </screen>
+
+    <screen name="EditProductWorkEfforts">
+        <section>
+            <actions>
+                <set field="titleProperty" value="PageTitleAddProductWorkEffort"/>
+                <set field="tabButtonItem" value="EditProductWorkEfforts"/>
+                <set field="productId" from-field="parameters.productId"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="CommonProductDecorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <include-form name="ListProductWorkEfforts" location="component://product/webapp/catalog/product/ProductForms.xml"/>
+                        <label style="head1" text="${uiLabelMap.PageTitleAddProductWorkEffort}"></label>
+                        <include-form name="AddProductWorkEffort" location="component://product/webapp/catalog/product/ProductForms.xml"/>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+    
 </screens>

Modified: incubator/ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.properties
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.properties?view=diff&rev=486033&r1=486032&r2=486033
==============================================================================
--- incubator/ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.properties (original)
+++ incubator/ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.properties Mon Dec 11 21:19:30 2006
@@ -55,6 +55,7 @@
 PageTitleAddWorkEffortRequirement=Add Work Effort Requirement
 PageTitleEditWorkEffortRequirement=Edit Work Effort Requirement
 PageTitleListWorkEffortRequirements=Work Effort Requirements
+PageTitleListWorkEffortReviews = Work Effort Reviews
 
 PageTitleWorkEffortRelatedSummary=Work Effort Related Summary
 
@@ -89,6 +90,9 @@
 PageTitleListWorkEffortNotes = Work Effort Notes
 PageTitleAddWorkEffortNotes = Add Work Effort Notes
 
+PageTitleEditWorkEffortContent = Work Effort Content
+PageTitleEditWorkEffortGoodStandards=Work Effort Good Standards 
+
 PartyAddressLine1=Address Line 1
 PartyAddressLine2=Address Line 2
 PartyAddContactInformationParty=Add this contact information to party
@@ -145,6 +149,7 @@
 WorkEffortActivityStatus=Activity Status
 WorkEffortAddChild=Add New WorkEffort Child
 WorkEffortAddExistingWorkEffortChild=Add Existing WorkEffort Child
+WorkEffortAddGoodStandard=Add Good Standard
 WorkEffortAddTask=Add Task
 WorkEffortAddExistingTask=Add An Existing Task (WorkEffortId)&nbsp;
 WorkEffortAllPhases=All Phases
@@ -202,6 +207,7 @@
 WorkEffortForRequirement=For Requirement
 WorkEffortFromDateIsNotValid=From Date is not a valid Date-Time.
 WorkEffortGeneral=General
+WorkEffortGoodStandard=Good Standard
 WorkEffortIdMissing=Work Effort ID is missing.
 WorkEffortInterestingSure=For something interesting make sure, you are logged in try : Username;Admin;Password Ofbiz
 WorkEffortGeneral=General
@@ -285,6 +291,7 @@
 WorkEffortRequirementType=Requirement Type
 WorkEffortResponseRequiredBy=Response Required By
 WorkEffortResultOfLookup=Result Of Lookup
+WorkEffortReviews=Reviews
 WorkEffortRevision=Revision
 WorkEffortSelected=Selected
 WorkEffortSelectContactMechanism=Select an existing contact mechanism
@@ -320,6 +327,7 @@
 WorkEffortWorkEffortManagerApplication=WorkEffort Manager Application
 WorkEffortWorkEffortManagerMainPage=WorkEffort Manager Main Page
 WorkEffortWorkEffortAssocIdAlreadyExist=WorkEffortAssocId already Exist
+WorkEffortWorkEffortReviewAlreadyExist=WorkEffort - Review already exist
 WorkEffortWorkEffortGoodStandardAlreadyExist=WorkEffort - GoodStandard association already exist
 WorkEffortWorkflowActivitiesUser=Workflow activities assigned to user
 WorkEffortWorkflowActivitiesUserGroup=Workflow activities assigned to User Group

Modified: incubator/ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml?view=diff&rev=486033&r1=486032&r2=486033
==============================================================================
--- incubator/ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml (original)
+++ incubator/ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml Mon Dec 11 21:19:30 2006
@@ -888,4 +888,82 @@
         <entity-one entity-name="WorkEffortFixedAssetAssign" value-name="lookedUpValue" />
         <remove-value value-name="lookedUpValue" />
     </simple-method>
+
+    <!-- Create/Update/Delete Work Effort Content-->    
+    <simple-method method-name="createWorkEffortContent" short-description="Create Work Effort Content">
+        <check-permission permission="WORKEFFORTMGR" action="_CREATE">
+            <fail-property resource="WorkEffortUiLabels" property="WorkEffortCreatePermissionError"/>
+        </check-permission>
+        <check-errors />
+        <make-value entity-name="WorkEffortContent" value-name="newEntity"/>
+        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-pk-fields map-name="parameters" value-name="newEntity"/>
+        
+        <if-empty field-name="fromDate" map-name="newEntity">
+            <now-timestamp-to-env env-name="nowTimestamp"/>
+            <set field="newEntity.fromDate" from-field="nowTimestamp"/>
+        </if-empty>
+        
+        <create-value value-name="newEntity"/>
+    </simple-method>
+    <simple-method method-name="updateWorkEffortContent" short-description="Update Work Effort Content">
+        <check-permission permission="WORKEFFORTMGR" action="_UPDATE">
+            <fail-property resource="WorkEffortUiLabels" property="WorkEffortUpdatePermissionERror"/>
+        </check-permission>
+        <check-errors />
+        <entity-one entity-name="WorkEffortContent" value-name="lookedUpValue"/>
+        <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+        <store-value value-name="lookedUpValue"/>
+    </simple-method>
+    <simple-method method-name="deleteWorkEffortContent" 
+            short-description="Remove a WorkEffort Content">
+        <check-permission permission="WORKEFFORTMGR" action="_DELETE">
+            <fail-property resource="WorkEffortUiLabels" property="WorkEffortDeletePermissionError"/>
+        </check-permission>
+        <check-errors />
+        <entity-one entity-name="WorkEffortContent" value-name="lookedUpValue" />
+        <remove-value value-name="lookedUpValue" />
+    </simple-method>
+
+    <!-- Create/Update/Delete Work Effort Review-->    
+    <simple-method method-name="createWorkEffortReview" short-description="Create Work Effort Review">
+        <check-permission permission="WORKEFFORTMGR" action="_CREATE">
+            <fail-property resource="WorkEffortUiLabels" property="WorkEffortCreatePermissionError"/>
+        </check-permission>
+        <check-errors />
+        <entity-one entity-name="WorkEffortReview" value-name="lookedUpValue"/>
+        <if-not-empty field-name="lookedUpValue">
+            <add-error><fail-property resource="WorkEffortUiLabels" property="WorkEffortWorkEffortReviewAlreadyExist"/></add-error>
+            <check-errors/>
+        <else>
+            <make-value entity-name="WorkEffortReview" value-name="newEntity"/>
+            <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+            <set-pk-fields map-name="parameters" value-name="newEntity"/>
+        
+            <if-empty field-name="reviewDate" map-name="newEntity">
+                <now-timestamp-to-env env-name="nowTimestamp"/>
+                <set field="newEntity.reviewDate" from-field="nowTimestamp"/>
+            </if-empty>
+            <create-value value-name="newEntity"/>
+        </else>
+        </if-not-empty>        
+    </simple-method>
+    <simple-method method-name="updateWorkEffortReview" short-description="Update Work Effort Review">
+        <check-permission permission="WORKEFFORTMGR" action="_UPDATE">
+            <fail-property resource="WorkEffortUiLabels" property="WorkEffortUpdatePermissionError"/>
+        </check-permission>
+        <check-errors />
+        <entity-one entity-name="WorkEffortReview" value-name="lookedUpValue"/>
+        <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+        <store-value value-name="lookedUpValue"/>
+    </simple-method>
+    <simple-method method-name="deleteWorkEffortReview" 
+            short-description="Remove a WorkEffort Review">
+        <check-permission permission="WORKEFFORTMGR" action="_DELETE">
+            <fail-property resource="WorkEffortUiLabels" property="WorkEffortDeletePermissionError"/>
+        </check-permission>
+        <check-errors />
+        <entity-one entity-name="WorkEffortReview" value-name="lookedUpValue" />
+        <remove-value value-name="lookedUpValue" />
+    </simple-method>
 </simple-methods>

Modified: incubator/ofbiz/trunk/applications/workeffort/servicedef/services.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/workeffort/servicedef/services.xml?view=diff&rev=486033&r1=486032&r2=486033
==============================================================================
--- incubator/ofbiz/trunk/applications/workeffort/servicedef/services.xml (original)
+++ incubator/ofbiz/trunk/applications/workeffort/servicedef/services.xml Mon Dec 11 21:19:30 2006
@@ -408,4 +408,46 @@
             and a work effort (e.g. a production run task)</description>
         <auto-attributes include="pk" mode="IN" optional="false" />
     </service>
+    <service name="createWorkEffortContent" engine="simple"
+        location="org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml"
+        invoke="createWorkEffortContent"
+        default-entity-name="WorkEffortContent" auth="true">
+        <description>Create a Work Effort Content</description>
+        <auto-attributes include="pk" mode="IN" optional="false" />
+        <auto-attributes include="nonpk" mode="IN" optional="true" />
+        <override name="fromDate" optional="true" />
+    </service>
+    <service name="updateWorkEffortContent" engine="simple"
+        location="org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml"
+        invoke="updateWorkEffortContent"
+        default-entity-name="WorkEffortContent" auth="true">
+        <description>Update a Work Effort Content</description>
+        <auto-attributes include="pk" mode="IN" optional="false"/>
+        <auto-attributes include="nonpk" mode="IN" optional="true"/>
+    </service>
+    <service name="deleteWorkEffortContent" engine="simple"
+        location="org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml"
+        invoke="deleteWorkEffortContent"
+        default-entity-name="WorkEffortContent" auth="true">
+        <description>Update a Work Effort Content</description>
+        <auto-attributes include="pk" mode="IN" optional="false"/>
+        <auto-attributes include="nonpk" mode="IN" optional="true"/>
+    </service>
+    <service name="createWorkEffortReview" default-entity-name="WorkEffortReview" engine="simple"
+                location="org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml" invoke="createWorkEffortReview" auth="true">
+        <description>Create a Work Effort Review</description>
+        <auto-attributes include="pk" mode="IN" optional="true"/>
+        <auto-attributes include="nonpk" mode="IN" optional="true"/>
+    </service>
+    <service name="updateWorkEffortReview" default-entity-name="WorkEffortReview" engine="simple"
+                location="org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml" invoke="updateWorkEffortReview" auth="true">
+        <description>Update a Work Effort Review</description>
+        <auto-attributes include="pk" mode="IN" optional="false"/>
+        <auto-attributes include="nonpk" mode="IN" optional="true"/>
+    </service>
+    <service name="deleteWorkEffortReview" engine="simple"
+                location="org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml" invoke="deleteWorkEffortReview" auth="true">
+        <description>Remove a Work Effort Review</description>
+        <auto-attributes entity-name="WorkEffortReview" include="pk" mode="IN" optional="false"/>
+    </service>
 </services>

Modified: incubator/ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml?view=diff&rev=486033&r1=486032&r2=486033
==============================================================================
--- incubator/ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml (original)
+++ incubator/ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml Mon Dec 11 21:19:30 2006
@@ -442,6 +442,87 @@
         <response name="success" type="view" value="EditWorkEffortNotes"/>
         <response name="error" type="view" value="EditWorkEffortNotes"/>
     </request-map>
+
+    <!-- WorkEffort Content Requests -->
+    <request-map uri="EditWorkEffortContents">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="EditWorkEffortContents"/>
+    </request-map>
+
+    <request-map uri="createWorkEffortContent">
+        <security auth="true" https="true"/>
+        <event invoke="createWorkEffortContent" path="" type="service"/>
+        <response name="success" type="view" value="EditWorkEffortContents"/>
+        <response name="error" type="view" value="EditWorkEffortContents"/>
+    </request-map>
+
+    <request-map uri="updateWorkEffortContent">
+        <security auth="true" https="true"/>
+        <event invoke="updateWorkEffortContent" path="" type="service"/>
+        <response name="success" type="view" value="EditWorkEffortContents"/>
+        <response name="error" type="view" value="EditWorkEffortContents"/>
+    </request-map>
+
+    <request-map uri="deleteWorkEffortContent">
+        <security auth="true" https="true"/>
+        <event invoke="deleteWorkEffortContent" path="" type="service"/>
+        <response name="success" type="view" value="EditWorkEffortContents"/>
+        <response name="error" type="view" value="EditWorkEffortContents"/>
+    </request-map>
+
+    <!-- WorkEffort Good Standard Requests -->
+    <request-map uri="EditWorkEffortGoodStandards">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="EditWorkEffortGoodStandards"/>
+    </request-map>
+
+    <request-map uri="createWorkEffortGoodStandard">
+        <security auth="true" https="true"/>
+        <event invoke="createWorkEffortGoodStandard" path="" type="service"/>
+        <response name="success" type="view" value="EditWorkEffortGoodStandards"/>
+        <response name="error" type="view" value="EditWorkEffortGoodStandards"/>
+    </request-map>
+
+    <request-map uri="updateWorkEffortGoodStandard">
+        <security auth="true" https="true"/>
+        <event invoke="updateWorkEffortGoodStandard" path="" type="service"/>
+        <response name="success" type="view" value="EditWorkEffortGoodStandards"/>
+        <response name="error" type="view" value="EditWorkEffortGoodStandards"/>
+    </request-map>
+
+    <request-map uri="removeWorkEffortGoodStandard">
+        <security auth="true" https="true"/>
+        <event invoke="removeWorkEffortGoodStandard" path="" type="service"/>
+        <response name="success" type="view" value="EditWorkEffortGoodStandards"/>
+        <response name="error" type="view" value="EditWorkEffortGoodStandards"/>
+    </request-map>
+    
+    <!-- WorkEffort Review -->
+    
+    <request-map uri="EditWorkEffortReviews">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="EditWorkEffortReviews"/>
+        <response name="error" type="view" value="EditWorkEffortReviews"/>
+    </request-map>
+    <request-map uri="createWorkEffortReview">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="createWorkEffortReview"/>
+        <response name="success" type="view" value="EditWorkEffortReviews"/>
+        <response name="error" type="view" value="EditWorkEffortReviews"/>
+    </request-map>
+    <request-map uri="updateWorkEffortReview">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="updateWorkEffortReview"/>
+        <response name="success" type="view" value="EditWorkEffortReviews"/>
+        <response name="error" type="view" value="EditWorkEffortReviews"/>
+    </request-map>
+    <request-map uri="deleteWorkEffortReview">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="deleteWorkEffortReview"/>
+        <response name="success" type="view" value="EditWorkEffortReviews"/>
+        <response name="error" type="view" value="EditWorkEffortReviews"/>
+    </request-map>
+            
     
     <!-- Lookup request mappings -->
     <request-map uri="LookupWorkEffort"><security https="true" auth="true"/><response name="success" type="view" value="LookupWorkEffort"/></request-map>
@@ -450,6 +531,7 @@
     <request-map uri="LookupPartyName"><security https="true" auth="true"/><response name="success" type="view" value="LookupPartyName"/></request-map>
     <request-map uri="LookupPerson"><security https="true" auth="true"/><response name="success" type="view" value="LookupPerson"/></request-map>
     <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="LookupProduct"><security https="true" auth="true"/><response name="success" type="view" value="LookupProduct"/></request-map>
@@ -467,6 +549,7 @@
     <request-map uri="LookupOrderHeader"><security https="true" auth="true"/><response name="success" type="view" value="LookupOrderHeader"/></request-map>
     
     <request-map uri="LookupInvoice"><security https="true" auth="true"/><response name="success" type="view" value="LookupInvoice"/></request-map>
+    <request-map uri="LookupContent"><security auth="true" https="true"/><response name="success" type="view" value="LookupContent"/></request-map>
     
     <!-- end of request mappings -->
 
@@ -515,13 +598,17 @@
     <view-map name="EditTimesheetEntries" type="screen" page="component://workeffort/widget/TimesheetScreens.xml#EditTimesheetEntries"/>
     
     <view-map name="EditWorkEffortNotes" type="screen" page="component://workeffort/widget/WorkEffortScreens.xml#EditWorkEffortNotes"/>
-    
+    <view-map name="EditWorkEffortContents" type="screen" page="component://workeffort/widget/WorkEffortScreens.xml#EditWorkEffortContents"/>    
+    <view-map name="EditWorkEffortGoodStandards" type="screen" page="component://workeffort/widget/WorkEffortScreens.xml#EditWorkEffortGoodStandards"/>    
+    <view-map name="EditWorkEffortReviews" type="screen" page="component://workeffort/widget/WorkEffortScreens.xml#EditWorkEffortReviews"/>    
+        
     <view-map name="LookupWorkEffort" type="screen" page="component://workeffort/widget/LookupScreens.xml#LookupWorkEffort"/>
     <view-map name="LookupTimesheet" type="screen" page="component://workeffort/widget/LookupScreens.xml#LookupTimesheet"/>
     
     <view-map name="LookupPartyName" type="screen" page="component://party/widget/partymgr/LookupScreens.xml#LookupPartyName"/>
     <view-map name="LookupPerson" type="screen" page="component://party/widget/partymgr/LookupScreens.xml#LookupPerson"/>
     <view-map name="LookupPartyGroup" type="screen" page="component://party/widget/partymgr/LookupScreens.xml#LookupPartyGroup"/>
+    <view-map name="LookupPartyAndUserLoginAndPerson" type="screen" page="component://party/widget/partymgr/LookupScreens.xml#LookupPartyAndUserLoginAndPerson"/>    
     <view-map name="LookupCommEvent" type="screen" page="component://party/widget/partymgr/LookupScreens.xml#LookupCommEvent"/>
     
     <view-map name="LookupProduct" type="screen" page="component://product/widget/catalog/LookupScreens.xml#LookupProduct"/>
@@ -539,5 +626,6 @@
     <view-map name="LookupQuoteItem" type="screen" page="component://order/widget/ordermgr/LookupScreens.xml#LookupQuoteItem"/>
     <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"/>    
     <!-- end of view mappings -->
 </site-conf>

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=486033&r1=486032&r2=486033
==============================================================================
--- incubator/ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml (original)
+++ incubator/ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml Mon Dec 11 21:19:30 2006
@@ -26,6 +26,7 @@
                 <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>
                 <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"/>
 
                 <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=486033&r1=486032&r2=486033
==============================================================================
--- incubator/ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml (original)
+++ incubator/ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml Mon Dec 11 21:19:30 2006
@@ -768,5 +768,174 @@
         <field name="noteName"><hidden/></field>
         <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
+
+    <!-- WorkEffortContent forms -->
+    <form name="AddWorkEffortContent" default-title-style="tableheadtext"
+        default-tooltip-style="tabletext" default-widget-style="inputBox"
+        target="createWorkEffortContent" title="" type="single">
+        <auto-fields-service service-name="createWorkEffortContent"/>
+        <field name="workEffortId"><hidden value="${parameters.workEffortId}"/></field>
+        <field name="contentId">
+            <lookup target-form-name="LookupContent"/>
+        </field>
+        <field name="workEffortContentTypeId">
+            <drop-down no-current-selected-key="">
+                <entity-options entity-name="WorkEffortContentType" description="${description}" key-field-name="workEffortContentTypeId">
+                    <entity-order-by field-name="description"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
+    </form>
+    <form name="ListWorkEffortContents" type="list" target="updateWorkEffortContent" list-name="workEffortContents" 
+         default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
+        <actions>
+            <entity-and entity-name="WorkEffortContent" use-cache="true" list-name="workEffortContents">
+                <field-map env-name="workEffortId" field-name="workEffortId" />
+            </entity-and>
+        </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>
+        <field name="workEffortContentTypeId" widget-style="tabletext"><display/></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}"/>
+        </field>
+    </form>
+
+    <!-- WorkEffort Good Standard forms -->
+    <form name="AddWorkEffortGoodStandard" default-title-style="tableheadtext"
+        default-tooltip-style="tabletext" default-widget-style="inputBox"
+        target="createWorkEffortGoodStandard" title="" type="single">
+        <auto-fields-service service-name="createWorkEffortGoodStandard"/>
+        <field name="workEffortId"><hidden value="${parameters.workEffortId}"/></field>
+        <field name="productId">
+            <lookup target-form-name="LookupProduct"/>
+        </field>
+        <field name="workEffortGoodStdTypeId">
+            <drop-down no-current-selected-key="">
+                <entity-options entity-name="WorkEffortGoodStandardType" description="${description}" key-field-name="workEffortGoodStdTypeId">
+                    <entity-order-by field-name="description"/>
+                </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"/>
+                    <entity-order-by field-name="description"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
+    </form>
+    <form name="ListWorkEffortGoodStandards" type="list" target="updateWorkEffortGoodStandard" list-name="workEffortGoodStandards" 
+         default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
+        <actions>
+            <entity-and entity-name="WorkEffortGoodStandard" use-cache="true" list-name="workEffortGoodStandards">
+                <field-map env-name="workEffortId" field-name="workEffortId" />
+            </entity-and>
+        </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>
+        <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"/>
+                    <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}"/>
+        </field>
+    </form>
     
+    <!-- WorkEffort Reviews -->
+    <form name="AddWorkEffortReview" default-title-style="tableheadtext"
+        default-tooltip-style="tabletext" default-widget-style="inputBox"
+        target="createWorkEffortReview" title="" type="single">
+        <auto-fields-service service-name="createWorkEffortReview"/>
+        <field name="workEffortId"><hidden value="${parameters.workEffortId}"/></field>
+        <field name="userLoginId">
+            <lookup target-form-name="LookupPartyAndUserLoginAndPerson" default-value="${defaultUserLoginId}"/>
+        </field>
+        <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-order-by field-name="description"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="reviewText"><textarea rows="5" cols="60"/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
+    </form>
+    <form name="ListWorkEffortReviews" type="list" target="updateWorkEffortReview" list-name="productWorkEfforts" 
+         default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext" separate-columns="true">
+        <actions>
+            <entity-and entity-name="WorkEffortReview" use-cache="true" list-name="workEffortReviews">
+                <field-map env-name="workEffortId" field-name="workEffortId" />
+            </entity-and>
+        </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="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-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}"/>
+        </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=486033&r1=486032&r2=486033
==============================================================================
--- incubator/ofbiz/trunk/applications/workeffort/widget/WorkEffortMenus.xml (original)
+++ incubator/ofbiz/trunk/applications/workeffort/widget/WorkEffortMenus.xml Mon Dec 11 21:19:30 2006
@@ -80,5 +80,14 @@
         <menu-item name="WorkEffortNotes" title="${uiLabelMap.WorkEffortNotes}">
             <link target="EditWorkEffortNotes?workEffortId=${workEffortId}"/>
         </menu-item>
+        <menu-item name="WorkEffortContents" title="${uiLabelMap.ContentContent}">
+            <link target="EditWorkEffortContents?workEffortId=${workEffortId}"/>
+        </menu-item>
+        <menu-item name="WorkEffortGoodStandards" title="${uiLabelMap.WorkEffortGoodStandard}">
+            <link target="EditWorkEffortGoodStandards?workEffortId=${workEffortId}"/>
+        </menu-item>
+        <menu-item name="WorkEffortReviews" title="${uiLabelMap.WorkEffortReviews}">
+            <link target="EditWorkEffortReviews?workEffortId=${workEffortId}"/>
+        </menu-item>        
     </menu>
 </menus>

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=486033&r1=486032&r2=486033
==============================================================================
--- incubator/ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml (original)
+++ incubator/ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml Mon Dec 11 21:19:30 2006
@@ -504,4 +504,64 @@
             </widgets>
         </section>
     </screen>
+
+    <screen name="EditWorkEffortContents">
+        <section>
+            <actions>
+                <set field="titleProperty" value="PageTitleEditWorkEffortContent"/>
+                <set field="tabButtonItem" value="WorkEffortContents"/>
+                <set field="workEffortId" from-field="parameters.workEffortId"  />
+            </actions>
+            <widgets>
+                <decorator-screen name="CommonWorkEffortDecorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <include-form name="ListWorkEffortContents" location="component://workeffort/widget/WorkEffortForms.xml"/>
+                        <label style="head1" text="${uiLabelMap.PageTitleAddContent}"></label>
+                        <include-form name="AddWorkEffortContent" location="component://workeffort/widget/WorkEffortForms.xml"/>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+
+    <screen name="EditWorkEffortGoodStandards">
+        <section>
+            <actions>
+                <set field="titleProperty" value="PageTitleEditWorkEffortGoodStandards"/>
+                <set field="tabButtonItem" value="WorkEffortGoodStandards"/>
+                <set field="workEffortId" from-field="parameters.workEffortId"  />
+            </actions>
+            <widgets>
+                <decorator-screen name="CommonWorkEffortDecorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <include-form name="ListWorkEffortGoodStandards" location="component://workeffort/widget/WorkEffortForms.xml"/>
+                        <label style="head1" text="${uiLabelMap.WorkEffortAddGoodStandard}"></label>
+                        <include-form name="AddWorkEffortGoodStandard" location="component://workeffort/widget/WorkEffortForms.xml"/>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+    
+    <screen name="EditWorkEffortReviews">
+        <section>
+            <actions>
+                <set field="titleProperty" value="PageTitleListWorkEffortReviews"/>
+                <set field="tabButtonItem" value="WorkEffortReviews"/>
+                <set field="labelTitleProperty" value="PageTitleListWorkEffortReviews"/>
+                <set field="workEffortId" from-field="parameters.workEffortId"/>
+                <set field="defaultUserLoginId" from-field="parameters.userLogin.userLoginId"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="CommonWorkEffortDecorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <container><label style="head1">${uiLabelMap.PageTitleListWorkEffortReviews}</label></container>
+                        <include-form name="ListWorkEffortReviews" location="component://workeffort/widget/WorkEffortForms.xml"/>
+                        <container><label style="head1">${uiLabelMap.PageTitleAddWorkEffortReviews}</label></container>
+                        <include-form name="AddWorkEffortReview" location="component://workeffort/widget/WorkEffortForms.xml"/>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
 </screens>