Merge branch 'dev' into test

Jenkinsfile

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

client/production/src/production-table/production-table.js

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

services/mailer/application/config.js

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

services/print/application/config.js

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