svn commit: r521827 - in /ofbiz/trunk/applications/order/webapp/ordermgr: WEB-INF/actions/order/filterorderlist.bsh order/findOrders.ftl order/orderlist.ftl

[rayb-2]

Author: rayb
Date: Fri Mar 23 10:52:41 2007
New Revision: 521827

URL: http://svn.apache.org/viewvc?view=rev&rev=521827
Log:
Fixed the 'filter' section of the orderlist and findOrders screen. Both had output formating issues, but orderlist was also checking for wrong field name in bsh file so it would never show any results.  NB These two screens could be improved to re-use more of the logic related to populating the filter lists, but this is just a bug fix for now.

Modified:
    ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/filterorderlist.bsh
    ofbiz/trunk/applications/order/webapp/ordermgr/order/findOrders.ftl
    ofbiz/trunk/applications/order/webapp/ordermgr/order/orderlist.ftl

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/filterorderlist.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/filterorderlist.bsh?view=diff&rev=521827&r1=521826&r2=521827
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/filterorderlist.bsh (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/filterorderlist.bsh Fri Mar 23 10:52:41 2007
@@ -29,7 +29,7 @@
 
 List filterInventoryProblems = new ArrayList();
 
-if (state.hasFilter("view_InventoryProblems") && UtilValidate.isNotEmpty(orderHeaderList)) {
+if (state.hasFilter("filterInventoryProblems") && UtilValidate.isNotEmpty(orderHeaderList)) {
     for (ohi = orderHeaderList.iterator(); ohi.hasNext();) {
         orderHeader = (GenericValue) ohi.next();
         orderReadHelper = OrderReadHelper.getHelper(orderHeader);

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/findOrders.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/findOrders.ftl?view=diff&rev=521827&r1=521826&r2=521827
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/findOrders.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/findOrders.ftl Fri Mar 23 10:52:41 2007
@@ -430,7 +430,7 @@
           <td width="10%" align="right"><div class="tableheadtext">${uiLabelMap.OrderRemainingSubTotal}</div></td>
           <td width="10%" align="right"><div class="tableheadtext">${uiLabelMap.OrderOrderTotal}</div></td>
           <td width="5%" align="left"><div class="tableheadtext">&nbsp;</div></td>
-            <#if filterInventoryProblems?has_content || filterPOsOpenPastTheirETA?has_content || filterPOsWithRejectedItems?has_content || filterPartiallyReceivedPOs?has_content>
+            <#if (requestParameters.filterInventoryProblems?default("N") == "Y") || (requestParameters.filterPOsOpenPastTheirETA?default("N") == "Y") || (requestParameters.filterPOsWithRejectedItems?default("N") == "Y") || (requestParameters.filterPartiallyReceivedPOs?default("N") == "Y")>
               <td width="15%" align="left"><div class="tableheadtext">${uiLabelMap.CommonStatus}</div></td>
               <td width="5%"><div class="tabletext"><b>${uiLabelMap.CommonFilter}</b></div></td>
             <#else>
@@ -504,6 +504,7 @@
               <td>&nbsp;</td>
               <td><div class="tabletext">${statusItem.get("description",locale)?default(statusItem.statusId?default("N/A"))}</div></td>
                                 </td>
+              <#if (requestParameters.filterInventoryProblems?default("N") == "Y") || (requestParameters.filterPOsOpenPastTheirETA?default("N") == "Y") || (requestParameters.filterPOsWithRejectedItems?default("N") == "Y") || (requestParameters.filterPartiallyReceivedPOs?default("N") == "Y")>
                   <td class="tabletext">
                       <#if filterInventoryProblems.contains(orderHeader.orderId)>
                         Inv&nbsp;                      
@@ -518,6 +519,7 @@
                         Part&nbsp;                      
                       </#if>                      
                   </td>
+              </#if>
               
               <td><div class="tabletext">${orderHeader.getString("orderDate")}</div></td>
               <td>

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderlist.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderlist.ftl?view=diff&rev=521827&r1=521826&r2=521827
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderlist.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderlist.ftl Fri Mar 23 10:52:41 2007
@@ -172,7 +172,7 @@
                 <td width="10%">
                   <div class="tabletext"><b>${uiLabelMap.OrderTrackingCode}</b></div>
                 </td>
-                <#if filterInventoryProblems?has_content || filterAuthProblems?has_content || filterPOsOpenPastTheirETA?has_content || filterPOsWithRejectedItems?has_content || filterPartiallyReceivedPOs?has_content>
+                <#if state.hasFilter('filterInventoryProblems') || state.hasFilter('filterAuthProblems') || state.hasFilter('filterPOsOpenPastTheirETA') || state.hasFilter('filterPOsWithRejectedItems') || state.hasFilter('filterPartiallyReceivedPOs')>
                     <td width="10%">
                       <div class="tabletext"><b>${uiLabelMap.CommonStatus}</b></div>
                     </td>
@@ -236,23 +236,25 @@
                   <td class="tabletext">
                   ${orderHeader.getRelatedOneCache("StatusItem").get("description",locale)}
                   </td>
-                  <td class="tabletext">
-                      <#if filterInventoryProblems.contains(orderHeader.orderId)>
-                        Inv&nbsp;                      
-                      </#if>
-                      <#if filterAuthProblems.contains(orderHeader.orderId)>
-                       Aut&nbsp;                      
-                      </#if>
-                      <#if filterPOsOpenPastTheirETA.contains(orderHeader.orderId)>
-                        ETA&nbsp;                      
-                      </#if>
-                      <#if filterPOsWithRejectedItems.contains(orderHeader.orderId)>
-                        Rej&nbsp;                      
-                      </#if>
-                      <#if filterPartiallyReceivedPOs.contains(orderHeader.orderId)>
-                        Part&nbsp;                      
-                      </#if>                      
-                  </td>
+                  <#if state.hasFilter('filterInventoryProblems') || state.hasFilter('filterAuthProblems') || state.hasFilter('filterPOsOpenPastTheirETA') || state.hasFilter('filterPOsWithRejectedItems') || state.hasFilter('filterPartiallyReceivedPOs')>
+                      <td class="tabletext">
+                          <#if filterInventoryProblems.contains(orderHeader.orderId)>
+                            Inv&nbsp;
+                          </#if>
+                          <#if filterAuthProblems.contains(orderHeader.orderId)>
+                           Aut&nbsp;
+                          </#if>
+                          <#if filterPOsOpenPastTheirETA.contains(orderHeader.orderId)>
+                            ETA&nbsp;
+                          </#if>
+                          <#if filterPOsWithRejectedItems.contains(orderHeader.orderId)>
+                            Rej&nbsp;
+                          </#if>
+                          <#if filterPartiallyReceivedPOs.contains(orderHeader.orderId)>
+                            Part&nbsp;
+                          </#if>
+                      </td>
+                  </#if>
                 </tr>
               </#list>
               <#if !orderHeaderList?has_content>