[OFBiz] SVN: r5917 - in trunk/applications: accounting/webapp/accounting/lookup manufacturing/webapp/manufacturing/lookup marketing/webapp/marketing/lookup order/webapp/ordermgr/lookup party/webapp/partymgr/lookup product/webapp/catalog/lookup product/webapp/facility/lookup workeffort/widget

jonesde at svn.ofbiz.org jonesde at svn.ofbiz.org
Wed Oct 5 01:33:51 EDT 2005


Author: jonesde
Date: 2005-10-05 00:33:25 -0500 (Wed, 05 Oct 2005)
New Revision: 5917

Modified:
   trunk/applications/accounting/webapp/accounting/lookup/FieldLookupForms.xml
   trunk/applications/manufacturing/webapp/manufacturing/lookup/FieldLookupForms.xml
   trunk/applications/marketing/webapp/marketing/lookup/LookupForms.xml
   trunk/applications/order/webapp/ordermgr/lookup/FieldLookupForms.xml
   trunk/applications/party/webapp/partymgr/lookup/LookupForms.xml
   trunk/applications/product/webapp/catalog/lookup/FieldLookupForms.xml
   trunk/applications/product/webapp/facility/lookup/FieldLookupForms.xml
   trunk/applications/workeffort/widget/LookupForms.xml
   trunk/applications/workeffort/widget/WorkEffortForms.xml
Log:
added noConditionFind hidden fields to the various lookup forms so that when no query parameters are entered and find is clicked it will do a find all

Modified: trunk/applications/accounting/webapp/accounting/lookup/FieldLookupForms.xml
===================================================================
--- trunk/applications/accounting/webapp/accounting/lookup/FieldLookupForms.xml	2005-10-05 04:33:44 UTC (rev 5916)
+++ trunk/applications/accounting/webapp/accounting/lookup/FieldLookupForms.xml	2005-10-05 05:33:25 UTC (rev 5917)
@@ -38,6 +38,7 @@
                 </entity-options>
              </drop-down>
         </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>
     </form>
     <form name="listLookupFixedAsset" list-name="entityList" paginate-target="LookupFixedAsset" title="" type="list" 

Modified: trunk/applications/manufacturing/webapp/manufacturing/lookup/FieldLookupForms.xml
===================================================================
--- trunk/applications/manufacturing/webapp/manufacturing/lookup/FieldLookupForms.xml	2005-10-05 04:33:44 UTC (rev 5916)
+++ trunk/applications/manufacturing/webapp/manufacturing/lookup/FieldLookupForms.xml	2005-10-05 05:33:25 UTC (rev 5917)
@@ -26,24 +26,18 @@
 
 <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
         xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-form.xsd">
-    <form name="lookupRouting" 
-        default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox"
-        target="LookupRouting" title="" type="single">
-	<auto-fields-service service-name="lookupRoutingTask" default-field-type="hidden"/>
-	<field name="workEffortName"><text-find/></field>
+    <form name="lookupRouting" target="LookupRouting" title="" type="single"
+        default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
+        <auto-fields-service service-name="lookupRoutingTask" default-field-type="hidden"/>
+        <field name="workEffortName"><text-find/></field>
         <field name="workEffortTypeId"><hidden value="ROUTING"/></field>
-        <field name="fixedAssetId"><hidden value=""/>
-        </field> 
+        <field name="fixedAssetId"><hidden value=""/></field> 
         <field name="fixedAssetId_op"><hidden value="equals"/></field>
-        <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit">
-            <submit button-type="button"/>
-        </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>
     </form>
-
-    <form name="listLookupRouting" 
-        default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="tabletext"
-        list-name="entityList" paginate-target="LookupRouting" 
-        title="" type="list">
+    <form name="listLookupRouting" list-name="entityList" paginate-target="LookupRouting" title="" type="list"
+        default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="tabletext">
         <actions>
             <service service-name="performFind" result-map-name="result" result-map-list-iterator-name="listIt">
                 <field-map field-name="inputFields" env-name="requestParameters"/>
@@ -58,9 +52,8 @@
         <field name="quantityToProduce" title="${uiLabelMap.ManufacturingQuantityMinimum}"><display/></field>
     </form>
 
-    <form name="lookupRoutingTask" 
-        default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox"
-        target="LookupRoutingTask" title="" type="single">
+    <form name="lookupRoutingTask" target="LookupRoutingTask" title="" type="single"
+        default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
         <auto-fields-service service-name="lookupRoutingTask" default-field-type="find"/>
         <field name="workEffortTypeId"><hidden value="ROU_TASK"/></field>
         <field name="fixedAssetId" >
@@ -72,15 +65,12 @@
              </drop-down>
         </field>
         <field name="fixedAssetId_op"><hidden value="equals"/></field>
-        <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit">
-            <submit button-type="button"/>
-        </field>
-    </form>
 
-    <form name="listLookupRoutingTask" 
-        default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="tabletext"
-        list-name="entityList" paginate-target="LookupRoutingTask" 
-        title="" type="list">
+        <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>
+    </form>
+    <form name="listLookupRoutingTask" list-name="entityList" paginate-target="LookupRoutingTask" title="" type="list"
+        default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="tabletext">
         <actions>
             <service service-name="performFind" result-map-name="result" result-map-list-iterator-name="listIt">
                 <field-map field-name="inputFields" env-name="requestParameters"/>

Modified: trunk/applications/marketing/webapp/marketing/lookup/LookupForms.xml
===================================================================
--- trunk/applications/marketing/webapp/marketing/lookup/LookupForms.xml	2005-10-05 04:33:44 UTC (rev 5916)
+++ trunk/applications/marketing/webapp/marketing/lookup/LookupForms.xml	2005-10-05 05:33:25 UTC (rev 5917)
@@ -31,6 +31,7 @@
         <field name="segmentGroupTypeId" title="${uiLabelMap.SegmentGroupSegmentGroupTypeId}"><text-find/></field>
         <field name="description" title="${uiLabelMap.SegmentGroupDescription}"><text-find/></field>
         <field name="productStoreId" title="${uiLabelMap.SegmentGroupProductStoreId}"><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="Lookup" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
    <form name="listLookupSegmentGroup" default-title-style="tableheadtext"
@@ -49,10 +50,8 @@
         <field name="description" title="${uiLabelMap.SegmentGroupDescription}"><display/></field>
         <field name="productStoreId" title="${uiLabelMap.SegmentGroupProductStoreId}"><display/></field>
         <field name="deleteLink" title="&amp;nbsp;" widget-style="buttontext">
-            <hyperlink target="deleteSegmentGroup?segmentGroupId=${segmentGroupId}"
-                description="[${uiLabelMap.CommonDelete}]" also-hidden="false"/>
+            <hyperlink target="deleteSegmentGroup?segmentGroupId=${segmentGroupId}" description="[${uiLabelMap.CommonDelete}]" also-hidden="false"/>
         </field>
-        
     </form>
      
    <form name="listSegmentGroupClass" default-title-style="tableheadtext"
@@ -73,10 +72,10 @@
         </field>
     </form>
     
-    <form name="LookupProductStore" default-title-style="tableheadtext"
-        default-tooltip-style="tabletext" default-widget-style="inputBox"
+    <form name="LookupProductStore" default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox"
         target="LookupProductStore" title="" type="single">
         <auto-fields-entity entity-name="ProductStore" default-field-type="find" />
+        <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="Lookup" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
     <form name="listLookupProductStore" default-title-style="tableheadtext"
@@ -92,15 +91,9 @@
         <field name="productStoreId" title="&amp;nbsp;" widget-style="buttontext">
             <hyperlink also-hidden="false" target-type="plain" description="${productStoreId}" target="javascript:set_value('${productStoreId}')"/>
         </field>
-        <field name="primaryStoreGroupId">
-            <display/>
-        </field>
-        <field name="storeName">
-            <display/>
-        </field>
-        <field name="companyName">
-            <display/>
-        </field>
+        <field name="primaryStoreGroupId"><display/></field>
+        <field name="storeName"><display/></field>
+        <field name="companyName"><display/></field>
     </form>
     <form name="listLookupPartyClassificationGroup" default-title-style="tableheadtext"
         default-tooltip-style="tabletext" default-widget-style="display"
@@ -113,15 +106,9 @@
         <field name="partyClassificationGroupId" title="&amp;nbsp;" widget-style="buttontext">
             <hyperlink also-hidden="false" target-type="plain" description="${partyClassificationGroupId}" target="javascript:set_value('${partyClassificationGroupId}')"/>
         </field>
-        <field name="partyClassificationTypeId">
-            <display/>
-        </field>
-        <field name="parentGroupId">
-            <display/>
-        </field>
-        <field name="description">
-            <display/>
-        </field>
+        <field name="partyClassificationTypeId"><display/></field>
+        <field name="parentGroupId"><display/></field>
+        <field name="description"><display/></field>
     </form>
     <!-- Geo Lookup forms -->
     <form name="LookupGeo" default-title-style="tableheadtext"
@@ -137,6 +124,7 @@
         <field name="geoCode" title="${uiLabelMap.SegmentGroupGeoCode}"><text-find/></field>
         <field name="geoSecCode" title="${uiLabelMap.SegmentGroupGeoSecCode}"><text-find/></field>
         <field name="geoAbbr" title="${uiLabelMap.SegmentGroupGeoAbbr}"><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="Lookup" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
    <form name="listLookupGeo" default-title-style="tableheadtext"
@@ -159,6 +147,4 @@
         <field name="geoSecCode" title="${uiLabelMap.SegmentGroupGeoSecCode}"><display/></field>
         <field name="geoAbbr" title="${uiLabelMap.SegmentGroupGeoAbbr}"><display/></field>
     </form>
-    
 </forms>
-

Modified: trunk/applications/order/webapp/ordermgr/lookup/FieldLookupForms.xml
===================================================================
--- trunk/applications/order/webapp/ordermgr/lookup/FieldLookupForms.xml	2005-10-05 04:33:44 UTC (rev 5916)
+++ trunk/applications/order/webapp/ordermgr/lookup/FieldLookupForms.xml	2005-10-05 05:33:25 UTC (rev 5917)
@@ -58,6 +58,8 @@
                 </entity-options>
             </drop-down>
         </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.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
     <form name="listLookupOrderHeader" paginate-target="LookupOrderHeader" title="" type="list" 
@@ -111,9 +113,10 @@
              </drop-down>
         </field>
         <field name="grandTotal"><range-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>
     </form>
-
     <form name="listLookupOrderHeaderAndShipInfo" list-name="entityList" paginate-target="LookupOrderHeaderAndShipInfo" title="" type="list" 
         default-title-style="tableheadtext"  default-tooltip-style="tabletext" default-widget-style="tabletext">
         <actions>
@@ -138,6 +141,7 @@
         <field name="stateProvinceGeoId"><display/></field>
         <field name="grandTotal"><display/></field>
     </form>
+
     <form name="lookupPurchaseOrderHeaderAndShipInfo" target="LookupPurchaseOrderHeaderAndShipInfo" title="" type="single"
         default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
         <auto-fields-entity entity-name="OrderHeaderAndShipGroups" default-field-type="hidden"/>
@@ -170,6 +174,8 @@
              </drop-down>
         </field>
         <field name="grandTotal"><range-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>
     </form>
 
@@ -214,6 +220,8 @@
         <field name="createdByUserLogin"><hidden/></field>
         <field name="lastModifiedDate"><hidden/></field>
         <field name="lastModifiedByUserLogin"><hidden/></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>
     </form>
     <form name="listLookupCustRequest" list-name="entityList" paginate-target="LookupCustRequest" title="" type="list"
@@ -255,9 +263,9 @@
             </drop-down>
         </field>
         <field name="priority"><text-find></text-find></field>
-        <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit">
-            <submit button-type="button"/>
-        </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>
     </form>
     <form name="listLookupCustRequestItem" list-iterator-name="listIt" paginate-target="LookupCustRequestItem" title="" type="list"
         default-title-style="tableheadtext"  default-tooltip-style="tabletext" default-widget-style="tabletext">
@@ -313,6 +321,8 @@
         <field name="validThruDate" title="${uiLabelMap.CommonValidThruDate}"></field>
         <field name="quoteName" title="${uiLabelMap.OrderOrderQuoteName}"></field>
         <field name="description" title="${uiLabelMap.CommonDescription}"></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.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
     <form name="listLookupQuote" list-name="entityList" paginate-target="LookupQuote" title="" type="list"
@@ -377,6 +387,7 @@
             </drop-down>
         </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.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
     <form name="listLookupQuoteItem" list-name="entityList" paginate-target="LookupQuoteItem" title="" type="list"
@@ -443,9 +454,9 @@
         <field name="description" title="${uiLabelMap.CommonDescription}"><text-find/></field>
         <field name="requirementStartDate" title="${uiLabelMap.OrderRequirementStartDate}"><date-find type="date"/></field>
         <field name="requiredByDate" title="${uiLabelMap.OrderRequirementByDate}"><date-find type="date"/></field>
-        <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit">
-            <submit button-type="button"/>
-        </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.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
     <form name="listLookupRequirement" list-name="entityList" paginate-target="LookupRequirement" title="" type="list" 
         default-title-style="tableheadtext"  default-tooltip-style="tabletext" default-widget-style="tabletext">
@@ -479,6 +490,8 @@
                 <entity-options entity-name="ShoppingListType" description="${description}"/>
             </drop-down>
         </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.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
     <form name="listLookupShoppingList" list-name="entityList" paginate-target="LookupShoppingList" title="" type="list"

Modified: trunk/applications/party/webapp/partymgr/lookup/LookupForms.xml
===================================================================
--- trunk/applications/party/webapp/partymgr/lookup/LookupForms.xml	2005-10-05 04:33:44 UTC (rev 5916)
+++ trunk/applications/party/webapp/partymgr/lookup/LookupForms.xml	2005-10-05 05:33:25 UTC (rev 5917)
@@ -69,6 +69,7 @@
         <field name="partyId" title="${uiLabelMap.PartyPartyId}"><text-find/></field>
         <field name="firstName" title="${uiLabelMap.PartyFirstName}"><text-find/></field>
         <field name="lastName"  title="${uiLabelMap.PartyLastName}"><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="Lookup" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
     <form name="listLookupPerson" default-title-style="tableheadtext"
@@ -102,6 +103,7 @@
         <field name="lastName" title="${uiLabelMap.PartyLastName}"><text-find/></field>
         <field name="groupName" title="${uiLabelMap.PartyGroupName}"><text-find/></field>
         <field name="createdDate" title="${uiLabelMap.PartyCreatedDate}"><date-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="Lookup" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
     <form name="listLookupPartyAndUserLoginAndPerson" default-title-style="tableheadtext"
@@ -127,9 +129,8 @@
         <!--<auto-fields-entity entity-name="PartyGroup" default-field-type="find"/>-->
         <field name="partyId" title="${uiLabelMap.PartyPartyId}"><text-find/></field>
         <field name="groupName" title="${uiLabelMap.PartyGroupName}"><text-find/></field>
-        <field name="submitButton" title="Find" widget-style="smallSubmit">
-            <submit button-type="button"/>
-        </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="Find" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
     <form name="listLookupPartyGroup" default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="tabletext"
         list-iterator-name="listIt" paginate-target="LookupPartyGroup" title="" type="list">
@@ -149,16 +150,19 @@
     </form>
 
     <form name="listLookupSegmentGroup" default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="tabletext"
-         paginate-target="" title="" type="list" view-size="100">
-          <actions>
+            paginate-target="" title="" type="list" view-size="100">
+        <!--    
+        <actions>
             <entity-and entity-name="SegmentGroup">
             </entity-and>
         </actions>
+        -->
         <field name="segmentGroupId"  widget-style="buttontext" title="${uiLabelMap.PartySegmentGroupId}">
             <hyperlink also-hidden="false" target-type="content" description="${segmentGroupId}" target="javascript:set_value('${segmentGroupId}')"/>
         </field>
         <field name="segmentGroupTypeId" title="${uiLabelMap.PartySegmentGroupTypeId}"><display/></field>
         <field name="description" title="${uiLabelMap.PartySegmentGroupDescription}"><display/></field>
         <field name="productStoreId" title="${uiLabelMap.PartySegmentGroupProductStoreId}"><display/></field>
+        <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> 
     </form>
 </forms>

Modified: trunk/applications/product/webapp/catalog/lookup/FieldLookupForms.xml
===================================================================
--- trunk/applications/product/webapp/catalog/lookup/FieldLookupForms.xml	2005-10-05 04:33:44 UTC (rev 5916)
+++ trunk/applications/product/webapp/catalog/lookup/FieldLookupForms.xml	2005-10-05 05:33:25 UTC (rev 5917)
@@ -20,6 +20,8 @@
  *  OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
  *  THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
+ *@author     Al Byers
+ *@author     David E. Jones
  *@author     Olivier.Heintz at nereide.biz
  *@version    $Rev$
  *@since      3.0
@@ -90,6 +92,7 @@
             <hyperlink also-hidden="false" target-type="plain" description="${productId}" target="javascript:set_value('${productId}')"/>
         </field>
     </form>
+    
     <form name="lookupProductFeature"
         default-title-style="tableheadtext"
         default-tooltip-style="tabletext" default-widget-style="inputBox"
@@ -109,15 +112,12 @@
                 </entity-options>
             </drop-down>
         </field>
-        <field name="submitButton" title="Lookup" widget-style="smallSubmit">
-            <submit button-type="button"/>
-        </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="Lookup" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
-    <form name="listLookupProductFeature" 
-        default-title-style="tableheadtext"
-        default-tooltip-style="tabletext" default-widget-style="tabletext"
-        list-name="entityList" paginate-target="LookupProductFeature" 
-        title="" type="list">
+    <form name="listLookupProductFeature" list-name="entityList" paginate-target="LookupProductFeature" title="" type="list"
+        default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="tabletext">
         <actions>
             <service service-name="performFind" result-map-name="result" result-map-list-iterator-name="listIt">
                 <field-map field-name="inputFields" env-name="requestParameters"/>

Modified: trunk/applications/product/webapp/facility/lookup/FieldLookupForms.xml
===================================================================
--- trunk/applications/product/webapp/facility/lookup/FieldLookupForms.xml	2005-10-05 04:33:44 UTC (rev 5916)
+++ trunk/applications/product/webapp/facility/lookup/FieldLookupForms.xml	2005-10-05 05:33:25 UTC (rev 5917)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!--
- *  Copyright (c) 2003 The Open For Business Project - www.ofbiz.org
+ *  Copyright (c) 2003-2005 The Open For Business Project - www.ofbiz.org
  *
  *  Permission is hereby granted, free of charge, to any person obtaining a
  *  copy of this software and associated documentation files (the "Software"),
@@ -38,6 +38,8 @@
                 </entity-options>
             </drop-down>
         </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>
     </form>
     <form name="listLookupFacility" list-iterator-name="listIt" paginate-target="LookupFacility" title="" type="list" 

Modified: trunk/applications/workeffort/widget/LookupForms.xml
===================================================================
--- trunk/applications/workeffort/widget/LookupForms.xml	2005-10-05 04:33:44 UTC (rev 5916)
+++ trunk/applications/workeffort/widget/LookupForms.xml	2005-10-05 05:33:25 UTC (rev 5917)
@@ -44,6 +44,41 @@
                 </entity-options>
             </drop-down>
         </field>
+
+        <field name="currentStatusId" title="${uiLabelMap.CommonStatus}">
+            <drop-down allow-empty="true">
+                <entity-options entity-name="StatusItem" key-field-name="statusId" description="[General] ${description}">
+                    <entity-constraint name="statusTypeId" value="CALENDAR_STATUS"/>
+                    <entity-order-by field-name="description"/>
+                </entity-options>
+                <entity-options entity-name="StatusItem" key-field-name="statusId" description="[Task] ${description}">
+                    <entity-constraint name="statusTypeId" value="TASK_STATUS"/>
+                    <entity-order-by field-name="description"/>
+                </entity-options>
+                <entity-options entity-name="StatusItem" key-field-name="statusId" description="[Event] ${description}">
+                    <entity-constraint name="statusTypeId" value="EVENT_STATUS"/>
+                    <entity-order-by field-name="description"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="workEffortParentId"><lookup target-form-name="LookupWorkEffort"/></field>
+        <field name="facilityId"><lookup target-form-name="LookupFacility"/></field>
+        <field name="fixedAssetId"><lookup target-form-name="LookupFixedAsset"/></field>
+        <field name="scopeEnumId">
+            <drop-down>
+                <entity-options entity-name="Enumeration" key-field-name="enumId" description="${description}">
+                    <entity-constraint name="enumTypeId" value="WORK_EFF_SCOPE"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="moneyUomId" title="${uiLabelMap.CommonCurrency}">
+            <drop-down allow-empty="true">
+                <entity-options description="[${uomId}] - ${description}" entity-name="Uom" key-field-name="uomId">
+                    <entity-constraint name="uomTypeId" operator="equals" value="CURRENCY_MEASURE"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        
         <field name="workflowPackageId"><ignored/></field>
         <field name="workflowPackageVersion"><ignored/></field>
         <field name="workflowProcessId"><ignored/></field>
@@ -52,7 +87,9 @@
         <field name="recurrenceInfoId"><ignored/></field>
         <field name="runtimeDataId"><ignored/></field>
         <field name="noteId"><ignored/></field>
-        <field name="submitButton" title="[${uiLabelMap.CommonFind}]" widget-style="buttontext"><submit button-type="text-link"/></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.CommonFind}" widget-style="buttontext"><submit button-type="text-link"/></field>
     </form>
     <form name="listLookupWorkEffort" list-iterator-name="listIt" target="" paginate-target="LookupPerson" title="" type="list"
         default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="tabletext">

Modified: trunk/applications/workeffort/widget/WorkEffortForms.xml
===================================================================
--- trunk/applications/workeffort/widget/WorkEffortForms.xml	2005-10-05 04:33:44 UTC (rev 5916)
+++ trunk/applications/workeffort/widget/WorkEffortForms.xml	2005-10-05 05:33:25 UTC (rev 5917)
@@ -39,6 +39,13 @@
                 </entity-options>
             </drop-down>
         </field>
+        <field name="workEffortPurposeTypeId" title="${uiLabelMap.CommonPurpose}">
+            <drop-down allow-empty="true">
+                <entity-options description="${description}" entity-name="WorkEffortPurposeType" key-field-name="workEffortPurposeTypeId">
+                    <entity-order-by field-name="description"/>
+                </entity-options>
+            </drop-down>
+        </field>
         <field name="currentStatusId" title="${uiLabelMap.CommonStatus}*">
             <drop-down>
                 <entity-options entity-name="StatusItem" key-field-name="statusId" description="[General] ${description}">
@@ -55,13 +62,6 @@
                 </entity-options>
             </drop-down>
         </field>
-        <field name="workEffortPurposeTypeId" title="${uiLabelMap.CommonPurpose}">
-            <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="WorkEffortPurposeType" key-field-name="workEffortPurposeTypeId">
-                    <entity-order-by field-name="description"/>
-                </entity-options>
-            </drop-down>
-        </field>
         <field name="priority">
             <drop-down allow-empty="true">
                 <option key="1" description="1 (High)"/><option key="2"/><option key="3"/><option key="4"/><option key="5"/>
@@ -69,17 +69,6 @@
             </drop-down>
         </field>
 
-        <field name="workflowPackageId"><ignored/></field>
-        <field name="workflowPackageVersion"><ignored/></field>
-        <field name="workflowProcessId"><ignored/></field>
-        <field name="workflowProcessVersion"><ignored/></field>
-        <field name="workflowActivityId"><ignored/></field>
-        <field name="recurrenceInfoId"><ignored/></field>
-        <field name="runtimeDataId"><ignored/></field>
-        <field name="noteId"><ignored/></field>
-
-        <field name="revisionNumber" use-when="workEffort!=null" widget-style="tabletext"><display/></field>
-        
         <field name="workEffortParentId"><lookup target-form-name="LookupWorkEffort"/></field>
         <field name="facilityId"><lookup target-form-name="LookupFacility"/></field>
         <field name="fixedAssetId"><lookup target-form-name="LookupFixedAsset"/></field>
@@ -102,8 +91,19 @@
         <field use-when="workEffort==null" name="requirementId"><lookup target-form-name="LookupRequirement"/></field>
         <field name="communicationEventId" title="Quick Add Comm. Event Id" map-name="context"><lookup target-form-name="LookupCommunicationEvent"/></field><!-- TODO: need to implement this -->
         
+        <field name="revisionNumber" use-when="workEffort!=null" widget-style="tabletext"><display/></field>
+
         <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit/></field>
 
+        <field name="workflowPackageId"><ignored/></field>
+        <field name="workflowPackageVersion"><ignored/></field>
+        <field name="workflowProcessId"><ignored/></field>
+        <field name="workflowProcessVersion"><ignored/></field>
+        <field name="workflowActivityId"><ignored/></field>
+        <field name="recurrenceInfoId"><ignored/></field>
+        <field name="runtimeDataId"><ignored/></field>
+        <field name="noteId"><ignored/></field>
+        
         <sort-order>
             <sort-field name="quickAssignPartyId"/>
             <sort-field name="workEffortId"/>
@@ -138,6 +138,41 @@
                 </entity-options>
             </drop-down>
         </field>
+
+        <field name="currentStatusId" title="${uiLabelMap.CommonStatus}">
+            <drop-down allow-empty="true">
+                <entity-options entity-name="StatusItem" key-field-name="statusId" description="[General] ${description}">
+                    <entity-constraint name="statusTypeId" value="CALENDAR_STATUS"/>
+                    <entity-order-by field-name="description"/>
+                </entity-options>
+                <entity-options entity-name="StatusItem" key-field-name="statusId" description="[Task] ${description}">
+                    <entity-constraint name="statusTypeId" value="TASK_STATUS"/>
+                    <entity-order-by field-name="description"/>
+                </entity-options>
+                <entity-options entity-name="StatusItem" key-field-name="statusId" description="[Event] ${description}">
+                    <entity-constraint name="statusTypeId" value="EVENT_STATUS"/>
+                    <entity-order-by field-name="description"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="workEffortParentId"><lookup target-form-name="LookupWorkEffort"/></field>
+        <field name="facilityId"><lookup target-form-name="LookupFacility"/></field>
+        <field name="fixedAssetId"><lookup target-form-name="LookupFixedAsset"/></field>
+        <field name="scopeEnumId">
+            <drop-down>
+                <entity-options entity-name="Enumeration" key-field-name="enumId" description="${description}">
+                    <entity-constraint name="enumTypeId" value="WORK_EFF_SCOPE"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="moneyUomId" title="${uiLabelMap.CommonCurrency}">
+            <drop-down allow-empty="true">
+                <entity-options description="[${uomId}] - ${description}" entity-name="Uom" key-field-name="uomId">
+                    <entity-constraint name="uomTypeId" operator="equals" value="CURRENCY_MEASURE"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        
         <field name="workflowPackageId"><ignored/></field>
         <field name="workflowPackageVersion"><ignored/></field>
         <field name="workflowProcessId"><ignored/></field>



More information about the Svn mailing list