svn commit: r544122 - in /ofbiz/trunk/applications/product: entitydef/entitymodel.xml webapp/facility/WEB-INF/controller.xml webapp/facility/facility/FacilityForms.xml widget/facility/FacilityScreens.xml widget/facility/Menus.xml

[jacopoc]

Author: jacopoc
Date: Mon Jun  4 04:18:17 2007
New Revision: 544122

URL: http://svn.apache.org/viewvc?view=rev&rev=544122
Log:
Unified the EditInventoryItems and SearchInventoryItems screens into one more clean and complete screen.

Modified:
    ofbiz/trunk/applications/product/entitydef/entitymodel.xml
    ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml
    ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml
    ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml
    ofbiz/trunk/applications/product/widget/facility/Menus.xml

Modified: ofbiz/trunk/applications/product/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/entitydef/entitymodel.xml?view=diff&rev=544122&r1=544121&r2=544122
==============================================================================
--- ofbiz/trunk/applications/product/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/product/entitydef/entitymodel.xml Mon Jun  4 04:18:17 2007
@@ -1174,12 +1174,17 @@
             package-name="org.ofbiz.product.inventory"
             title="InventoryItem And FacilityLocation View Entity">
       <member-entity entity-alias="II" entity-name="InventoryItem"/>
+      <member-entity entity-alias="PR" entity-name="Product"/>
       <member-entity entity-alias="FL" entity-name="FacilityLocation"/>
       <alias-all entity-alias="II"/>
+      <alias-all entity-alias="PR"/>
       <alias-all entity-alias="FL"/>
       <view-link entity-alias="II" rel-entity-alias="FL" rel-optional="true">
         <key-map field-name="facilityId"/>
         <key-map field-name="locationSeqId"/>
+      </view-link>
+      <view-link entity-alias="II" rel-entity-alias="PR" rel-optional="true">
+        <key-map field-name="productId"/>
       </view-link>
       <relation type="one-nofk" rel-entity-name="ProductFacilityLocation">
         <key-map field-name="productId"/>

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=544122&r1=544121&r2=544122
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml Mon Jun  4 04:18:17 2007
@@ -216,10 +216,6 @@
         <security https="true" auth="true"/>
         <response name="success" type="view" value="ViewFacilityInventoryByProductExport"/>
     </request-map>
-    <request-map uri="SearchInventoryItems">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="SearchInventoryItems"/>
-    </request-map>
 
     <request-map uri="FindFacilityTransfers">
         <security https="true" auth="true"/>
@@ -1078,7 +1074,6 @@
     <view-map name="EditFacilityRoles" type="screen" page="component://product/widget/facility/FacilityScreens.xml#EditFacilityRoles"/>
     <view-map name="ViewContactMechs" type="screen" page="component://product/widget/facility/FacilityScreens.xml#ViewContactMechs"/>
     <view-map name="EditContactMech" type="screen" page="component://product/widget/facility/FacilityScreens.xml#EditContactMech"/>
-    <view-map name="SearchInventoryItems" type="screen" page="component://product/widget/facility/FacilityScreens.xml#SearchInventoryItems"/>
 
     <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"/>

Modified: ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml?view=diff&rev=544122&r1=544121&r2=544122
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml Mon Jun  4 04:18:17 2007
@@ -35,9 +35,35 @@
             <hyperlink target="EditFacility?facilityId=${facilityId}" description="${uiLabelMap.CommonEdit}"/>
         </field>
     </form>
-    <form name="ListFacilityInventoryItems" type="list"  target="" title="" list-name="inventoryItems"
-        default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext"
+    <form name="SearchInventoryItemsParams" type="single" target="EditFacilityInventoryItems">
+        <field name="facilityId">
+            <drop-down allow-empty="false">
+                <entity-options entity-name="Facility" key-field-name="facilityId" description="${facilityName} [${facilityId}]">
+                    <entity-order-by field-name="facilityName"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="datetimeReceived"><date-find/></field>
+        <field name="productId"><text-find/></field>
+        <field name="internalName"><text-find/></field>
+        <field name="inventoryItemId"><text-find/></field>
+        <field name="serialNumber"><text-find/></field>
+        <field name="manufacturerPartyId">
+            <lookup target-form-name="LookupPartyName"/>
+        </field>
+        <field name="submitButton" title="${uiLabelMap.CommonFind}">
+            <submit button-type="button"/>
+        </field>
+    </form>
+    <form name="ListFacilityInventoryItems" type="list"  target="" title="" list-name="listIt"
         paginate-target="EditFacilityInventoryItems">
+        <actions>
+            <service service-name="performFind" result-map-name="results" result-map-list-name="listIt">
+                <field-map field-name="inputFields" env-name="parameters"/>
+                <field-map field-name="entityName" value="InventoryItemAndLocation"/>
+                <field-map field-name="orderBy" value="statusId|quantityOnHandTotal|serialNumber"/>
+            </service>
+        </actions>
         <field name="inventoryItemId" widget-style="buttontext">
             <hyperlink target="EditInventoryItem?inventoryItemId=${inventoryItemId}&amp;facilityId=${facilityId}" description="${inventoryItemId}"/>
         </field>
@@ -47,11 +73,10 @@
         <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 name="productId">
+            <hyperlink target="/catalog/control/EditProduct?productId=${productId}" target-type="inter-app" description="${productId}"/>
         </field>
+        <field name="internalName"><display/></field>
         <field name="locationSeqId" widget-style="buttontext">
             <hyperlink target="EditFacilityLocation?facilityId=${facilityId}&amp;locationSeqId=${locationSeqId}" description="${areaId}:${aisleId}:${sectionId}:${levelId}:${positionId} [${locationSeqId}]"/>
         </field>
@@ -136,30 +161,6 @@
         <field name="defultPrice" title="Default Price" widget-area-style="tabletextright"><display description="${resultMap.defultPrice}"/></field>
         <field name="listPrice" title="List Price" widget-area-style="tabletextright"><display description="${resultMap.listPrice}"/></field>
         <field name="wholeSalePrice" title="Whole Sale Price" widget-area-style="tabletextright"><display description="${resultMap.wholeSalePrice}"/></field>
-    </form>
-
-    <form name="SearchInventoryItemsParams" type="single" target="SearchInventoryItems"
-        default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
-        <field name="facilityId"><text/></field>
-        <field name="datetimeReceived"><date-find/></field>
-        <field name="manufacturerPartyId"><text/></field>
-        <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit">
-            <submit button-type="button"/>
-        </field>
-    </form>
-    <form name="SearchInventoryItemsResults" type="list" list-name="listIt"
-        default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
-        <actions>
-           <service service-name="performFind" result-map-name="results" result-map-list-name="listIt">
-               <field-map field-name="inputFields" env-name="parameters"/>
-               <field-map field-name="entityName" value="ProductInventoryItem"/>
-           </service>
-        </actions>        
-        <field name="inventoryItemId"><display/></field>
-        <field name="productId"><display/></field>
-        <field name="manufacturerPartyId"><display/></field>
-        <field name="datetimeReceived"><display/></field>
-        <field name="serialNumber"><display/></field>
     </form>
 
     <!-- multi-form for list of packages ready to be weighted and scheduled for shipment -->

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=544122&r1=544121&r2=544122
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml Mon Jun  4 04:18:17 2007
@@ -148,15 +148,6 @@
                 <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" location="${parameters.commonFacilityDecoratorLocation}">
@@ -169,9 +160,8 @@
                             <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="SearchInventoryItemsParams" location="component://product/webapp/facility/facility/FacilityForms.xml"/>
                         <include-form name="ListFacilityInventoryItems" location="component://product/webapp/facility/facility/FacilityForms.xml"/>
                     </decorator-section>
                 </decorator-screen>
@@ -335,38 +325,7 @@
             </widgets>
         </section>
     </screen>
-    <screen name="SearchInventoryItems">
-        <section>
-            <actions>
-                <set field="titleProperty" value="PageTitleSearchInventoryItems"/>
-                <set field="headerItem" value="facility"/>
-                <set field="tabButtonItem" value="EditFacilityInventoryItems"/>
-                <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
-                <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="50"/>
-
-                <set field="facilityId" from-field="parameters.facilityId"/>
-                <set field="manufacturerPartyId" from-field="parameters.manufacturerPartyId"/>
-            </actions>
-            <widgets>
-                <decorator-screen name="CommonFacilityDecorator" location="${parameters.commonFacilityDecoratorLocation}">
-                    <decorator-section name="body">
 
-                        <container>
-                            <label style="head1">${uiLabelMap.PageTitleSearchInventoryItems} ${uiLabelMap.CommonFor}:</label>
-                            <label style="head2">${facility.facilityName} [${uiLabelMap.CommonId}:${facilityId}]</label>                            
-                        </container>
-                        <container>
-                            <link target="EditFacilityInventoryItems?facilityId=${facilityId}" text="[${uiLabelMap.ProductInventoryItems}]" style="buttontext"/>
-                        </container>
-
-                        <include-form name="SearchInventoryItemsParams" location="component://product/webapp/facility/facility/FacilityForms.xml"/>
-                        <include-form name="SearchInventoryItemsResults" location="component://product/webapp/facility/facility/FacilityForms.xml"/>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
-
     <screen name="EditFacilityGroups">
         <section>
             <actions>

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=544122&r1=544121&r2=544122
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/Menus.xml (original)
+++ ofbiz/trunk/applications/product/widget/facility/Menus.xml Mon Jun  4 04:18:17 2007
@@ -40,6 +40,9 @@
         <menu-item name="ViewFacilityInventoryByProduct" title="${uiLabelMap.ProductInventory}">
             <link target="ViewFacilityInventoryByProduct?facilityId=${facilityId}"/>
         </menu-item>
+        <menu-item name="EditFacilityInventoryItems" title="${uiLabelMap.ProductInventoryItems}">
+            <link target="EditFacilityInventoryItems?facilityId=${facilityId}"/>
+        </menu-item>
         <menu-item name="ReceiveInventory" title="${uiLabelMap.ProductInventoryReceive}">
             <link target="ReceiveInventory?facilityId=${facilityId}"/>
         </menu-item>