svn commit: r548232 - in /ofbiz/trunk/applications/product: webapp/facility/WEB-INF/controller.xml webapp/facility/inventory/InventoryForms.xml widget/facility/FacilityScreens.xml widget/facility/Menus.xml

[jacopoc]

Author: jacopoc
Date: Sun Jun 17 23:35:29 2007
New Revision: 548232

URL: http://svn.apache.org/viewvc?view=rev&rev=548232
Log:
New screen to edit labels associated to an inventory item; also refactored the edit inventory item screens to share a sub menu widget.

Modified:
    ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml
    ofbiz/trunk/applications/product/webapp/facility/inventory/InventoryForms.xml
    ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml
    ofbiz/trunk/applications/product/widget/facility/Menus.xml

Modified: ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml?view=diff&rev=548232&r1=548231&r2=548232
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml Sun Jun 17 23:35:29 2007
@@ -526,6 +526,10 @@
         <security https="true" auth="true"/>
         <response name="success" type="view" value="ViewInventoryItemDetail"/>
     </request-map>
+    <request-map uri="EditInventoryItemLabels">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="EditInventoryItemLabels"/>
+    </request-map>
     <request-map uri="CreateInventoryItem">
         <security https="true" auth="true"/>
         <event type="service" path="" invoke="createInventoryItem"/>
@@ -556,6 +560,24 @@
         <response name="success" type="view" value="FindFacilityPhysicalInventory"/>
         <response name="error" type="view" value="FindFacilityPhysicalInventory"/>
     </request-map>
+    <request-map uri="createInventoryItemLabelApplFromItem">
+        <security https="true" auth="true"/>
+        <event type="service" path="" invoke="createInventoryItemLabelAppl"/>
+        <response name="success" type="view" value="EditInventoryItemLabels"/>
+        <response name="error" type="view" value="EditInventoryItemLabels"/>
+    </request-map>
+    <request-map uri="updateInventoryItemLabelApplFromItem">
+        <security https="true" auth="true"/>
+        <event type="service" path="" invoke="updateInventoryItemLabelAppl"/>
+        <response name="success" type="view" value="EditInventoryItemLabels"/>
+        <response name="error" type="view" value="EditInventoryItemLabels"/>
+    </request-map>
+    <request-map uri="deleteInventoryItemLabelApplFromItem">
+        <security https="true" auth="true"/>
+        <event type="service" path="" invoke="deleteInventoryItemLabelAppl"/>
+        <response name="success" type="view" value="EditInventoryItemLabels"/>
+        <response name="error" type="view" value="EditInventoryItemLabels"/>
+    </request-map>
 
     <request-map uri="FindFacilityPhysicalInventory">
         <security https="true" auth="true"/>
@@ -1148,6 +1170,7 @@
 
     <view-map name="EditInventoryItem" type="screen" page="component://product/widget/facility/FacilityScreens.xml#EditInventoryItem"/>
     <view-map name="ViewInventoryItemDetail" type="screen" page="component://product/widget/facility/FacilityScreens.xml#ViewInventoryItemDetail"/>
+    <view-map name="EditInventoryItemLabels" type="screen" page="component://product/widget/facility/FacilityScreens.xml#EditInventoryItemLabels"/>
     <view-map name="TransferInventoryItem" type="screen" page="component://product/widget/facility/FacilityScreens.xml#TransferInventoryItem"/>
     <view-map name="ReceiveInventory" type="screen" page="component://product/widget/facility/FacilityScreens.xml#ReceiveInventory"/>
     <view-map name="ReceiveReturn" type="screen" page="component://product/widget/facility/FacilityScreens.xml#ReceiveReturn"/>

Modified: ofbiz/trunk/applications/product/webapp/facility/inventory/InventoryForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/inventory/InventoryForms.xml?view=diff&rev=548232&r1=548231&r2=548232
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/inventory/InventoryForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/facility/inventory/InventoryForms.xml Sun Jun 17 23:35:29 2007
@@ -148,4 +148,36 @@
             <hyperlink target="/ordermgr/control/orderview?orderId=${orderId}" target-type="inter-app" description="${orderId}" />
         </field>
     </form>
+    <!-- Inventory Item Labels -->
+    <form name="UpdateInventoryItemLabelAppls" type="list" target="updateInventoryItemLabelApplFromItem" title="" list-name="inventoryItemLabelAppls">
+        <auto-fields-service service-name="updateInventoryItemLabelAppl"/>
+        <field name="inventoryItemLabelId" title="" widget-style="buttontext">
+            <hyperlink target="EditInventoryItemLabel?inventoryItemLabelId=${inventoryItemLabelId}" description="${inventoryItemLabelId}" also-hidden="true"/>
+        </field>
+        <field name="facilityId"><hidden/></field>
+        <field name="inventoryItemId"><hidden/></field>
+        <field name="inventoryItemLabelTypeId">
+            <display-entity entity-name="InventoryItemLabelType" description="${description} [${inventoryItemLabelTypeId}]"/>
+        </field>
+        <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
+        <field name="deleteLink" title="" widget-style="buttontext">
+            <hyperlink target="deleteInventoryItemLabelApplFromItem?inventoryItemId=${inventoryItemId}&amp;inventoryItemLabelTypeId=${inventoryItemLabelTypeId}&amp;inventoryItemLabelId=${inventoryItemLabelId}&amp;facilityId=${facilityId}"
+                description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
+        </field>
+    </form>
+    <form name="AddInventoryItemLabelAppl" type="single" target="createInventoryItemLabelApplFromItem" title="">
+        <auto-fields-service service-name="createInventoryItemLabelAppl"/>
+        <field name="facilityId"><hidden/></field>
+        <field name="inventoryItemId"><hidden/></field>
+        <field name="inventoryItemLabelId">
+            <drop-down allow-empty="false">
+                <entity-options entity-name="InventoryItemLabel" description="${inventoryItemLabelTypeId} ${inventoryItemLabelId} ${description}">
+                    <entity-order-by field-name="inventoryItemLabelTypeId"/>
+                    <entity-order-by field-name="inventoryItemLabelId"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="submitButton" title="${uiLabelMap.CommonCreate}"><submit button-type="button"/></field>
+    </form>
+
 </forms>

Modified: ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml?view=diff&rev=548232&r1=548231&r2=548232
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml Sun Jun 17 23:35:29 2007
@@ -159,7 +159,6 @@
                         <container>
                             <link target="EditFacility" text="${uiLabelMap.ProductNewFacility}" style="buttontext"/>
                             <link target="EditInventoryItem?facilityId=${parameters.facilityId}" text="${uiLabelMap.ProductCreateNewInventoryItemFacility}" style="buttontext"/>
-                            <link target="ViewFacilityInventoryByProduct?facilityId=${parameters.facilityId}" text="${uiLabelMap.CommonView} ${uiLabelMap.ProductInventoryByProduct}" style="buttontext"/>
                         </container>
                         <include-form name="SearchInventoryItemsParams" location="component://product/webapp/facility/facility/FacilityForms.xml"/>
                         <include-form name="ListFacilityInventoryItems" location="component://product/webapp/facility/facility/FacilityForms.xml"/>
@@ -412,6 +411,7 @@
                 <set field="titleProperty" value="PageTitleEditInventoryItem"/>
                 <set field="headerItem" value="facility"/>
                 <set field="tabButtonItem" value="EditFacilityInventoryItems"/>
+                <set field="subTabButtonItem" value="EditInventoryItem"/>
                 <set field="displayWithNoFacility" value="Y"/>
                 <set field="facilityId" from-field="parameters.facilityId"/>
                 <set field="inventoryItemId" from-field="parameters.inventoryItemId"/>
@@ -449,10 +449,10 @@
                                 <not><if-empty field-name="inventoryItem"/></not>
                             </condition>
                             <widgets>
+                                <include-menu name="InventoryItemTabBar" location="component://product/widget/facility/Menus.xml"/>
                                 <container style="widget-container">
                                     <link target="EditInventoryItem?facilityId=${facilityId}" text="${uiLabelMap.ProductNewInventoryItem}" style="buttontext"/>
                                     <link target="TransferInventoryItem?inventoryItemId=${inventoryItemId}&amp;facilityId=${facilityId}" text="${uiLabelMap.ProductTransferItem}" style="buttontext"/>
-                                    <link target="ViewInventoryItemDetail?inventoryItemId=${inventoryItemId}&amp;facilityId=${facilityId}" text="${uiLabelMap.ProductInventoryDetails}" style="buttontext"/>
                                 </container>
                             </widgets>
                             <fail-widgets>
@@ -501,6 +501,7 @@
                 <set field="titleProperty" value="PageTitleEditInventoryItem"/>
                 <set field="headerItem" value="facility"/>
                 <set field="tabButtonItem" value="EditFacilityInventoryItems"/>
+                <set field="subTabButtonItem" value="ViewInventoryItemDetail"/>
                 
                 <set field="inventoryItemId" from-field="parameters.inventoryItemId" />
                 <set field="facilityId" from-field="parameters.facilityId" />
@@ -515,17 +516,47 @@
             <widgets>
                 <decorator-screen name="CommonFacilityDecorator" location="${parameters.commonFacilityDecoratorLocation}">
                     <decorator-section name="body">
+                        <include-menu name="InventoryItemTabBar" location="component://product/widget/facility/Menus.xml"/>
                         <container>
                             <label style="head1">${uiLabelMap.ProductInventoryDetails} ${uiLabelMap.CommonFor} [${inventoryItemId}]</label>
                          </container>
-                        <container>
-                            <link target="EditInventoryItem?inventoryItemId=${inventoryItemId}&amp;facilityId=${facilityId}" text="${uiLabelMap.CommonView} ${uiLabelMap.ProductInventoryItem} ${inventoryItemId}" style="buttontext"/>
-                        </container>
                         <include-form name="ListInventoryItemDetail" location="component://product/webapp/facility/inventory/InventoryForms.xml"/>
                         <container>
                             <label style="head1">Shipment Receipts for [${inventoryItemId}]</label>
                         </container>
                         <include-form name="ViewInventoryItemShipmentReceipts" location="component://product/webapp/facility/inventory/InventoryForms.xml"/>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+    <screen name="EditInventoryItemLabels">
+        <section>
+            <actions>
+                <set field="titleProperty" value="PageTitleEditInventoryItemLabels"/>
+                <set field="headerItem" value="facility"/>
+                <set field="tabButtonItem" value="EditFacilityInventoryItems"/>
+                <set field="subTabButtonItem" value="EditInventoryItemLabels"/>
+                
+                <set field="inventoryItemId" from-field="parameters.inventoryItemId" />
+                <set field="facilityId" from-field="parameters.facilityId" />
+                
+                <entity-condition entity-name="InventoryItemLabelAppl" list-name="inventoryItemLabelAppls">
+                    <condition-list combine="and">
+                        <condition-expr field-name="inventoryItemId" operator="equals" env-name="inventoryItemId"/>
+                    </condition-list>
+                    <order-by field-name="sequenceNum"/>
+                </entity-condition>
+            </actions>
+            <widgets>
+                <decorator-screen name="CommonFacilityDecorator" location="${parameters.commonFacilityDecoratorLocation}">
+                    <decorator-section name="body">
+                        <include-menu name="InventoryItemTabBar" location="component://product/widget/facility/Menus.xml"/>
+                        <container>
+                            <label style="head1">${uiLabelMap.ProductInventoryItemLabels} ${uiLabelMap.CommonFor} [${inventoryItemId}]</label>
+                         </container>
+                        <include-form name="UpdateInventoryItemLabelAppls" location="component://product/webapp/facility/inventory/InventoryForms.xml"/>
+                        <include-form name="AddInventoryItemLabelAppl" location="component://product/webapp/facility/inventory/InventoryForms.xml"/>
                     </decorator-section>
                 </decorator-screen>
             </widgets>

Modified: ofbiz/trunk/applications/product/widget/facility/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/Menus.xml?view=diff&rev=548232&r1=548231&r2=548232
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/Menus.xml (original)
+++ ofbiz/trunk/applications/product/widget/facility/Menus.xml Sun Jun 17 23:35:29 2007
@@ -93,4 +93,15 @@
             <link target="EditInventoryItemLabelAppls?inventoryItemLabelId=${inventoryItemLabelId}"/>
         </menu-item>
     </menu>
+    <menu name="InventoryItemTabBar" default-menu-item-name="EditInventoryItem" selected-menuitem-context-field-name="subTabButtonItem">
+        <menu-item name="EditInventoryItem" title="${uiLabelMap.ProductInventoryItem}">
+            <link target="EditInventoryItem?inventoryItemId=${inventoryItemId}&amp;facilityId=${facilityId}"/>
+        </menu-item>
+        <menu-item name="ViewInventoryItemDetail" title="${uiLabelMap.ProductInventoryDetails}">
+            <link target="ViewInventoryItemDetail?inventoryItemId=${inventoryItemId}&amp;facilityId=${facilityId}"/>
+        </menu-item>
+        <menu-item name="EditInventoryItemLabels" title="${uiLabelMap.ProductInventoryItemLabelAppl}">
+            <link target="EditInventoryItemLabels?inventoryItemId=${inventoryItemId}&amp;facilityId=${facilityId}"/>
+        </menu-item>
+    </menu>
 </menus>