diff --git a/client/core/src/multi-check/multi-check.js b/client/core/src/multi-check/multi-check.js
index 14e14760e..ba3f7b79f 100644
--- a/client/core/src/multi-check/multi-check.js
+++ b/client/core/src/multi-check/multi-check.js
@@ -74,6 +74,7 @@ module.component('vnMultiCheck', {
template: require('./multi-check.html'),
controller: MultiCheck,
bindings: {
+ checkAll: '=',
options: '<',
models: '=',
className: '@?'
diff --git a/client/production/src/index/index.html b/client/production/src/index/index.html
index dc1cd79e1..4026b67f2 100644
--- a/client/production/src/index/index.html
+++ b/client/production/src/index/index.html
@@ -35,6 +35,6 @@
-
+
\ No newline at end of file
diff --git a/client/production/src/index/index.js b/client/production/src/index/index.js
index 95eb8e650..fd3a7b5aa 100644
--- a/client/production/src/index/index.js
+++ b/client/production/src/index/index.js
@@ -10,6 +10,7 @@ export default class ProductionIndex {
this.filter = {};
this.tickets = [];
this.states = [];
+ this.checkAll = 0;
this.footer = {
total: null,
lines: null,
@@ -20,6 +21,12 @@ export default class ProductionIndex {
this.userProfile = aclConstant.userProfile;
this.filter.warehouseFk = this.userProfile.warehouseId;
}
+ get checkAll() {
+ return this._checkAll;
+ }
+ set checkAll(value) {
+ this._checkAll = value;
+ }
// Actions Callbacks
_changeState(ids, sateteId, stateName, index) {
@@ -80,6 +87,7 @@ export default class ProductionIndex {
page: 1,
limit: 700
});
+ this.checkAll = 0;
this.$http.get('/production/api/FakeProductions/list?filter=' + JSON.stringify(filters)).then(
json => {
this.tickets = json.data.tickets;
diff --git a/client/production/src/production-filters/production-filters.html b/client/production/src/production-filters/production-filters.html
index 037d6c885..587e03199 100644
--- a/client/production/src/production-filters/production-filters.html
+++ b/client/production/src/production-filters/production-filters.html
@@ -24,7 +24,9 @@
-
-
+
+
+
+
diff --git a/client/production/src/production-filters/production-filters.js b/client/production/src/production-filters/production-filters.js
index eb6a95ea4..0e6143efc 100644
--- a/client/production/src/production-filters/production-filters.js
+++ b/client/production/src/production-filters/production-filters.js
@@ -1,5 +1,4 @@
import ngModule from '../module';
-import './style.scss';
ngModule.component('vnProductionFilterPanel', {
template: require('./production-filters.html')
diff --git a/client/production/src/production-filters/style.scss b/client/production/src/production-filters/style.scss
deleted file mode 100644
index 17e5fc417..000000000
--- a/client/production/src/production-filters/style.scss
+++ /dev/null
@@ -1,9 +0,0 @@
-vn-production-filter-panel{
- .mdl-button--colored{
- color: #ffa410 !important;
- background-color: white !important;
- }
- .mdl-button--colored:hover{
- color: white !important;
- }
-}
\ No newline at end of file
diff --git a/client/production/src/production-table/production-table.html b/client/production/src/production-table/production-table.html
index d559bb16c..111b530c9 100644
--- a/client/production/src/production-table/production-table.html
+++ b/client/production/src/production-table/production-table.html
@@ -2,7 +2,7 @@
-
+
diff --git a/client/production/src/production-table/production-table.js b/client/production/src/production-table/production-table.js
index a8dc794fc..96ebf6c2e 100644
--- a/client/production/src/production-table/production-table.js
+++ b/client/production/src/production-table/production-table.js
@@ -5,6 +5,7 @@ export class ProductionTable {
this.$filter = $filter;
this._tickets = [];
this.itemsDisplayedInList = 14;
+ this._checkAll = 0;
this.pageTable = {
filter: {
page: 1,
@@ -13,6 +14,12 @@ export class ProductionTable {
model: []
};
}
+ get checkAll() {
+ return this._checkAll;
+ }
+ set checkAll(value) {
+ this._checkAll = value;
+ }
set tickets(value) {
this._tickets = value;
this.totalFilter = this._tickets.length;
@@ -40,7 +47,8 @@ ngModule.component('vnProductionTable', {
template: require('./production-table.html'),
bindings: {
tickets: '=',
- footer: '<'
+ footer: '<',
+ checkAll: '='
},
controller: ProductionTable
});