bug de multi seleccion corregido, cambio estilos

This commit is contained in:
Dani Herrero 2017-07-06 14:21:55 +02:00
parent 5929b8be32
commit 142cc920de
8 changed files with 24 additions and 15 deletions

View File

@ -74,6 +74,7 @@ module.component('vnMultiCheck', {
template: require('./multi-check.html'),
controller: MultiCheck,
bindings: {
checkAll: '=',
options: '<',
models: '=',
className: '@?'

View File

@ -35,6 +35,6 @@
</vn-one>
<vn-two></vn-two>
</vn-horizontal>
<vn-production-table tickets="$ctrl.tickets" footer="$ctrl.footer"></vn-production-table>
<vn-production-table check-all="$ctrl.checkAll" tickets="$ctrl.tickets" footer="$ctrl.footer"></vn-production-table>
</vn-vertical>
</vn-card>

View File

@ -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;

View File

@ -24,7 +24,9 @@
<vn-autocomplete vn-one margin-medium-right field="$ctrl.filter.agencyFk" url="/production/api/Agencies" label="Agency"></vn-autocomplete>
</vn-horizontal>
<vn-horizontal margin-large-top>
<vn-submit vn-one label="Filter"></vn-submit>
<vn-button vn-none label="Cancel" ng-click="$ctrl.onCancel()"></vn-button>
<vn-one></vn-one>
<vn-none>
<vn-submit label="Filter"></vn-submit>
</vn-none>
</vn-horizontal>
</form>

View File

@ -1,5 +1,4 @@
import ngModule from '../module';
import './style.scss';
ngModule.component('vnProductionFilterPanel', {
template: require('./production-filters.html')

View File

@ -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;
}
}

View File

@ -2,7 +2,7 @@
<vn-grid-header on-order="$ctrl.onOrder(field, order)">
<vn-none min-none></vn-none>
<vn-colum-header vn-none min-none>
<vn-multi-check models="$ctrl.tickets" options="[{id:'all',name:'Todos'},{id:'any',name:'Ninguno'},{id:'problem',name:'Con incidencia'},{id:'no-problem',name:'Sin incidencia'}]"></vn-multi-check>
<vn-multi-check check-all="$ctrl.checkAll" models="$ctrl.tickets" options="[{id:'all',name:'Todos'},{id:'any',name:'Ninguno'},{id:'problem',name:'Con incidencia'},{id:'no-problem',name:'Sin incidencia'}]"></vn-multi-check>
</vn-colum-header>
<vn-colum-header vn-one pad-medium-h field="ticketFk" text="Ticket ID"></vn-colum-header>
<vn-colum-header vn-two pad-medium-h field="agency" text="Agency"></vn-colum-header>

View File

@ -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
});