diff --git a/client/item/src/filter-panel/filter-panel.html b/client/item/src/filter-panel/filter-panel.html new file mode 100644 index 000000000..607e7e7cc --- /dev/null +++ b/client/item/src/filter-panel/filter-panel.html @@ -0,0 +1,58 @@ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
diff --git a/client/item/src/filter-panel/filter-panel.js b/client/item/src/filter-panel/filter-panel.js new file mode 100644 index 000000000..608918b51 --- /dev/null +++ b/client/item/src/filter-panel/filter-panel.js @@ -0,0 +1,16 @@ +import ngModule from '../module'; + +class ItemFilterPanel { + constructor() { + this.onSubmit = () => {}; + } + + onSearch() { + this.onSubmit(this.filter); + } +} + +ngModule.component('vnItemFilterPanel', { + template: require('./filter-panel.html'), + controller: ItemFilterPanel +}); diff --git a/client/item/src/filter-panel/locale/es.json b/client/item/src/filter-panel/locale/es.json new file mode 100644 index 000000000..e7bc89814 --- /dev/null +++ b/client/item/src/filter-panel/locale/es.json @@ -0,0 +1,5 @@ +{ + "Ink": "Tinta", + "Origin": "Origen", + "Producer": "Productor" +} \ No newline at end of file diff --git a/client/item/src/item.js b/client/item/src/item.js index 9d5ca85e9..436f5a0ac 100644 --- a/client/item/src/item.js +++ b/client/item/src/item.js @@ -1,3 +1,4 @@ export * from './module'; import './list/list'; +import './filter-panel/filter-panel'; diff --git a/client/item/src/list/list.html b/client/item/src/list/list.html index c1996e46f..81f59b9ad 100644 --- a/client/item/src/list/list.html +++ b/client/item/src/list/list.html @@ -7,7 +7,7 @@ index="index" on-search="$ctrl.search(index)" advanced="true" - popover="vn-item-search-panel" + popover="vn-item-filter-panel" ignore-keys = "['page', 'size', 'search']" > diff --git a/services/item/common/methods/item/filter.js b/services/item/common/methods/item/filter.js index af21fb58b..683117b2d 100644 --- a/services/item/common/methods/item/filter.js +++ b/services/item/common/methods/item/filter.js @@ -15,6 +15,12 @@ module.exports = Self => { } }; + delete params.page; + delete params.size; + delete params.order; + + Object.assign(filter.where, params); + return filter; } }; diff --git a/services/item/common/models/ink.json b/services/item/common/models/ink.json index 52d6c22f8..5cb80693d 100644 --- a/services/item/common/models/ink.json +++ b/services/item/common/models/ink.json @@ -16,11 +16,6 @@ "name": { "type": "String" }, - "picture": { - "mysql": { - "dataType": "blob" - } - }, "showOrder": { "type": "number" }