diff --git a/src-db/database/sourcedata/AD_MESSAGE.xml b/src-db/database/sourcedata/AD_MESSAGE.xml
--- a/src-db/database/sourcedata/AD_MESSAGE.xml
+++ b/src-db/database/sourcedata/AD_MESSAGE.xml
@@ -36,6 +36,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -168,6 +180,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -288,6 +312,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -444,6 +480,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -540,6 +588,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -552,6 +612,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -600,6 +684,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -756,6 +852,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -780,6 +888,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/org/openbravo/mobile/core/MobileCoreComponentProvider.java b/src/org/openbravo/mobile/core/MobileCoreComponentProvider.java
--- a/src/org/openbravo/mobile/core/MobileCoreComponentProvider.java
+++ b/src/org/openbravo/mobile/core/MobileCoreComponentProvider.java
@@ -112,6 +112,7 @@
final ArrayList jsRetailDependency = new ArrayList();
jsRetailDependency.add("component/ob-retail-product-browser");
+ jsRetailDependency.add("component/ob-retail-filterbuilder");
jsRetailDependency.add("component/ob-retail-searchproducts");
jsRetailDependency.add("component/ob-retail-searchproductcharacteristic");
diff --git a/web/org.openbravo.mobile.core/assets/css/ob-standard.css b/web/org.openbravo.mobile.core/assets/css/ob-standard.css
--- a/web/org.openbravo.mobile.core/assets/css/ob-standard.css
+++ b/web/org.openbravo.mobile.core/assets/css/ob-standard.css
@@ -750,6 +750,9 @@
.btn-icon-search {
background-image: url('./../img/iconSearch.png');
}
+.btn-icon-add {
+ background-image: url('./../img/iconAdd.png');
+}
.btn-icon-clear {
background-image: url('./../img/iconClear.png');
}
diff --git a/web/org.openbravo.mobile.core/assets/img/iconAdd.png b/web/org.openbravo.mobile.core/assets/img/iconAdd.png
new file mode 100644
index 0000000000000000000000000000000000000000..7ccd97d6978b43658929e6d3e8d19a5824f73eb7
GIT binary patch
literal 1691
zc$@*724wk(P)NeSLjPV9&~9&8jrHJU@Ac$_sC#>gsAO50y&`BE_OrR4*j{%?tI4PsNF`13FOtxW27+?)g}TvxeS+^B*=
zjqe9ci&}f1BtLAd`GjJ|__UZCRn7JV1$r?}8I$mck*V3`=C@JQz#c`TQO6`uS=kE=
z#S{6sAfdavez&KET6>>RJBbSdG#aJ=$k{Y2suvNDr3yLN8vZ7eW5hl+_nvy0#uDDd
zQ^o|nRMSSxNQ+BXqar3wbPpcD{LyLIwGWEpq!~|5H2$}2cB9SkfT5
zA9Zpl3sFqSkzw#STj&JY-3~Tf(2k->9;>~1c8d$5C@!$;0wk>m*@x~*cke%;Snh7L
z=j4lcp4dkwHO+sX<`mrE)j<(Dn6$lVDU12Z8A}X-G+&S!X40?O1b7BOJWsbOd*5ZK>=?=0ua+lyJ{Lr$vP$8Q
znlUiq8At~LR(ci6k!(aedmp!bx~_7IJ7l{ZKi{I^_<&8gp}Lh4M%+!@4dPmPperXP
z$O99}5fQgjHst5A<<`=lCPl?Lx_oT10+U#mI0=}W15(BXskA*ugbWeXd9)j3jT(&@
zn)uTlbp??UifGPQVLZ0iAM>ep{BVMd)^{{2E0ZEq)vR4#`F;FEa60J9|yWQ&nDA
zsU99=Qf{F$X?@uvj>bGp{iDC6NkMj3`C5BWeDD$9{+e9gI|qG^{9opfQ>-9zpz3m@
za<@&2gJUR;cr}b;NtR0qFDqGK54t;^euHAQTE|PWWAYp0UW9halR;_`vnzfGdB{b7IP_7)R
z*jto00Mhd9q)iXT5`bnda!=7tRTdr!WCfPco?
zT#zuuylk%8MinJB5D^RH;vrA9%joyEJgfl6A(k_m2KCHT_N2}sG|OIs@MtVKHjR}j
zL*!xBD97s|O1-iF-*Cy&W~a{V?=slHOe<5sTFPWPXg>kG_raTe`1$5cD`X9 0) {
+ this.filter.conditions.forEach(function (cond) {
+ me.addFilterRow(cond.condition, cond.value);
+ });
+ } else if (this.filter.defaults && _.isArray(this.filter.defaults) && this.filter.defaults.length > 0) {
+ this.filter.defaults.forEach(function (cond) {
+ me.addFilterRow(cond.condition, cond.value);
+ });
+ } else {
+ this.addFilterRow('MORE_THAN', '');
+ }
+ this.$.body.$.customBuilder.hide();
+ this.$.body.$.standardBuilder.show();
+ this.$.body.$.standardBuilderConditions.setCollection(this.filterRows);
+ }
+ },
+ addFilterRow: function (condition, value) {
+ this.filterRows.add(new FilterBuilderRow({
+ id: OB.Dal.get_uuid(),
+ selected: true,
+ fieldType: this.sqlBuilder.fieldType,
+ condition: condition,
+ value: value
+ }));
+ },
+ i18nHeader: '',
+ body: {
+ components: [{
+ name: 'standardBuilder',
+ components: [{
+ kind: 'OB.UI.ScrollableTable',
+ name: 'standardBuilderConditions',
+ scrollAreaMaxHeight: '300px',
+ renderEmpty: 'OB.UI.RenderEmptyCh',
+ renderLine: 'OB.UI.ModalSearchFilterBuilderRow'
+ }, {
+ kind: 'Image',
+ src: '../org.openbravo.mobile.core/assets/img/iconAdd.png',
+ sizing: "cover",
+ width: 42,
+ height: 42,
+ tap: function () {
+ this.owner.owner.addFilterRow('MORE_THAN', '');
+ }
+ }]
+ }, {
+ name: 'customBuilder'
+ }]
+ },
+ initComponents: function () {
+ this.inherited(arguments);
+ this.$.closebutton.hide();
+ this.$.header.createComponent({
+ kind: 'OB.UI.ModalSearchFilterBuilderTopHeader',
+ style: 'border-bottom: 0px'
+ });
+ }
+});
\ No newline at end of file
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
@@ -1,10 +1,20 @@
/*
- ************************************************************************************
- * Copyright (C) 2012-2013 Openbravo S.L.U.
- * Licensed under the Openbravo Commercial License version 1.0
- * You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html
- * or in the legal folder of this module distribution.
- ************************************************************************************
+ *************************************************************************
+ * The contents of this file are subject to the Openbravo Public License
+ * Version 1.0 (the "License"), being the Mozilla Public License
+ * Version 1.1 with a permitted attribution clause; you may not use this
+ * file except in compliance with the License. You may obtain a copy of
+ * the License at http://www.openbravo.com/legal/license.html
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * The Original Code is Openbravo ERP.
+ * The Initial Developer of the Original Code is Openbravo SLU
+ * All portions are Copyright (C) 2012-2014 Openbravo SLU
+ * All Rights Reserved.
+ * Contributor(s): ______________________________________.
+ ************************************************************************
*/
/*global enyo, _ */
@@ -31,6 +41,149 @@
});
enyo.kind({
+ name: 'OB.UI.SearchProductCharacteristicFilterPanel',
+ style: 'display: table; margin-bottom: 3px; margin-right: 3px; border:2px solid #ccc; background-color: yellow',
+ events: {
+ onRemoveCustomFilter: ''
+ },
+ components: [{
+ name: 'infoPanel',
+ style: 'display: table-cell; width: 100%; padding-left: 0.5em; '
+ }, {
+ classes: 'btnlink-gray btn-icon-small btn-icon-clear',
+ style: 'display: table-cell; width: 30px; float: right;',
+ ontap: 'removeCustomFilter'
+ }],
+ removeCustomFilter: function () {
+ this.doRemoveCustomFilter({
+ index: this.index
+ });
+ },
+ initComponents: function () {
+ this.inherited(arguments);
+ if (this.customContent === null) {
+ this.$.infoPanel.setContent(this.caption + " ยป " + this.text);
+ } else {
+ this.$.infoPanel.createComponent(this.customContent);
+ }
+ }
+});
+
+enyo.kind({
+ name: 'OB.UI.SearchProductCharacteristicFilter',
+ published: {
+ type: 'PANEL',
+ caption: '',
+ text: null
+ },
+ events: {
+ onAddProduct: ''
+ },
+ conditions: null,
+
+ // List of default filters
+ defaults: [],
+
+ // Get component to filter render
+ renderInfo: function () {
+ return null;
+ // Example:
+ // return {
+ // kind: 'FilterExample',
+ // getFilterCondition: function () {
+ // return [{
+ // condition: 'EQUALS',
+ // value: 2
+ // }];
+ // }
+ // };
+ },
+
+ // Get SQL filter
+ sqlFilter: function () {
+ if (this.type === 'BUTTON' && this.conditions && _.isArray(this.conditions) && this.conditions.length > 0) {
+ // Standard behavior for filter with type BUTTON
+ var where = "",
+ filters = [],
+ sqlBuilderInfo = this.sqlBuilder();
+ this.conditions.forEach(function (cond) {
+ var condValue = cond.value;
+ if (where !== "") {
+ where = where + " and ";
+ }
+ where = where + sqlBuilderInfo.field;
+ if (cond.condition === 'MORE_THAN') {
+ where = where + " > ?";
+ }
+ if (cond.condition === 'LESS_THAN') {
+ where = where + " < ?";
+ }
+ if (cond.condition === 'EQUALS') {
+ where = where + " = ?";
+ }
+ if (cond.condition === 'NOT_EQUALS') {
+ where = where + " <> ?";
+ }
+ if (cond.condition === 'CONTAINS') {
+ where = where + " like ?";
+ condValue = "%" + cond.value + "%";
+ }
+ if (cond.condition === 'NOT_CONTAINS') {
+ where = where + " not like ?";
+ condValue = "%" + cond.value + "%";
+ }
+ filters.push(condValue);
+ });
+ return {
+ where: " and (" + where + ")",
+ filters: filters
+ };
+ } else {
+ // Default behavior
+ return {
+ where: null,
+ filters: []
+ };
+ }
+ },
+
+ // Get SQL Build logic
+ sqlBuilder: function () {
+ return {
+ field: '',
+ fieldType: '' // Number, String, Date
+ };
+ },
+
+ // Get extra attributes for order line
+ lineAttributes: function () {
+ return null;
+ },
+
+ // Function to post process filtered collection
+ //
+ // function (collection, callback);
+ // collection: Collection of filtered items
+ // callback: Callback function to be called when post processing finish
+ postProcess: null,
+
+ // Add attributes to show
+ addItemAttributes: function (item, attr) {
+ var filterAttr = item.get("filterAttr");
+ if (!filterAttr) {
+ item.set("filterAttr", []);
+ filterAttr = item.get("filterAttr");
+ }
+ filterAttr.push({
+ value: attr,
+ separator: this.attributesSeparator
+ });
+ },
+
+ attributesSeparator: ', '
+});
+
+enyo.kind({
name: 'OB.UI.SearchProductCharacteristicHeader',
kind: 'OB.UI.ScrollableTableHeader',
events: {
@@ -43,6 +196,9 @@
components: [{
style: 'padding: 10px 10px 5px 10px;',
components: [{
+ style: 'margin: 5px 0px 0px 0px; width: 100%',
+ name: 'filterpanel'
+ }, {
style: 'display: table; width: 100%;',
components: [{
style: 'display: table-cell; width: 100%;',
@@ -115,6 +271,11 @@
this.$.productcategory.setSelected(0);
this.$.filteringBy.setContent('');
this.parent.$.brandButton.removeClass('btnlink-yellow-bold');
+ var buttons = this.parent.$.filterButtons.getComponents();
+ buttons.forEach(function (btn) {
+ btn.removeClass('btnlink-yellow-bold');
+ });
+ this.parent.filterCustomClearConditions();
this.parent.model.set('filter', []);
this.parent.model.set('brandFilter', []);
this.parent.genericParent = null;
@@ -170,7 +331,9 @@
onSearchAction: 'searchAction',
onClearAction: 'clearAction',
onUpdateFilter: 'filterUpdate',
- onUpdateBrandFilter: 'brandFilterUpdate'
+ onUpdateBrandFilter: 'brandFilterUpdate',
+ onRemoveCustomFilter: 'removeCustomFilter',
+ onCustomFilterUpdate: 'customFilterUpdate'
},
events: {
onAddProduct: '',
@@ -178,6 +341,122 @@
onClearAction: '',
onTabChange: ''
},
+ // List of custom filters ('OB.UI.SearchProductCharacteristicFilter')
+ customFilters: [],
+ postProcessCustomFilters: [],
+ // Clear custom filters
+ filtersCustomClear: function () {
+ var i = 0;
+ while (i < this.customFilters.length) {
+ if (this.customFilters[i].type === 'PANEL') {
+ this.customFilters.splice(i, 1);
+ } else if (this.customFilters[i].type === 'BUTTON') {
+ this.customFilters[i].conditions = null;
+ this.filtersCustomCopyDefaults(this.customFilters[i]);
+ i++;
+ }
+ }
+ this.filtersCustomBuildPostProcess();
+ },
+ // Clear filter conditions
+ filterCustomClearConditions: function () {
+ this.customFilters.forEach(function (filter) {
+ if (filter.type === 'BUTTON') {
+ filter.conditions = [];
+ }
+ });
+ },
+ // Copy default filters conditions
+ filtersCustomCopyDefaults: function (filter) {
+ if (filter.defaults && _.isArray(filter.defaults) && filter.defaults.length > 0) {
+ filter.conditions = [];
+ filter.defaults.forEach(function (item) {
+ filter.conditions.push(item);
+ });
+ }
+ },
+ // Build post process filters
+ filtersCustomBuildPostProcess: function () {
+ var me = this;
+ this.postProcessCustomFilters = [];
+ this.customFilters.forEach(function (filter) {
+ if (filter.postProcess && typeof (filter.postProcess) === "function") {
+ me.postProcessCustomFilters.push(filter);
+ }
+ });
+ },
+ // Add a new custom filter
+ filtersCustomAdd: function (filter) {
+ this.customFilters.push(filter);
+ if (filter.postProcess && typeof (filter.postProcess) === "function") {
+ this.postProcessCustomFilters.push(filter);
+ }
+ },
+ // Render custom filters
+ filtersCustomRender: function () {
+ var index = 0,
+ me = this,
+ filtersPanels = this.$.searchProductCharacteristicHeader.$.filterpanel.getComponents(),
+ filtersButtons = this.$.filterButtons.getComponents();
+ // Remove visual components
+ filtersPanels.forEach(function (item) {
+ item.destroy();
+ });
+ filtersButtons.forEach(function (item) {
+ item.destroy();
+ });
+ // Insert visual component of filter
+ this.customFilters.forEach(function (filter) {
+ filter.index = index;
+ if (filter.type === 'PANEL') {
+ me.$.searchProductCharacteristicHeader.$.filterpanel.createComponent({
+ kind: 'OB.UI.SearchProductCharacteristicFilterPanel',
+ text: filter.getText(),
+ caption: filter.getCaption(),
+ index: index++,
+ customContent: filter.renderInfo()
+ });
+ }
+ if (filter.type === 'BUTTON') {
+ me.$.filterButtons.createComponent({
+ kind: 'OB.UI.SmallButton',
+ style: 'width: 86%; padding: 0px;',
+ classes: 'btnlink-white-simple',
+ content: filter.getText(),
+ index: index++,
+ customContent: filter.renderInfo(),
+ filter: filter,
+ events: {
+ onShowPopup: ''
+ },
+ tap: function () {
+ this.bubble('onShowPopup', {
+ popup: 'modalsearchfilterbuilder',
+ args: {
+ filter: this.filter
+ }
+ });
+ }
+ });
+ }
+ });
+ this.$.searchProductCharacteristicHeader.$.filterpanel.render();
+ this.$.filterButtons.render();
+ },
+ // Process remove filter event
+ removeCustomFilter: function (inSender, inEvent) {
+ this.customFilters.splice(inEvent.index, 1);
+ this.filtersCustomBuildPostProcess();
+ this.filtersCustomRender();
+ this.doSearchAction({
+ productCat: this.$.searchProductCharacteristicHeader.$.productcategory.getValue(),
+ productName: this.$.searchProductCharacteristicHeader.$.productname.getValue(),
+ filter: this.model.get('filter'),
+ skipProduct: false,
+ skipProductCharacteristic: false
+ });
+ },
+
filterUpdate: function (inSender, inEvent) {
var i, j, valuesIds, index, chValue = inEvent.value.value;
valuesIds = this.model.get('filter').map(function (e) {
@@ -257,6 +536,28 @@
});
return true;
},
+ customFilterUpdate: function (inSender, inEvent) {
+ if (inEvent.filter && inEvent.filter.index !== undefined) {
+ var buttons = this.$.filterButtons.getComponents();
+ buttons.forEach(function (btn) {
+ if (btn.index === inEvent.filter.index) {
+ if (inEvent.filter.conditions && _.isArray(inEvent.filter.conditions) && inEvent.filter.conditions.length > 0) {
+ btn.addClass('btnlink-yellow-bold');
+ } else {
+ btn.removeClass('btnlink-yellow-bold');
+ }
+ }
+ });
+ }
+ this.doSearchAction({
+ productCat: this.$.searchProductCharacteristicHeader.$.productcategory.getValue(),
+ productName: this.$.searchProductCharacteristicHeader.$.productname.getValue(),
+ filter: this.model.get('filter'),
+ skipProduct: false,
+ skipProductCharacteristic: false
+ });
+ return true;
+ },
filteringBy: function () {
var filteringBy = OB.I18N.getLabel('OBMOBC_FilteringBy'),
selectedItems, i;
@@ -290,6 +591,7 @@
this.$.searchProductCharacteristicHeader.$.filteringBy.setContent(filteringBy);
},
executeOnShow: function (model) {
+ this.filtersCustomRender();
var me = this,
criteria = {};
this.doClearAction();
@@ -298,7 +600,8 @@
productCat: this.$.searchProductCharacteristicHeader.$.productcategory.getValue(),
productName: this.$.searchProductCharacteristicHeader.$.productname.getValue(),
filter: this.model.get('filter'),
- skipProduct: !this.genericParent,
+ skipProduct: true,
+ //!this.genericParent,
skipProductCharacteristic: false
});
this.filteringBy();
@@ -320,6 +623,9 @@
kind: 'OB.UI.BrandButton',
name: 'brandButton'
}, {
+ name: 'filterButtons',
+ classes: 'row-fluid'
+ }, {
kind: 'OB.UI.ScrollableTable',
name: 'productsCh',
scrollAreaMaxHeight: '415px',
@@ -378,8 +684,26 @@
this.products.on('click', function (model) {
if (!model.get('isGeneric')) {
+ // Include filters line attributes
+ var attrs = {};
+ this.customFilters.forEach(function (filter) {
+ var filterAttr = filter.lineAttributes();
+ if (filterAttr) {
+ _.each(_.keys(filterAttr), function (key) {
+ attrs[key] = filterAttr[key];
+ });
+ }
+ });
+ // Add product to order
me.doAddProduct({
- product: model
+ product: model,
+ attrs: _.keys(attrs).length === 0 ? undefined : attrs
+ });
+ // Notify to filters
+ this.customFilters.forEach(function (filter) {
+ filter.doAddProduct({
+ product: model
+ });
});
} else {
me.doTabChange({
@@ -432,7 +756,7 @@
// Initializing combo of categories without filtering
- function successCallbackProducts(dataProducts) {
+ function showProducts(dataProducts) {
if (dataProducts && dataProducts.length > 0) {
me.products.reset(dataProducts.models);
me.products.trigger('reset');
@@ -442,6 +766,20 @@
}
}
+ function postProccessFilters(index, dataProducts) {
+ if (index < me.postProcessCustomFilters.length) {
+ me.postProcessCustomFilters[index].postProcess(dataProducts, function () {
+ postProccessFilters(++index, dataProducts);
+ });
+ } else {
+ showProducts(dataProducts);
+ }
+ }
+
+ function successCallbackProducts(dataProducts) {
+ postProccessFilters(0, dataProducts);
+ }
+
function successCallbackProductCh(dataProductCh, me) {
if (dataProductCh && dataProductCh.length > 0) {
for (i = 0; i < dataProductCh.length; i++) {
@@ -491,7 +829,24 @@
filterWhereClause = filterWhereClause + ' and product.brand in (' + brandString + ')';
}
if (!inEvent.skipProduct) {
- OB.Dal.query(OB.Model.Product, 'select * from m_product as product' + this.whereClause + filterWhereClause, this.params, successCallbackProducts, errorCallback, this);
+ // Add custom parameters
+ var customParams = [];
+ this.params.forEach(function (param) {
+ customParams.push(param);
+ });
+ // Add custom filters
+ this.customFilters.forEach(function (filter) {
+ var sqlFilter = filter.sqlFilter();
+ if (sqlFilter && sqlFilter.where) {
+ filterWhereClause = filterWhereClause + sqlFilter.where;
+ if (sqlFilter.filters && sqlFilter.filters.length > 0) {
+ sqlFilter.filters.forEach(function (item) {
+ customParams.push(item);
+ });
+ }
+ }
+ });
+ OB.Dal.query(OB.Model.Product, 'select * from m_product as product' + this.whereClause + filterWhereClause, customParams, successCallbackProducts, errorCallback, this);
}
if (!inEvent.skipProductCharacteristic) {
if (this.model.get('filter').length > 0) {