svn commit: r483909 - in /incubator/ofbiz/trunk/specialpurpose/hhfacility: webapp/hhfacility/WEB-INF/controller.xml webapp/hhfacility/forms/FacilityForms.xml widget/hhfacility/FacilityScreens.xml

[jacopoc]

Author: jacopoc
Date: Fri Dec  8 02:26:06 2006
New Revision: 483909

URL: http://svn.apache.org/viewvc?view=rev&rev=483909
Log:
Applied patch from Anil K Patel (OFBIZ-531) to filter the list of facilities shown in the main hhfacility screen to the ones of type WAREHOUSE.

Modified:
    incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/controller.xml
    incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/forms/FacilityForms.xml
    incubator/ofbiz/trunk/specialpurpose/hhfacility/widget/hhfacility/FacilityScreens.xml

Modified: incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/controller.xml?view=diff&rev=483909&r1=483908&r2=483909
==============================================================================
--- incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/controller.xml (original)
+++ incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/controller.xml Fri Dec  8 02:26:06 2006
@@ -170,7 +170,7 @@
 
     <!-- View Mappings -->
     <view-map name="error" type="jsp" page="/error/error.jsp"/>
-    <view-map name="main" type="screen" page="component://hhfacility/widget/hhfacility/FacilityScreens.xml#main"/>
+    <view-map name="main" type="screen" page="component://hhfacility/widget/hhfacility/FacilityScreens.xml#facilities"/>
     <view-map name="login" type="screen" page="component://hhfacility/widget/hhfacility/FacilityScreens.xml#login"/>
 
     <view-map name="receipt" type="screen" page="component://hhfacility/widget/hhfacility/FacilityScreens.xml#receipt"/>

Modified: incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/forms/FacilityForms.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/forms/FacilityForms.xml?view=diff&rev=483909&r1=483908&r2=483909
==============================================================================
--- incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/forms/FacilityForms.xml (original)
+++ incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/forms/FacilityForms.xml Fri Dec  8 02:26:06 2006
@@ -20,12 +20,6 @@
     
     <form name="ListFacilities" type="list" list-name="facilities" paginate-target="main"
              default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
-        <actions>
-            <entity-condition entity-name="Facility">
-                <order-by field-name="description"/>
-            </entity-condition>
-        </actions>
-        
         <field name="facilityId" title="ID" widget-style="buttontext">
             <hyperlink also-hidden="false" description="${facilityId}" target="menu?facilityId=${facilityId}"/>
         </field>

Modified: incubator/ofbiz/trunk/specialpurpose/hhfacility/widget/hhfacility/FacilityScreens.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/specialpurpose/hhfacility/widget/hhfacility/FacilityScreens.xml?view=diff&rev=483909&r1=483908&r2=483909
==============================================================================
--- incubator/ofbiz/trunk/specialpurpose/hhfacility/widget/hhfacility/FacilityScreens.xml (original)
+++ incubator/ofbiz/trunk/specialpurpose/hhfacility/widget/hhfacility/FacilityScreens.xml Fri Dec  8 02:26:06 2006
@@ -69,29 +69,6 @@
         </section>
     </screen>
 
-    <screen name="main">
-        <section>
-            <widgets>
-                <decorator-screen name="CommonDecorator">
-                    <decorator-section name="body">
-                        <section>
-                            <condition><if-empty field-name="userLogin"/></condition>
-                            <widgets>
-                                <container><label style="tabletext" text="Please login"/></container>
-                            </widgets>
-                        </section>
-                        <section>
-                            <widgets>
-                                <container><label style="head1">Facilities</label></container>                  
-                                <include-form name="ListFacilities" location="component://hhfacility/webapp/hhfacility/forms/FacilityForms.xml"/>
-                            </widgets>
-                        </section>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
-
     <screen name="menu">
         <section>
             <widgets>
@@ -273,13 +250,14 @@
         <section>
             <actions>
                 <entity-condition entity-name="Facility" list-name="facilities">
+                    <condition-expr field-name="facilityTypeId" value="WAREHOUSE"/>
                     <order-by field-name="facilityId"/>
                 </entity-condition>
             </actions>
             <widgets>
                 <decorator-screen name="CommonDecorator">
                     <decorator-section name="body">
-                        <platform-specific><html><html-template location="component://hhfacility/webapp/hhfacility/facilities.ftl"/></html></platform-specific>
+                        <include-form name="ListFacilities" location="component://hhfacility/webapp/hhfacility/forms/FacilityForms.xml"/>
                     </decorator-section>
                 </decorator-screen>
             </widgets>