0033092: [Category tree] Filter by category tree should have the same behavior as filter by the product category combo

diff --git a/src/org/openbravo/retail/posterminal/BrandProductHQLCriteria.java b/src/org/openbravo/retail/posterminal/BrandProductHQLCriteria.java --- a/src/org/openbravo/retail/posterminal/BrandProductHQLCriteria.java +++ b/src/org/openbravo/retail/posterminal/BrandProductHQLCriteria.java @@ -10,6 +10,9 @@ import javax.enterprise.context.ApplicationScoped; +import org.codehaus.jettison.json.JSONArray; +import org.codehaus.jettison.json.JSONException; +import org.codehaus.jettison.json.JSONTokener; import org.openbravo.client.kernel.ComponentProvider.Qualifier; import org.openbravo.mobile.core.process.HQLCriteriaProcess; @@ -32,12 +35,16 @@ } private String[] getParams(String params) { - String[] array_params = new String[params.length()]; - String[] array = (params.substring(1, params.length() - 1)).split(","); - for (int i = 0; i < array.length; i++) { - array_params[i] = array[i].substring(1, array[i].length() - 1); + try { + JSONArray array = new JSONArray(new JSONTokener(params)); + String[] array_params = new String[array.length()]; + for (int i = 0; i < array.length(); i++) { + array_params[i] = array.getString(i); + } + return array_params; + } catch (JSONException e) { + return new String[] { "%", "__all__" }; } - return array_params; } public String getAllQuery() { @@ -45,7 +52,7 @@ } public String getProdCategoryQuery() { - return " exists (select 1 from Product as p where p.brand.id = brand.id and upper(p.name) like upper ('$1') and p.productCategory.id = '$2')"; + return " exists (select 1 from Product as p where p.brand.id = brand.id and upper(p.name) like upper ('$1') and p.productCategory.id in ( $2 ))"; } public String getBestsellers() { diff --git a/src/org/openbravo/retail/posterminal/PCharacteristicHQLCriteria.java b/src/org/openbravo/retail/posterminal/PCharacteristicHQLCriteria.java --- a/src/org/openbravo/retail/posterminal/PCharacteristicHQLCriteria.java +++ b/src/org/openbravo/retail/posterminal/PCharacteristicHQLCriteria.java @@ -10,6 +10,9 @@ import javax.enterprise.context.ApplicationScoped; +import org.codehaus.jettison.json.JSONArray; +import org.codehaus.jettison.json.JSONException; +import org.codehaus.jettison.json.JSONTokener; import org.openbravo.client.kernel.ComponentProvider.Qualifier; import org.openbravo.mobile.core.process.HQLCriteriaProcess; @@ -32,12 +35,16 @@ } private String[] getParams(String params) { - String[] array_params = new String[params.length()]; - String[] array = (params.substring(1, params.length() - 1)).split(","); - for (int i = 0; i < array.length; i++) { - array_params[i] = array[i].substring(1, array[i].length() - 1); + try { + JSONArray array = new JSONArray(new JSONTokener(params)); + String[] array_params = new String[array.length()]; + for (int i = 0; i < array.length(); i++) { + array_params[i] = array.getString(i); + } + return array_params; + } catch (JSONException e) { + return new String[] { "%", "__all__" }; } - return array_params; } public String getAllQuery() { diff --git a/src/org/openbravo/retail/posterminal/ProductCharacteristicHQLCriteria.java b/src/org/openbravo/retail/posterminal/ProductCharacteristicHQLCriteria.java --- a/src/org/openbravo/retail/posterminal/ProductCharacteristicHQLCriteria.java +++ b/src/org/openbravo/retail/posterminal/ProductCharacteristicHQLCriteria.java @@ -10,6 +10,9 @@ import javax.enterprise.context.ApplicationScoped; +import org.codehaus.jettison.json.JSONArray; +import org.codehaus.jettison.json.JSONException; +import org.codehaus.jettison.json.JSONTokener; import org.openbravo.client.kernel.ComponentProvider.Qualifier; import org.openbravo.mobile.core.process.HQLCriteriaProcess; @@ -32,12 +35,16 @@ } private String[] getParams(String params) { - String[] array_params = new String[params.length()]; - String[] array = (params.substring(1, params.length() - 1)).split(","); - for (int i = 0; i < array.length; i++) { - array_params[i] = array[i].substring(1, array[i].length() - 1); + try { + JSONArray array = new JSONArray(new JSONTokener(params)); + String[] array_params = new String[array.length()]; + for (int i = 0; i < array.length(); i++) { + array_params[i] = array.getString(i); + } + return array_params; + } catch (JSONException e) { + return new String[] { "%", "__all__" }; } - return array_params; } public String getAllQuery() { diff --git a/web/org.openbravo.retail.posterminal/js/components/modalproductbrand.js b/web/org.openbravo.retail.posterminal/js/components/modalproductbrand.js --- a/web/org.openbravo.retail.posterminal/js/components/modalproductbrand.js +++ b/web/org.openbravo.retail.posterminal/js/components/modalproductbrand.js @@ -125,7 +125,7 @@ } } else { var productFilterText = inSender.parent.parent.$.multiColumn.$.rightPanel.$.toolbarpane.$.searchCharacteristic.$.searchCharacteristicTabContent.$.searchProductCharacteristicHeader.$.productFilterText.getValue(); - var productcategory = inSender.parent.parent.$.multiColumn.$.rightPanel.$.toolbarpane.$.searchCharacteristic.$.searchCharacteristicTabContent.$.searchProductCharacteristicHeader.$.productcategory.getValue(); + var productCategory = inSender.parent.parent.$.multiColumn.$.rightPanel.$.toolbarpane.$.searchCharacteristic.$.searchCharacteristicTabContent.getProductCategoryFilter(); var remoteCriteria = [], characteristicValue = [], characteristic = [], @@ -134,12 +134,13 @@ productText; criteria = {}; if (products.collection.length > 0) { - if (productFilterText !== "" || productcategory !== "__all__") { + if (productFilterText !== "" || productCategory.value !== "__all__") { + var productCat = inSender.parent.parent.$.multiColumn.$.rightPanel.$.toolbarpane.$.searchCharacteristic.$.searchCharacteristicTabContent.$.searchProductCharacteristicHeader.getSelectedCategories(); brandfilter.columns = []; brandfilter.operator = OB.Dal.FILTER; brandfilter.value = this.brandValueFilterQualifier; productText = (OB.MobileApp.model.hasPermission('OBPOS_remote.product' + OB.Dal.USESCONTAINS, true) ? '%' : '') + productFilterText + '%'; - brandfilter.params = [productText, productcategory]; + brandfilter.params = [productText, productCategory.filter ? productCategory.params[0] : productCat.indexOf('OBPOS_bestsellercategory') >= 0 ? 'OBPOS_bestsellercategory' : [productCategory.value]]; remoteCriteria.push(brandfilter); } } diff --git a/web/org.openbravo.retail.posterminal/js/components/modalproductcharacteristic.js b/web/org.openbravo.retail.posterminal/js/components/modalproductcharacteristic.js --- a/web/org.openbravo.retail.posterminal/js/components/modalproductcharacteristic.js +++ b/web/org.openbravo.retail.posterminal/js/components/modalproductcharacteristic.js @@ -179,10 +179,10 @@ return true; } - var productFilterText, productcategory, productCharacteristicModel; + var productFilterText, productCategory, productCharacteristicModel; productFilterText = inSender.parent.parent.$.multiColumn.$.rightPanel.$.toolbarpane.$.searchCharacteristic.$.searchCharacteristicTabContent.$.searchProductCharacteristicHeader.$.productFilterText.getValue(); - productcategory = inSender.parent.parent.$.multiColumn.$.rightPanel.$.toolbarpane.$.searchCharacteristic.$.searchCharacteristicTabContent.$.searchProductCharacteristicHeader.$.productcategory.getValue(); + productCategory = inSender.parent.parent.$.multiColumn.$.rightPanel.$.toolbarpane.$.searchCharacteristic.$.searchCharacteristicTabContent.getProductCategoryFilter(); productCharacteristicModel = inSender.parent.parent.$.multiColumn.$.rightPanel.$.toolbarpane.$.searchCharacteristic.$.searchCharacteristicTabContent.$.searchProductCharacteristicHeader.parent.model; var remoteCriteria = [], @@ -216,12 +216,13 @@ } } - if (productFilterText !== "" || productcategory !== "__all__") { + if (productFilterText !== "" || productCategory.value !== "__all__") { + var productCat = inSender.parent.parent.$.multiColumn.$.rightPanel.$.toolbarpane.$.searchCharacteristic.$.searchCharacteristicTabContent.$.searchProductCharacteristicHeader.getSelectedCategories(); productFilter.columns = []; productFilter.operator = OB.Dal.FILTER; productFilter.value = this.productCharacteristicValueFilterQualifier; productText = (OB.MobileApp.model.hasPermission('OBPOS_remote.product' + OB.Dal.USESCONTAINS, true) ? '%' : '') + productFilterText + '%'; - productFilter.params = [productText, productcategory]; + productFilter.params = [productText, productCategory.filter ? productCategory.params[0] : productCat.indexOf('OBPOS_bestsellercategory') >= 0 ? 'OBPOS_bestsellercategory' : [productCategory.value]]; remoteCriteria.push(productFilter); } if (me.parent.parent.model.get('filter').length > 0) {

diff --git a/web/org.openbravo.mobile.core/source/retail/component/ob-retail-searchproductcharacteristic.js b/web/org.openbravo.mobile.core/source/retail/component/ob-retail-searchproductcharacteristic.js --- a/web/org.openbravo.mobile.core/source/retail/component/ob-retail-searchproductcharacteristic.js +++ b/web/org.openbravo.mobile.core/source/retail/component/ob-retail-searchproductcharacteristic.js @@ -1134,6 +1134,49 @@ this.$.renderLoading.hide(); this.$.products.show(); }, + getProductCategoryFilter: function () { + var productCategory = null, + productCat = this.$.searchProductCharacteristicHeader.getSelectedCategories(); + if (productCat === "'__all__'" || productCat.indexOf('OBPOS_bestsellercategory') !== -1) { + productCategory = { + columns: ['productCategory'], + operator: 'equals', + value: '__all__', + isId: true + }; + } else if (productCat.indexOf("'") === 0) { + //TODO: improve the way packs and combos are handled + if (productCat.indexOf('7899A7A4204749AD92881133C4EE7A57') === -1 && productCat.indexOf('BE5D42E554644B6AA262CCB097753951') === -1) { + var paramIDs = []; + productCat.split(', ').forEach(function (catId) { + paramIDs.push(catId.replace("'", '').replace("'", '')); + }); + productCategory = { + columns: [], + operator: OB.Dal.FILTER, + value: 'Category_Tree_Filter', + filter: 'Category_Tree_Filter', + params: [paramIDs] + }; + } else { + //pack or combo selected + productCategory = { + columns: ['productCategory'], + operator: 'equals', + value: productCat.replace("'", '').replace("'", ''), + isId: true + }; + } + } else { + productCategory = { + columns: ['productCategory'], + operator: 'equals', + value: productCat, + isId: true + }; + } + return productCategory; + }, searchAction: function (inSender, inEvent) { this.$.products.hide(); this.$.renderLoading.show(); @@ -1347,12 +1390,7 @@ characteristicfilter = {}, brandfilter = {}, chFilter = {}, - productCategory = { - columns: ['productCategory'], - operator: 'equals', - value: inEvent.productCat, - isId: true - }; + productCategory = me.getProductCategoryFilter(); var productText; if (me.model.get('brandFilter').length > 0) { @@ -1370,13 +1408,13 @@ } } - if (productFilterText !== undefined && productcategory !== undefined) { - if (!_.isEmpty(productFilterText.getValue()) || (productcategory.getValue() && productcategory.getValue() !== "__all__")) { + if (productFilterText !== undefined && productCategory) { + if (!_.isEmpty(productFilterText.getValue()) || productCategory.value !== "__all__") { characteristicfilter.columns = []; characteristicfilter.operator = OB.Dal.FILTER; characteristicfilter.value = me.productCharacteristicFilterQualifier; productText = (OB.MobileApp.model.hasPermission('OBPOS_remote.product' + OB.Dal.USESCONTAINS, true) ? '%' : '') + productFilterText.getValue() + '%'; - characteristicfilter.params = [productText, productcategory.getValue()]; + characteristicfilter.params = [productText, productCategory.filter ? productCategory.params[0] : inEvent.productCat.indexOf('OBPOS_bestsellercategory') >= 0 ? 'OBPOS_bestsellercategory' : [productCategory.value]]; remoteCriteria.push(characteristicfilter); } } @@ -1531,7 +1569,8 @@ characteristic = [], characteristicValue = []; var brandfilter = {}, - productCategory, productCategoryElem, characteristicfilter = { + productCategory = me.getProductCategoryFilter(), + characteristicfilter = { columns: [], operator: OB.Dal.FILTER, value: 'Characteristic_Filter', @@ -1549,60 +1588,21 @@ fieldType: 'forceString' }; - if (inEvent.productCat === "'__all__'") { - productCategory = { - columns: ['productCategory'], - operator: 'equals', - value: '__all__', - isId: true - }; - } else if (inEvent.productCat.indexOf('OBPOS_bestsellercategory') !== -1) { - productCategory = { - columns: ['productCategory'], - operator: 'equals', - value: '__all__', - isId: true - }; - var bestsellers = { - columns: ['bestseller'], - operator: 'equals', - value: true, - boolean: true - }; - remoteCriteria.push(bestsellers); - } else if (inEvent.productCat.indexOf("'") === 0) { - //TODO: improve the way packs and combos are handled - if (inEvent.productCat.indexOf('7899A7A4204749AD92881133C4EE7A57') === -1 && inEvent.productCat.indexOf('BE5D42E554644B6AA262CCB097753951') === -1) { - var paramIDs = []; - inEvent.productCat.split(', ').forEach(function (catId) { - paramIDs.push(catId.replace("'", '').replace("'", '')); - }); - productCategoryElem = { - columns: [], - operator: OB.Dal.FILTER, - value: 'Category_Tree_Filter', - filter: 'Category_Tree_Filter', - params: [paramIDs] + if (inEvent.productCat !== "'__all__'") { + if (inEvent.productCat.indexOf('OBPOS_bestsellercategory') !== -1) { + var bestsellers = { + columns: ['bestseller'], + operator: 'equals', + value: true, + boolean: true }; - remoteCriteria.push(productCategoryElem); - remoteCriteria.push(ispack); - } else { - //pack or combo selected - productCategory = { - columns: ['productCategory'], - operator: 'equals', - value: inEvent.productCat.replace("'", '').replace("'", ''), - isId: true - }; + remoteCriteria.push(bestsellers); + } else if (inEvent.productCat.indexOf("'") === 0) { + //TODO: improve the way packs and combos are handled + if (inEvent.productCat.indexOf('7899A7A4204749AD92881133C4EE7A57') === -1 && inEvent.productCat.indexOf('BE5D42E554644B6AA262CCB097753951') === -1) { + remoteCriteria.push(ispack); + } } - - } else { - productCategory = { - columns: ['productCategory'], - operator: 'equals', - value: inEvent.productCat, - isId: true - }; } if (this.model.get('brandFilter').length > 0) { for (i = 0; i < this.model.get('brandFilter').length; i++) {

diff --git a/web/org.openbravo.retail.posterminal/js/components/modalproductbrand.js b/web/org.openbravo.retail.posterminal/js/components/modalproductbrand.js --- a/web/org.openbravo.retail.posterminal/js/components/modalproductbrand.js +++ b/web/org.openbravo.retail.posterminal/js/components/modalproductbrand.js @@ -135,12 +135,13 @@ criteria = {}; if (products.collection.length > 0) { if (productFilterText !== "" || productCategory.value !== "__all__") { - var productCat = inSender.parent.parent.$.multiColumn.$.rightPanel.$.toolbarpane.$.searchCharacteristic.$.searchCharacteristicTabContent.$.searchProductCharacteristicHeader.getSelectedCategories(); + var productCat = inSender.parent.parent.$.multiColumn.$.rightPanel.$.toolbarpane.$.searchCharacteristic.$.searchCharacteristicTabContent.$.searchProductCharacteristicHeader.getSelectedCategories(), + category = productCat.indexOf('OBPOS_bestsellercategory') >= 0 ? 'OBPOS_bestsellercategory' : (productCat.indexOf('__all__') >= 0 ? '__all__' : [productCategory.value]); brandfilter.columns = []; brandfilter.operator = OB.Dal.FILTER; brandfilter.value = this.brandValueFilterQualifier; productText = (OB.MobileApp.model.hasPermission('OBPOS_remote.product' + OB.Dal.USESCONTAINS, true) ? '%' : '') + productFilterText + '%'; - brandfilter.params = [productText, productCategory.filter ? productCategory.params[0] : productCat.indexOf('OBPOS_bestsellercategory') >= 0 ? 'OBPOS_bestsellercategory' : [productCategory.value]]; + brandfilter.params = [productText, productCategory.filter ? productCategory.params[0] : category]; remoteCriteria.push(brandfilter); } } diff --git a/web/org.openbravo.retail.posterminal/js/components/modalproductcharacteristic.js b/web/org.openbravo.retail.posterminal/js/components/modalproductcharacteristic.js --- a/web/org.openbravo.retail.posterminal/js/components/modalproductcharacteristic.js +++ b/web/org.openbravo.retail.posterminal/js/components/modalproductcharacteristic.js @@ -217,12 +217,13 @@ } if (productFilterText !== "" || productCategory.value !== "__all__") { - var productCat = inSender.parent.parent.$.multiColumn.$.rightPanel.$.toolbarpane.$.searchCharacteristic.$.searchCharacteristicTabContent.$.searchProductCharacteristicHeader.getSelectedCategories(); + var productCat = inSender.parent.parent.$.multiColumn.$.rightPanel.$.toolbarpane.$.searchCharacteristic.$.searchCharacteristicTabContent.$.searchProductCharacteristicHeader.getSelectedCategories(), + category = productCat.indexOf('OBPOS_bestsellercategory') >= 0 ? 'OBPOS_bestsellercategory' : (productCat.indexOf('__all__') >= 0 ? '__all__' : [productCategory.value]); productFilter.columns = []; productFilter.operator = OB.Dal.FILTER; productFilter.value = this.productCharacteristicValueFilterQualifier; productText = (OB.MobileApp.model.hasPermission('OBPOS_remote.product' + OB.Dal.USESCONTAINS, true) ? '%' : '') + productFilterText + '%'; - productFilter.params = [productText, productCategory.filter ? productCategory.params[0] : productCat.indexOf('OBPOS_bestsellercategory') >= 0 ? 'OBPOS_bestsellercategory' : [productCategory.value]]; + productFilter.params = [productText, productCategory.filter ? productCategory.params[0] : category]; remoteCriteria.push(productFilter); } if (me.parent.parent.model.get('filter').length > 0) {

Notes
(0088047) hgbot (developer) 2016-06-28 13:43	Repository: erp/pmods/org.openbravo.retail.posterminal Changeset: 3ee072d0683c7c34e6ee857385ea00b048aa36e5 Author: Sandra Huguet <sandra.huguet <at> openbravo.com> Date: Tue Jun 28 13:42:35 2016 +0200 URL: http://code.openbravo.com/erp/pmods/org.openbravo.retail.posterminal/rev/3ee072d0683c7c34e6ee857385ea00b048aa36e5 [^] Fixed bug 33092 characteristic and brand should be filtered when filtering by categorytree Filter by category tree should have the same behavior as filter by the product category combo --- M src/org/openbravo/retail/posterminal/BrandProductHQLCriteria.java M src/org/openbravo/retail/posterminal/PCharacteristicHQLCriteria.java M src/org/openbravo/retail/posterminal/ProductCharacteristicHQLCriteria.java M web/org.openbravo.retail.posterminal/js/components/modalproductbrand.js M web/org.openbravo.retail.posterminal/js/components/modalproductcharacteristic.js ---

(0088048) hgbot (developer) 2016-06-28 13:44	Repository: erp/pmods/org.openbravo.mobile.core Changeset: 700f2542b2df6e3a73df2200018edd36d0cb1aeb Author: Sandra Huguet <sandra.huguet <at> openbravo.com> Date: Tue Jun 28 13:43:43 2016 +0200 URL: http://code.openbravo.com/erp/pmods/org.openbravo.mobile.core/rev/700f2542b2df6e3a73df2200018edd36d0cb1aeb [^] Fixed bug 33092 characteristic and brand should be filtered when filtering by categorytree Filter by category tree should have the same behavior as filter by the product category combo --- M web/org.openbravo.mobile.core/source/retail/component/ob-retail-searchproductcharacteristic.js ---

(0088083) hgbot (developer) 2016-06-29 15:11	Repository: tools/automation/pi-mobile Changeset: b5c2e6e32464a2f14058eae9fa851d3e62a7423e Author: Ranjith S R <ranjith <at> qualiantech.com> Date: Wed Jun 29 18:40:49 2016 +0530 URL: http://code.openbravo.com/tools/automation/pi-mobile/rev/b5c2e6e32464a2f14058eae9fa851d3e62a7423e [^] Verifies issue 33092 : Added automated test 'I33092_VerifyProductCharacteristics' --- M src-test/org/openbravo/test/mobile/retail/pack/selenium/TestIdPack.java A src-test/org/openbravo/test/mobile/quarantine/pack/RAN/highvolume/I33092_VerifyProductCharacteristics.java ---

Issue History
Date Modified	Username	Field	Change
2016-05-31 17:27	Sandrahuguet	New Issue
2016-05-31 17:27	Sandrahuguet	Assigned To	=> Retail
2016-05-31 17:27	Sandrahuguet	OBNetwork customer	=> No
2016-05-31 17:27	Sandrahuguet	Triggers an Emergency Pack	=> No
2016-05-31 17:29	Sandrahuguet	Steps to Reproduce Updated	View Revisions
2016-05-31 17:35	Sandrahuguet	Description Updated	View Revisions
2016-06-01 17:34	ebecerra	File Added: posterminal_v1.diff
2016-06-01 17:38	ebecerra	File Added: mobile-core_v1.diff
2016-06-23 12:27	ebecerra	File Added: mobile-core_v2.diff
2016-06-24 09:13	Sandrahuguet	Steps to Reproduce Updated	View Revisions
2016-06-27 11:41	ebecerra	File Added: mobile-core_v3.diff
2016-06-27 11:42	ebecerra	File Added: posterminal_v2.diff
2016-06-28 13:39	Sandrahuguet	Assigned To	Retail => ebecerra
2016-06-28 13:43	hgbot	Checkin
2016-06-28 13:43	hgbot	Note Added: 0088047
2016-06-28 13:43	hgbot	Status	new => resolved
2016-06-28 13:43	hgbot	Resolution	open => fixed
2016-06-28 13:43	hgbot	Fixed in SCM revision	=> http://code.openbravo.com/erp/pmods/org.openbravo.retail.posterminal/rev/3ee072d0683c7c34e6ee857385ea00b048aa36e5 [^]
2016-06-28 13:44	hgbot	Checkin
2016-06-28 13:44	hgbot	Note Added: 0088048
2016-06-28 13:44	hgbot	Fixed in SCM revision	http://code.openbravo.com/erp/pmods/org.openbravo.retail.posterminal/rev/3ee072d0683c7c34e6ee857385ea00b048aa36e5 [^] => http://code.openbravo.com/erp/pmods/org.openbravo.mobile.core/rev/700f2542b2df6e3a73df2200018edd36d0cb1aeb [^]
2016-06-29 15:11	hgbot	Checkin
2016-06-29 15:11	hgbot	Note Added: 0088083
2016-06-29 16:49	Sandrahuguet	Review Assigned To	=> marvintm
2016-06-30 09:31	marvintm	Status	resolved => closed

Relationships [ Relation Graph ] [ Dependency Graph ]