svn commit: r421541 - in /incubator/ofbiz/trunk/applications/order: entitydef/entitygroup.xml entitydef/entitymodel_view.xml widget/ordermgr/CommonScreens.xml widget/ordermgr/QuoteWorkEffortForms.xml

[hansbak-2]

Author: hansbak
Date: Thu Jul 13 01:32:49 2006
New Revision: 421541

URL: http://svn.apache.org/viewvc?rev=421541&view=rev
Log:
extended the list of workefforts for a quote by adding a new view

Modified:
    incubator/ofbiz/trunk/applications/order/entitydef/entitygroup.xml
    incubator/ofbiz/trunk/applications/order/entitydef/entitymodel_view.xml
    incubator/ofbiz/trunk/applications/order/widget/ordermgr/CommonScreens.xml
    incubator/ofbiz/trunk/applications/order/widget/ordermgr/QuoteWorkEffortForms.xml

Modified: incubator/ofbiz/trunk/applications/order/entitydef/entitygroup.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/entitydef/entitygroup.xml?rev=421541&r1=421540&r2=421541&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/order/entitydef/entitygroup.xml (original)
+++ incubator/ofbiz/trunk/applications/order/entitydef/entitygroup.xml Thu Jul 13 01:32:49 2006
@@ -110,6 +110,7 @@
     <entity-group group="org.ofbiz" entity="QuoteType" />
     <entity-group group="org.ofbiz" entity="QuoteTypeAttr" />
     <entity-group group="org.ofbiz" entity="QuoteWorkEffort" />
+    <entity-group group="org.ofbiz" entity="QuoteWorkEffortView" />
     <entity-group group="org.ofbiz" entity="QuoteAdjustment" />
 
     <!-- ========================================================= -->

Modified: incubator/ofbiz/trunk/applications/order/entitydef/entitymodel_view.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/entitydef/entitymodel_view.xml?rev=421541&r1=421540&r2=421541&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/order/entitydef/entitymodel_view.xml (original)
+++ incubator/ofbiz/trunk/applications/order/entitydef/entitymodel_view.xml Thu Jul 13 01:32:49 2006
@@ -1139,6 +1139,29 @@
         <key-map field-name="noteParty" rel-field-name="partyId"/>
       </view-link>
     </view-entity>
+    <view-entity entity-name="QuoteWorkEffortView"
+      package-name="org.ofbiz.order.quote"
+      title="Quote And Workeffort">
+      <description>Shows workefforts for a Quote</description>
+      <member-entity entity-alias="QWE" entity-name="QuoteWorkEffort"/>
+      <member-entity entity-alias="WE" entity-name="WorkEffort"/>
+      <member-entity entity-alias="SI" entity-name="StatusItem"/>
+      <alias-all entity-alias="QWE"/>
+      <alias-all entity-alias="WE"/>
+      <alias name="statusItemDescription" field="description" entity-alias="SI"/>
+      <view-link entity-alias="QWE" rel-entity-alias="WE">
+        <key-map field-name="workEffortId"/>
+      </view-link>
+      <view-link entity-alias="WE" rel-entity-alias="SI" rel-optional="true">
+        <key-map field-name="currentStatusId" rel-field-name="statusId"/>
+      </view-link>
+      <relation type="one-nofk" rel-entity-name="WorkEffort">
+        <key-map field-name="workEffortId"/>
+      </relation>
+      <relation type="one-nofk" rel-entity-name="Quote">
+        <key-map field-name="quoteId"/>
+      </relation>
+    </view-entity>
     <view-entity entity-name="RequirementAndRole"
             package-name="org.ofbiz.order.request"
             title="Requirement And Role View Entity">

Modified: incubator/ofbiz/trunk/applications/order/widget/ordermgr/CommonScreens.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/widget/ordermgr/CommonScreens.xml?rev=421541&r1=421540&r2=421541&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/order/widget/ordermgr/CommonScreens.xml (original)
+++ incubator/ofbiz/trunk/applications/order/widget/ordermgr/CommonScreens.xml Thu Jul 13 01:32:49 2006
@@ -53,6 +53,9 @@
 
     <screen name="CommonQuoteDecorator">
         <section>
+            <actions>
+                <set field="headerItem" value="quote"/>
+            </actions>
             <widgets>
                 <decorator-screen name="main-decorator">
                     <decorator-section name="body">

Modified: incubator/ofbiz/trunk/applications/order/widget/ordermgr/QuoteWorkEffortForms.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/widget/ordermgr/QuoteWorkEffortForms.xml?rev=421541&r1=421540&r2=421541&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/order/widget/ordermgr/QuoteWorkEffortForms.xml (original)
+++ incubator/ofbiz/trunk/applications/order/widget/ordermgr/QuoteWorkEffortForms.xml Thu Jul 13 01:32:49 2006
@@ -21,18 +21,22 @@
     <form name="ListQuoteWorkEfforts" separate-columns="true" default-title-style="tableheadtext" default-tooltip-style="tabletext"
         default-widget-style="tabletext" target="ListQuoteWorkEfforts" title="" type="list" >
         <actions>
-            <entity-and entity-name="QuoteWorkEffort">
+            <entity-and entity-name="QuoteWorkEffortView">
                 <field-map field-name="quoteId"/>
             </entity-and>
         </actions>
         <field name="quoteId"><hidden/></field>
-        <field name="workEffortId">
-            <display-entity entity-name="WorkEffort" description="${workEffortName}" >
-                <sub-hyperlink description="[${workEffortId}]" target="EditQuoteWorkEffort?workEffortId=${workEffortId}&amp;quoteId=${quoteId}" link-style="linktext"/>
-            </display-entity>
+        <field name="workEffortId" widget-style="buttontext">
+            <hyperlink also-hidden="false" description="${workEffortName} [${workEffortId}]" target="EditWorkEffort?workEffortId=${workEffortId}"/>
         </field>
+        <field name="workEffortTypeId"><display-entity entity-name="WorkEffortType" description="${description}"/></field>
+        <field name="statusItemDescription"><display/></field>
+        <field name="description"><display/></field>
+        <field name="workEffortPurposeTypeId"><display-entity entity-name="WorkEffortPurposeType" description="${description}"/></field>
+        <field name="actualStartDate"><display/></field>
+        <field name="actualEndDate"><display/></field>
         <field name="deleteLink" title="" widget-style="linktext">
-            <hyperlink also-hidden="false" description="[${uiLabelMap.CommonDelete}]" target="removeQuoteWorkEffort?quoteId=${quoteId}&amp;quoteId=${quoteId}"/>
+            <hyperlink also-hidden="false" description="[${uiLabelMap.CommonDelete}]" target="deleteQuoteWorkEffort?workEffortId=${workEffortId}&amp;quoteId=${quoteId}"/>
         </field>
     </form>
   
@@ -41,12 +45,6 @@
             default-widget-style="inputBox"
             extends="EditWorkEffort" extends-resource="component://workeffort/widget/WorkEffortForms.xml"
             target="createQuoteWorkEffort" title="" type="single">
-        <sort-order>
-            <sort-field name="quoteId"/>
-            <banner left-text-style="tabletext" left-text="${uiLabelMap.OrderOrderQuoteEnterWorkEffortId}"/>
-            <sort-field name="workEffortId"/>
-            <banner left-text-style="tabletext" left-text="${uiLabelMap.OrderOrderQuoteEnterWorkEffortIdNew}"/>
-        </sort-order>
         <field name="quoteId" map-name="parameters"><display/></field>
         <field name="workEffortId" use-when="workEffort==null&amp;&amp;workEffortId!=null">
             <lookup target-form-name="/workeffort/control/LookupWorkEffort"/>
@@ -54,6 +52,12 @@
         <field name="submitButton" title="[${uiLabelMap.CommonSave}]" widget-style="buttontext">
             <submit button-type="text-link"/>
         </field>
+        <sort-order>
+            <sort-field name="quoteId"/>
+            <banner left-text-style="tabletext" left-text="${uiLabelMap.OrderOrderQuoteEnterWorkEffortId}"/>
+            <sort-field name="workEffortId"/>
+            <banner left-text-style="tabletext" left-text="${uiLabelMap.OrderOrderQuoteEnterWorkEffortIdNew}"/>
+        </sort-order>
     </form>
     
     <form name="EditQuoteWorkEffort"