svn commit: r1626389 - in /ofbiz/branches/release13.07/applications/product: config/ProductUiLabels.xml script/org/ofbiz/shipment/picklist/PicklistServices.xml webapp/facility/facility/PicklistOptions.ftl widget/facility/FacilityScreens.xml

[as...@apache.org]

Author: ashish
Date: Sat Sep 20 06:43:33 2014
New Revision: 1626389

URL: http://svn.apache.org/r1626389
Log:
Applied bug fix from trunk r1626388.
Applied patch from jira - OFBIZ-5777 - Picking screen get block when there are large number of records to process.
During load testing of OFBiz-13.07 and trunk, we observed that 'Picking' screen of Facility manager get block when there are large number of records to process. So need to fix this screen by limiting number of records to be process.
Thanks Amardeep for the contribution.

Modified:
    ofbiz/branches/release13.07/applications/product/config/ProductUiLabels.xml
    ofbiz/branches/release13.07/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml
    ofbiz/branches/release13.07/applications/product/webapp/facility/facility/PicklistOptions.ftl
    ofbiz/branches/release13.07/applications/product/widget/facility/FacilityScreens.xml

Modified: ofbiz/branches/release13.07/applications/product/config/ProductUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/product/config/ProductUiLabels.xml?rev=1626389&r1=1626388&r2=1626389&view=diff
==============================================================================
--- ofbiz/branches/release13.07/applications/product/config/ProductUiLabels.xml (original)
+++ ofbiz/branches/release13.07/applications/product/config/ProductUiLabels.xml Sat Sep 20 06:43:33 2014
@@ -164,6 +164,9 @@
         <value xml:lang="zh">按库房区域分组</value>
         <value xml:lang="zh_TW">按庫房區域分組</value>
     </property>
+    <property key="FacilityGroupFirst">
+        <value xml:lang="en">Group First</value>
+    </property>
     <property key="FacilityGroupName">
         <value xml:lang="en">Group Name</value>
         <value xml:lang="it">Nome gruppo</value>

Modified: ofbiz/branches/release13.07/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml?rev=1626389&r1=1626388&r2=1626389&view=diff
==============================================================================
--- ofbiz/branches/release13.07/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml (original)
+++ ofbiz/branches/release13.07/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml Sat Sep 20 06:43:33 2014
@@ -438,6 +438,17 @@ under the License.
             <clear-field field="orderHeaderInfo"/>
             <clear-field field="orderItemShipGroupList"/>
             <clear-field field="orderItemShipGrpInvResList"/>
+            <if>
+              <condition>
+                <and>
+                  <not><if-empty field="maxNumberOfOrders"/></not>
+                  <if-compare-field field="numberSoFar" type="Long" to-field="maxNumberOfOrders" operator="greater-equals"/>
+                </and>
+              </condition>
+              <then>
+                <break/>
+              </then>
+            </if>
         </iterate>
 
         <!-- find all groupName, for each one get the value from the pickMoveInfoMap and add it to the pickMoveInfoList -->

Modified: ofbiz/branches/release13.07/applications/product/webapp/facility/facility/PicklistOptions.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/product/webapp/facility/facility/PicklistOptions.ftl?rev=1626389&r1=1626388&r2=1626389&view=diff
==============================================================================
--- ofbiz/branches/release13.07/applications/product/webapp/facility/facility/PicklistOptions.ftl (original)
+++ ofbiz/branches/release13.07/applications/product/webapp/facility/facility/PicklistOptions.ftl Sat Sep 20 06:43:33 2014
@@ -38,6 +38,8 @@ under the License.
       <tr><td>&nbsp;</td></tr>
     </table>
     <div align ='right'>
+      <span class="label">${uiLabelMap.FacilityGroupFirst}</span>
+      <input type="text" size="4" name="maxNumberOfOrders" value="50"/>
       <input type="submit" value="Submit" class="buttontext" align='right'/>
     </div>
   </form>

Modified: ofbiz/branches/release13.07/applications/product/widget/facility/FacilityScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/product/widget/facility/FacilityScreens.xml?rev=1626389&r1=1626388&r2=1626389&view=diff
==============================================================================
--- ofbiz/branches/release13.07/applications/product/widget/facility/FacilityScreens.xml (original)
+++ ofbiz/branches/release13.07/applications/product/widget/facility/FacilityScreens.xml Sat Sep 20 06:43:33 2014
@@ -1151,6 +1151,7 @@ under the License.
                 <set field="groupByShippingMethod" from-field="parameters.groupByShippingMethod"/>
                 <set field="groupByWarehouseArea" from-field="parameters.groupByWarehouseArea"/>
                 <set field="groupByNoOfOrderItems" from-field="parameters.groupByNoOfOrderItems"/>
+                <set field="maxNumberOfOrders" from-field="parameters.maxNumberOfOrders" default-value="50"/>
                 <service service-name="findOrdersToPickMove">
                     <field-map field-name="facilityId"/>
                     <field-map field-name="groupByShippingMethod"/>