[OFBiz] SVN: r5920 - in trunk/applications:
order/webapp/ordermgr/lookup workeffort/config
workeffort/webapp/workeffort/WEB-INF workeffort/widget
jonesde at svn.ofbiz.org
jonesde at svn.ofbiz.org
Thu Oct 6 06:42:07 EDT 2005
Author: jonesde
Date: 2005-10-06 05:41:59 -0500 (Thu, 06 Oct 2005)
New Revision: 5920
Modified:
trunk/applications/order/webapp/ordermgr/lookup/FieldLookupForms.xml
trunk/applications/workeffort/config/WorkEffortUiLabels.properties
trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml
trunk/applications/workeffort/widget/WorkEffortOrderHeaderForms.xml
trunk/applications/workeffort/widget/WorkEffortOrderHeaderScreens.xml
Log:
A few quick WorkEffort OrderHeader cleanups, will do more soon
Modified: trunk/applications/order/webapp/ordermgr/lookup/FieldLookupForms.xml
===================================================================
--- trunk/applications/order/webapp/ordermgr/lookup/FieldLookupForms.xml 2005-10-06 04:49:01 UTC (rev 5919)
+++ trunk/applications/order/webapp/ordermgr/lookup/FieldLookupForms.xml 2005-10-06 10:41:59 UTC (rev 5920)
@@ -29,13 +29,14 @@
<auto-fields-entity entity-name="OrderHeader" default-field-type="find"/>
<field name="orderHeaderId" title="${uiLabelMap.OrderOrderHeaderId}"><text-find/></field>
<field name="orderTypeId" widget-style="selectBox">
- <drop-down>
+ <drop-down allow-empty="true">
<entity-options description="${description}" entity-name="OrderType" key-field-name="orderTypeId">
+ <entity-order-by field-name="description"/>
</entity-options>
</drop-down>
</field>
<field name="salesChannelEnumId" widget-style="selectBox">
- <drop-down>
+ <drop-down allow-empty="true">
<entity-options description="${description}" entity-name="Enumeration" key-field-name="enumId">
<entity-constraint name="enumTypeId" operator="equals" value="ORDER_SALES_CHANNEL"/>
<entity-order-by field-name="description"/>
@@ -43,7 +44,7 @@
</drop-down>
</field>
<field name="statusId" title="${uiLabelMap.CommonStatus}" widget-style="selectBox">
- <drop-down>
+ <drop-down allow-empty="true">
<entity-options description="${description}" entity-name="StatusItem" key-field-name="statusId">
<entity-constraint name="statusTypeId" operator="equals" value="ORDER_STATUS"/>
</entity-options>
@@ -51,7 +52,7 @@
</field>
<field name="productStoreId"><lookup target-form-name="/marketing/control/LookupProductStore"/></field>
<field name="currencyUom" widget-style="selectBox">
- <drop-down>
+ <drop-down allow-empty="true">
<entity-options description="${description}" entity-name="Uom" key-field-name="uomId">
<entity-constraint name="uomTypeId" operator="equals" value="CURRENCY_MEASURE"/>
<entity-order-by field-name="description"/>
@@ -262,7 +263,7 @@
</entity-options>
</drop-down>
</field>
- <field name="priority"><text-find></text-find></field>
+ <field name="priority"><text-find/></field>
<field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
<field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"><submit button-type="button"/></field>
Modified: trunk/applications/workeffort/config/WorkEffortUiLabels.properties
===================================================================
--- trunk/applications/workeffort/config/WorkEffortUiLabels.properties 2005-10-06 04:49:01 UTC (rev 5919)
+++ trunk/applications/workeffort/config/WorkEffortUiLabels.properties 2005-10-06 10:41:59 UTC (rev 5920)
@@ -34,8 +34,9 @@
PageTitleListWorkEffortRequirements=List Work Effort Requirement
PageTitleWorkEffortRelatedSummary=Work Effort Related Summary
PageTitleWorkEffortShopLists=Work Effort Shopping Lists
+PageTitleListWorkEffortOrderHeaders=Work Effort Orders
+PageTitleAddWorkEffortOrderHeader=Add Order to Work Effort
-
PartyAddressLine1=Address Line 1
PartyAddressLine2=Address Line 2
PartyAddContactInformationParty=Add this contact information to party
Modified: trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml
===================================================================
--- trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml 2005-10-06 04:49:01 UTC (rev 5919)
+++ trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml 2005-10-06 10:41:59 UTC (rev 5920)
@@ -455,27 +455,12 @@
<security https="true" auth="true"/>
<response name="success" type="view" value="ListWorkEffortOrderHeaders"/>
</request-map>
- <request-map uri="AddWorkEffortOrderHeader">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="AddWorkEffortOrderHeader"/>
- </request-map>
- <request-map uri="EditWorkEffortOrderHeader">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="EditWorkEffortOrderHeader"/>
- </request-map>
-
<request-map uri="createWorkEffortOrderHeader">
<security https="true" auth="true"/>
<event type="service" invoke="createOrderHeaderWorkEffort"/>
- <response name="success" type="view" value="EditWorkEffortOrderHeader"/>
- <response name="error" type="view" value="AddWorkEffortOrderHeader"/>
+ <response name="success" type="view" value="ListWorkEffortOrderHeaders"/>
+ <response name="error" type="view" value="ListWorkEffortOrderHeaders"/>
</request-map>
- <request-map uri="updateOrderHeader">
- <security https="true" auth="true"/>
- <event type="service" invoke="updateOrderHeader"/>
- <response name="success" type="view" value="EditWorkEffortOrderHeader"/>
- <response name="error" type="view" value="EditWorkEffortOrderHeader"/>
- </request-map>
<request-map uri="deleteWorkEffortOrderHeader">
<security https="true" auth="true"/>
<event type="service" invoke="deleteOrderHeaderWorkEffort"/>
@@ -531,6 +516,10 @@
<security auth="true" https="true"/>
<response name="success" type="view" value="LookupRequirement"/>
</request-map>
+ <request-map uri="LookupOrderHeader">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="LookupOrderHeader"/>
+ </request-map>
<!-- end of request mappings -->
@@ -586,8 +575,6 @@
<view-map name="EditWorkEffortShopList" type="screen" page="component://workeffort/widget/WorkEffortShopListScreens.xml#EditWorkEffortShopList"/>
<view-map name="ListWorkEffortShopLists" type="screen" page="component://workeffort/widget/WorkEffortShopListScreens.xml#ListWorkEffortShopLists"/>
- <view-map name="AddWorkEffortOrderHeader" type="screen" page="component://workeffort/widget/WorkEffortOrderHeaderScreens.xml#AddWorkEffortOrderHeader"/>
- <view-map name="EditWorkEffortOrderHeader" type="screen" page="component://workeffort/widget/WorkEffortOrderHeaderScreens.xml#EditWorkEffortOrderHeader"/>
<view-map name="ListWorkEffortOrderHeaders" type="screen" page="component://workeffort/widget/WorkEffortOrderHeaderScreens.xml#ListWorkEffortOrderHeaders"/>
<view-map name="ListWorkEffortRelatedSummary" type="screen" page="component://workeffort/widget/WorkEffortRelatedSummaryScreens.xml#ListWorkEffortRelatedSummary"/>
@@ -602,5 +589,6 @@
<view-map name="LookupFacility" type="screen" page="component://product/widget/facility/LookupScreens.xml#LookupFacility"/>
<view-map name="LookupFixedAsset" type="screen" page="component://accounting/widget/LookupScreens.xml#LookupFixedAsset"/>
<view-map name="LookupRequirement" type="screen" page="component://order/widget/ordermgr/LookupScreens.xml#LookupRequirement"/>
+ <view-map name="LookupOrderHeader" type="screen" page="component://order/widget/ordermgr/LookupScreens.xml#LookupOrderHeader"/>
<!-- end of view mappings -->
</site-conf>
Modified: trunk/applications/workeffort/widget/WorkEffortOrderHeaderForms.xml
===================================================================
--- trunk/applications/workeffort/widget/WorkEffortOrderHeaderForms.xml 2005-10-06 04:49:01 UTC (rev 5919)
+++ trunk/applications/workeffort/widget/WorkEffortOrderHeaderForms.xml 2005-10-06 10:41:59 UTC (rev 5920)
@@ -22,54 +22,29 @@
-->
<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-form.xsd">
- <form name="ListWorkEffortOrderHeaders" separate-columns="true" default-title-style="tableheadtext" default-tooltip-style="tabletext"
- default-widget-style="tabletext" target="" title="" type="list" >
+ <form name="ListWorkEffortOrderHeaders" separate-columns="true" target="" title="" type="list"
+ default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="tabletext">
<actions>
- <entity-and entity-name="WorkEffortOrderHeaderView" >
+ <entity-and entity-name="WorkEffortOrderHeaderView">
<field-map field-name="workEffortId"/>
<order-by field-name="orderId"/>
</entity-and>
</actions>
- <field name="workEffortId">
- <display-entity entity-name="WorkEffort" description="${workEffortName}">
- <sub-hyperlink description="[${workEffortId}]" target="EditWorkEffort?workEffortId=${workEffortId}" link-style="linktext"/>
- </display-entity>
- </field>
+ <field name="workEffortId"><hidden/></field>
<field name="orderId" widget-style="buttontext">
- <hyperlink target="/ordermgr/control/EditOrderHeader?orderId=${orderId}&workEffortId=${workEffortId}" target-type="inter-app" description="[${orderId}]" />
+ <hyperlink target="/ordermgr/control/orderview?order_id=${orderId}&orderId=${orderId}&workEffortId=${workEffortId}" target-type="inter-app" description="[${orderId}]"/>
</field>
<field name="statusItemDescription"><display/></field>
<field name="orderTypeDescription"><display/></field>
<field name="orderDate"><display/></field>
- <field name="deleteLink" title=" " widget-style="buttontext"><hyperlink target="deleteWorkEffortOrderHeader?workEffortId=${workEffortId}&orderId=${orderId}" also-hidden="false" description="[${uiLabelMap.CommonDelete}]"/></field>
+ <field name="grandTotal"><display/></field>
+ <field name="deleteLink" title=" " widget-style="buttontext"><hyperlink target="deleteWorkEffortOrderHeader?workEffortId=${workEffortId}&orderId=${orderId}" also-hidden="false" description="${uiLabelMap.CommonDelete}"/></field>
</form>
- <form name="AddWorkEffortOrderHeader" default-map-name="workOrderHeaderFulfillment"
- default-title-style="tableheadtext" default-tooltip-style="tabletext"
- default-widget-style="inputBox"
- extends="EditOrderHeader" extends-resource="component://order/webapp/ordermgr/order/OrderForms.xml"
- target="createWorkEffortOrderHeader" title="" type="single">
- <sort-order>
- <sort-field name="workEffortId"/>
- <banner left-text-style="tabletext" left-text="Enter existing Order Id below"/>
- <sort-field name="orderId"/>
- <banner left-text-style="tabletext" left-text="OR add new OrderHeader data below to create new entity (leave Order Id empty)"/>
- </sort-order>
- <field name="workEffortId" > <display/> </field>
- <field name="orderId" use-when="orderHeader==null"><lookup target-form-name="/ordermgr/control/LookupOrderHeader"/></field>
- <field name="submitButton" title="[${uiLabelMap.CommonSave}]" widget-style="buttontext"> <submit button-type="text-link"/> </field>
+ <form name="AddWorkEffortOrderHeader" target="createWorkEffortOrderHeader" title="" type="single"
+ default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
+ <field name="workEffortId"><hidden/></field>
+ <field name="orderId"><lookup target-form-name="LookupOrderHeader"/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="buttontext"><submit button-type="text-link"/></field>
</form>
-
- <form name="EditWorkEffortOrderHeader" default-map-name="orderHeader"
- default-title-style="tableheadtext" default-tooltip-style="tabletext"
- default-widget-style="inputBox"
- extends="EditOrderHeader" extends-resource="component://order/webapp/ordermgr/order/OrderForms.xml"
- target="updateOrderHeader" title="" type="single">
- <sort-order>
- <sort-field name="workEffortId"/>
- </sort-order>
- <field name="workEffortId" map-name="parameters"> <display /> </field>
- <field name="orderId" ><display/></field>
- <field name="submitButton" title="[${uiLabelMap.CommonSave}]" widget-style="buttontext"> <submit button-type="text-link"/> </field>
- </form>
</forms>
Modified: trunk/applications/workeffort/widget/WorkEffortOrderHeaderScreens.xml
===================================================================
--- trunk/applications/workeffort/widget/WorkEffortOrderHeaderScreens.xml 2005-10-06 04:49:01 UTC (rev 5919)
+++ trunk/applications/workeffort/widget/WorkEffortOrderHeaderScreens.xml 2005-10-06 10:41:59 UTC (rev 5920)
@@ -25,51 +25,6 @@
<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-screen.xsd">
- <screen name="AddWorkEffortOrderHeader">
- <section>
- <actions>
- <set field="titleProperty" value="PageTitleAddWorkEffortOrderHeader"/>
- <set field="tabButtonItem" value="WorkEffortOrderHeaders"/>
- <set field="labelTitleProperty" value="PageTitleAddWorkEffortOrderHeader"/>
-
- <set field="donePage" from-field="parameters.DONE_PAGE" default-value="/workeffort/control/ListWorkEfforts"/>
- <set field="workEffortId" from-field="parameters.workEffortId"/>
- <entity-one entity-name="OrderHeader" value-name="orderHeader"/>
- </actions>
- <widgets>
- <decorator-screen name="CommonWorkEffortDecorator" location="component://workeffort/widget/WorkEffortScreens.xml">
- <decorator-section name="body">
- <label style="head1">${uiLabelMap.PageTitleAddWorkEffortOrderHeader}</label>
- <include-form name="AddWorkEffortOrderHeader" location="component://workeffort/widget/WorkEffortOrderHeaderForms.xml"/>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
-
- <screen name="EditWorkEffortOrderHeader">
- <section>
- <actions>
- <set field="titleProperty" value="PageTitleEditWorkEffortOrderHeader"/>
- <set field="tabButtonItem" value="WorkEffortOrderHeaders"/>
- <set field="labelTitleProperty" value="PageTitleEditWorkEffortOrderHeader"/>
-
- <set field="donePage" from-field="parameters.DONE_PAGE" />
- <set field="workEffortId" from-field="parameters.workEffortId"/>
- <set field="orderId" from-field="parameters.orderId"/>
- <entity-one entity-name="OrderHeader" value-name="orderHeader"/>
- </actions>
- <widgets>
- <decorator-screen name="CommonWorkEffortDecorator" location="component://workeffort/widget/WorkEffortScreens.xml">
- <decorator-section name="body">
- <label style="head1">${uiLabelMap.PageTitleEditWorkEffortOrderHeader}</label>
- <include-form name="EditWorkEffortOrderHeader" location="component://workeffort/widget/WorkEffortOrderHeaderForms.xml"/>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
-
<screen name="ListWorkEffortOrderHeaders">
<section>
<actions>
@@ -84,13 +39,12 @@
<decorator-screen name="CommonWorkEffortDecorator" location="component://workeffort/widget/WorkEffortScreens.xml">
<decorator-section name="body">
<container><label style="head1">${uiLabelMap.PageTitleListWorkEffortOrderHeaders}</label></container>
- <container><link target="AddWorkEffortOrderHeader?workEffortId=${workEffortId}" text="[Create New OrderHeader]" style="linktext"></link></container>
<include-form name="ListWorkEffortOrderHeaders" location="component://workeffort/widget/WorkEffortOrderHeaderForms.xml"/>
+ <container><label style="head1">${uiLabelMap.PageTitleAddWorkEffortOrderHeader}</label></container>
+ <include-form name="AddWorkEffortOrderHeader" location="component://workeffort/widget/WorkEffortOrderHeaderForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
</section>
</screen>
-
</screens>
-
More information about the Svn
mailing list