diff --git a/client/production/src/index/index.html b/client/production/src/index/index.html index ae0e88160..bc4488aa9 100644 --- a/client/production/src/index/index.html +++ b/client/production/src/index/index.html @@ -1,4 +1,4 @@ - + @@ -11,6 +11,7 @@ advanced="true" popover="vn-production-filter-panel" ignore-keys = "['page', 'size', 'search', 'warehouseFk']" + data ="$ctrl.sharedData" > @@ -30,7 +31,7 @@ - + diff --git a/client/production/src/index/index.js b/client/production/src/index/index.js index b926f5fa0..48aa3f9ae 100644 --- a/client/production/src/index/index.js +++ b/client/production/src/index/index.js @@ -8,7 +8,7 @@ export default class ProductionIndex { this.$http = $http; this.filter = {}; this.tickets = []; - this.states = []; + this.checkAll = 0; this.footer = { total: null, @@ -16,7 +16,12 @@ export default class ProductionIndex { meters: null }; this._search = null; - this.hourItems = []; + + this.sharedData = { + states: [], + hourItems: [] + }; + this.child = undefined; this.userProfile = aclConstant.userProfile; this.filter.warehouseFk = this.userProfile.warehouseId; @@ -89,7 +94,7 @@ export default class ProductionIndex { hour = [0, i].join(''); } hour += ':00'; - this.hourItems.push({id: i, name: hour}); + this.sharedData.hourItems.push({id: i, name: hour}); } this.filter.warehouseFk = this.$.displayValue = this.userProfile.warehouseId; } diff --git a/client/salix/src/components/searchbar/searchbar.js b/client/salix/src/components/searchbar/searchbar.js index 7c5c62515..06d572f33 100644 --- a/client/salix/src/components/searchbar/searchbar.js +++ b/client/salix/src/components/searchbar/searchbar.js @@ -69,7 +69,8 @@ export default class Controller { var childCtrl = angular.element(this.child).isolateScope().$ctrl; childCtrl.filter = Object.assign({}, this.index.filter); childCtrl.onSubmit = filter => this.onChildSubmit(filter); - + if (this.data) + childCtrl.data = Object.assign({}, this.data); event.preventDefault(); } onChildSubmit(filter) { @@ -112,7 +113,8 @@ ngModule.component('vnSearchbar', { advanced: '=', popover: '@', label: '@?', - ignoreKeys: '