verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 55 Releases Wiki Activity

Merge branch 'dev' into test

This commit is contained in:
Vicente Falco 2017-11-28 09:34:21 +01:00
parent 687439b00b 65e58d6b7c
commit 37a27b2e69
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Jenkinsfile vendored
View File

@ -43,11 +43,13 @@ node
stage ("Stopping/Removing Docker") stage ("Stopping/Removing Docker")
{ {
env.TAG = "${env.BUILD_NUMBER}-1";
sh "docker-compose down --rmi 'all'" sh "docker-compose down --rmi 'all'"
} }
stage ("Generar dockers") stage ("Generar dockers")
{ {
env.TAG = "${env.BUILD_NUMBER}+1";
sh "docker-compose up -d --build" sh "docker-compose up -d --build"
} }
} }

9
client/production/src/production-table/production-table.js
View File

@ -13,6 +13,8 @@ export class ProductionTable {
}, },
model: [] model: []
}; };
this.filteredField = null;
this.filteredReverse = null;
} }
get checkAll() { get checkAll() {
return this._checkAll; return this._checkAll;
@ -21,7 +23,7 @@ export class ProductionTable {
this._checkAll = value; this._checkAll = value;
} }
set tickets(value) { set tickets(value) {
this._tickets = value; this._tickets = this.filteredField ? this.$filter('orderBy')(value, this.filteredField, this.filteredReverse) : value;
this.totalFilter = this._tickets.length; this.totalFilter = this._tickets.length;
this.pageTable.filter.page = 1; this.pageTable.filter.page = 1;
this.pageTickets(); this.pageTickets();
@ -30,8 +32,9 @@ export class ProductionTable {
return this._tickets; return this._tickets;
} }
onOrder(field, order) { onOrder(field, order) {
let reverse = order === 'DESC'; this.filteredField = field;
this.tickets = this.$filter('orderBy')(this.tickets, field, reverse); this.filteredReverse = order === 'DESC';
this.tickets = this.tickets; // call tickets setter
} }
pageTickets() { pageTickets() {
let init = (this.pageTable.filter.page - 1) * this.itemsDisplayedInList; let init = (this.pageTable.filter.page - 1) * this.itemsDisplayedInList;

2
services/mailer/application/config.js
View File

@ -9,7 +9,7 @@ try {
config = Object.assign(require(configPath), require(devConfigPath)); config = Object.assign(require(configPath), require(devConfigPath));
} catch (e) { } catch (e) {
if (e.code == 'MODULE_NOT_FOUND') if (e.code == 'MODULE_NOT_FOUND')
return require(configPath); config = require(configPath);
} }
config.proxy = require('../../nginx/config.json'); config.proxy = require('../../nginx/config.json');

2
services/print/application/config.js
View File

@ -9,7 +9,7 @@ try {
config = Object.assign(require(configPath), require(devConfigPath)); config = Object.assign(require(configPath), require(devConfigPath));
} catch (e) { } catch (e) {
if (e.code == 'MODULE_NOT_FOUND') if (e.code == 'MODULE_NOT_FOUND')
return require(configPath); config = require(configPath);
} }
config.proxy = require('../../nginx/config.json'); config.proxy = require('../../nginx/config.json');