svn commit: r468298 - in /incubator/ofbiz/trunk/applications/product: webapp/facility/WEB-INF/actions/facility/ webapp/facility/facility/ widget/facility/

[jacopoc]

Author: jacopoc
Date: Thu Oct 26 23:52:25 2006
New Revision: 468298

URL: http://svn.apache.org/viewvc?view=rev&rev=468298
Log:
Reimplemented the "edit facility inventory items" screen with form widget: this should hopefully resolve the performance issue reported in OFBIZ-407.

Removed:
    incubator/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/EditFacilityInventoryItems.bsh
    incubator/ofbiz/trunk/applications/product/webapp/facility/facility/EditFacilityInventoryItems.ftl
Modified:
    incubator/ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml
    incubator/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml

Modified: incubator/ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml?view=diff&rev=468298&r1=468297&r2=468298
==============================================================================
--- incubator/ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml (original)
+++ incubator/ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml Thu Oct 26 23:52:25 2006
@@ -18,6 +18,37 @@
 
 <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-form.xsd">
+    <form name="ListFacilityInventoryItems" type="list"
+            target="" title="" list-name="inventoryItems" paginate-target="EditFacilityInventoryItems"
+            default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
+        <field name="inventoryItemId" widget-style="buttontext">
+            <hyperlink target="EditInventoryItem?inventoryItemId=${inventoryItemId}&amp;facilityId=${facilityId}" description="${inventoryItemId}"/>
+        </field>
+        <field name="inventoryItemTypeId">
+            <display-entity entity-name="InventoryItemType"/>
+        </field>
+        <field name="statusId"><display/></field>
+        <field name="datetimeReceived"><display/></field>
+        <field name="expireDate"><display/></field>
+        <field name="productId" widget-area-style="tabletext">
+            <display-entity entity-name="Product" description="${internalName}">
+                <sub-hyperlink target="/catalog/control/EditProduct?productId=${productId}" target-type="inter-app" description="${productId}" link-style="buttontext"/>
+            </display-entity>
+        </field>
+        <field name="locationSeqId" widget-style="buttontext">
+            <hyperlink target="EditFacilityLocation?facilityId=${facilityId}&amp;locationSeqId=${locationSeqId}" description="${areaId}:${aisleId}:${sectionId}:${levelId}:${positionId} [${locationSeqId}]"/>
+        </field>
+        <field name="enumId" entry-name="locationTypeEnumId" title="${uiLabelMap.CommonType}">
+            <display-entity entity-name="Enumeration"/>
+        </field>
+        <field name="lotId"><display/></field>
+        <field name="binNumber"><display/></field>
+        <field name="serialNumber"><display/></field>
+        <field name="quantityOnHandTotal"><display description="${availableToPromiseTotal} / ${quantityOnHandTotal}"/></field>
+        <field name="transfer" entry-name="inventoryItemId" widget-style="buttontext">
+            <hyperlink target="TransferInventoryItem?facilityId=${facilityId}&amp;inventoryItemId=${inventoryItemId}" description="${uiLabelMap.ProductTransfer}"/>
+        </field>
+    </form>
     <form name="FindFacilityInventoryByProduct" type="single"
             target="${facilityInventoryByProductScreen}" title=""
             default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">

Modified: incubator/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml?view=diff&rev=468298&r1=468297&r2=468298
==============================================================================
--- incubator/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml (original)
+++ incubator/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml Thu Oct 26 23:52:25 2006
@@ -182,14 +182,35 @@
                 <set field="headerItem" value="facility"/>
                 <set field="tabButtonItem" value="EditFacilityInventoryItems"/>
 
-                <script location="component://product/webapp/facility/WEB-INF/actions/facility/EditFacilityInventoryItems.bsh"/>
+                <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/>
+                <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="50"/>
+
+                <entity-one entity-name="Facility" value-name="facility"/>
+                <entity-condition entity-name="InventoryItemAndLocation" list-name="inventoryItems">
+                    <condition-list>
+                        <condition-expr field-name="facilityId" env-name="parameters.facilityId"/>
+                        <condition-expr field-name="productId" env-name="parameters.productId" ignore-if-empty="true"/>
+                    </condition-list>
+                    <order-by field-name="statusId"/>
+                    <order-by field-name="quantityOnHandTotal"/>
+                    <order-by field-name="serialNumber"/>
+                </entity-condition>
             </actions>
             <widgets>
                 <decorator-screen name="CommonFacilityDecorator">
                     <decorator-section name="body">
-                        <platform-specific>
-                            <html><html-template location="component://product/webapp/facility/facility/EditFacilityInventoryItems.ftl"/></html>
-                        </platform-specific>
+                        <container>
+                            <label style="head1">${uiLabelMap.ProductInventoryItemsFor}</label>
+                            <label style="head2">${facility.facilityName} [${uiLabelMap.CommonId}:${facilityId}]</label>
+                        </container>
+                        <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"/>
+                            <link target="SearchInventoryItems?facilityId=${parameters.facilityId}" text="${uiLabelMap.PageTitleSearchInventoryItems}" style="buttontext"/>
+                        </container>
+
+                        <include-form name="ListFacilityInventoryItems" location="component://product/webapp/facility/facility/FacilityForms.xml"/>
                     </decorator-section>
                 </decorator-screen>
             </widgets>