diff --git a/Jenkinsfile b/Jenkinsfile index 4d414a780..555508a31 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,30 +1,30 @@ #!/usr/bin/env groovy -def branchName = "${env.BRANCH_NAME}"; +def branchName = env.BRANCH_NAME; // TODO: We are using latest tag until image rotation it's implemented -env.TAG = "latest" /* "${env.BUILD_NUMBER}" */; +env.TAG = 'latest' /* env.BUILD_NUMBER */; env.BRANCH_NAME = branchName; -env.salixUser="${env.salixUser}"; -env.salixPassword="${env.salixPassword}"; +env.salixUser = env.salixUser; +env.salixPassword = env.salixPassword; switch (branchName) { - case "test": - env.NODE_ENV = "test"; - env.salixHost = "${env.testSalixHost}"; - env.salixPort = "${env.testSalixPort}"; + case 'test': + env.NODE_ENV = 'test'; + env.salixHost = env.testSalixHost; + env.salixPort = env.testSalixPort; break; - case "master": - env.NODE_ENV = "production" - env.salixHost = "${env.productionSalixHost}"; - env.salixPort = "${env.productionSalixPort}"; - env.DOCKER_HOST = "tcp://vch1.verdnatura.es:2375"; + case 'master': + env.NODE_ENV = 'production' + env.salixHost = env.productionSalixHost; + env.salixPort = env.productionSalixPort; + env.DOCKER_HOST = 'tcp://vch1.verdnatura.es:2375'; break; } node { stage ('Print environment variables') { - echo "Branch ${branchName}, Build ${env.TAG}, salixHost ${env.salixHost}, NODE_ENV ${env.NODE_ENV} en docker Host ${env.DOCKER_HOST}" + echo "Branch ${branchName}, tag ${env.TAG}, environament ${env.NODE_ENV}" } stage ('Checkout') { checkout scm @@ -32,16 +32,16 @@ node { stage ('Install client Node dependencies') { sh "npm install" } - stage ("Removing old dockers") { - sh "docker-compose down --rmi 'all'" - } stage ('Build project') { sh "gulp build" } - stage ("Install services Node dependencies") { + stage ('Install services Node dependencies') { sh "cd ./services/loopback && npm install" } - stage ("Generating new dockers") { + stage ('Removing old dockers') { + sh "docker-compose down --rmi 'all'" + } + stage ('Generating new dockers') { sh "docker-compose up -d --build" } } diff --git a/client/client/src/credit-insurance-list/credit-insurance-list.html b/client/client/src/credit-insurance-list/credit-insurance-list.html index c2004d7cb..0c5ad8a17 100644 --- a/client/client/src/credit-insurance-list/credit-insurance-list.html +++ b/client/client/src/credit-insurance-list/credit-insurance-list.html @@ -12,7 +12,7 @@ + ng-repeat="insurance in index.model.instances track by insurance.id"> {{::insurance.credit}} {{::insurance.grade}} {{::insurance.created | date: 'dd/MM/yyyy'}} @@ -22,7 +22,8 @@ - + + diff --git a/client/client/src/credit-list/credit-list.html b/client/client/src/credit-list/credit-list.html index a67b47a4c..e1fdcf2b4 100644 --- a/client/client/src/credit-list/credit-list.html +++ b/client/client/src/credit-list/credit-list.html @@ -12,7 +12,7 @@ + ng-repeat="credit in index.model.instances track by credit.id"> {{::credit.amount | number:2}} € {{::credit.created | date:'dd/MM/yyyy HH:mm'}} {{::credit.worker.firstName}} {{::credit.worker.name}} @@ -22,7 +22,8 @@ - + + diff --git a/client/client/src/greuge-list/greuge-list.html b/client/client/src/greuge-list/greuge-list.html index 0029f61fe..e9b776ba6 100644 --- a/client/client/src/greuge-list/greuge-list.html +++ b/client/client/src/greuge-list/greuge-list.html @@ -14,7 +14,7 @@ + ng-repeat="greuge in index.model.instances track by $index"> {{::greuge.shipped | date:'dd/MM/yyyy HH:mm' }} {{::greuge.description}} {{::greuge.amount | number:2}} € @@ -30,7 +30,8 @@ - + + diff --git a/client/client/src/index/index.html b/client/client/src/index/index.html index eab3b0bb9..1dea34205 100644 --- a/client/client/src/index/index.html +++ b/client/client/src/index/index.html @@ -14,11 +14,12 @@ - + + diff --git a/client/client/src/index/index.js b/client/client/src/index/index.js index 6a3ce70b9..57a109c03 100644 --- a/client/client/src/index/index.js +++ b/client/client/src/index/index.js @@ -9,10 +9,11 @@ export default class Controller { } search(index) { - this.clients = []; + index.accept(); + /* this.clients = []; index.accept().then(res => { this.clients = res.instances; - }); + }); */ } openSummary(client) { diff --git a/client/client/src/invoices/invoices.html b/client/client/src/invoices/invoices.html index e6f26abbd..248e3f6cb 100644 --- a/client/client/src/invoices/invoices.html +++ b/client/client/src/invoices/invoices.html @@ -17,7 +17,7 @@ + ng-repeat="invoice in index.model.instances track by greuge.id"> {{::invoice.ref}} {{::invoice.issued | date:'dd/MM/yyyy' }} {{::invoice.dued | date:'dd/MM/yyyy' }} @@ -30,5 +30,6 @@ - + + \ No newline at end of file diff --git a/client/client/src/mandate/mandate.html b/client/client/src/mandate/mandate.html index 4a9dd7d68..429d8eb93 100644 --- a/client/client/src/mandate/mandate.html +++ b/client/client/src/mandate/mandate.html @@ -14,7 +14,7 @@ + ng-repeat="mandate in index.model.instances track by mandate.id"> {{::mandate.id}} {{::mandate.company.code}} {{::mandate.mandateType.name}} @@ -26,5 +26,6 @@ - + + \ No newline at end of file diff --git a/client/client/src/recovery-list/recovery-list.html b/client/client/src/recovery-list/recovery-list.html index b226fef25..31e6fc747 100644 --- a/client/client/src/recovery-list/recovery-list.html +++ b/client/client/src/recovery-list/recovery-list.html @@ -13,7 +13,7 @@ + ng-repeat="recovery in index.model.instances track by $index"> - + + diff --git a/client/item/src/history/history.html b/client/item/src/history/history.html index e6795c2ba..f6bdc9ae2 100644 --- a/client/item/src/history/history.html +++ b/client/item/src/history/history.html @@ -24,5 +24,6 @@ - + + diff --git a/client/item/src/list/list.html b/client/item/src/list/list.html index 492a08ef6..0879b5627 100644 --- a/client/item/src/list/list.html +++ b/client/item/src/list/list.html @@ -15,11 +15,12 @@ - + + diff --git a/client/item/src/list/list.js b/client/item/src/list/list.js index 9572477d2..a7ed9a6c0 100644 --- a/client/item/src/list/list.js +++ b/client/item/src/list/list.js @@ -14,10 +14,11 @@ class ItemList { } search(index) { - this.items = []; + index.accept(); + /* this.items = []; index.accept().then(res => { this.items = res.instances; - }); + }); */ } cloneItem(item) { diff --git a/client/ticket/src/component/component.html b/client/ticket/src/component/component.html index 06bbfd932..15aa71f43 100644 --- a/client/ticket/src/component/component.html +++ b/client/ticket/src/component/component.html @@ -65,6 +65,7 @@ - + + diff --git a/client/ticket/src/expedition/ticket-expedition.html b/client/ticket/src/expedition/ticket-expedition.html index e925535a5..cc4e3ebb4 100644 --- a/client/ticket/src/expedition/ticket-expedition.html +++ b/client/ticket/src/expedition/ticket-expedition.html @@ -17,7 +17,7 @@ + ng-repeat="expedition in index.model.instances track by expedition.id"> - + + diff --git a/client/ticket/src/list/ticket-list.html b/client/ticket/src/list/ticket-list.html index 7371d636e..405e4dfef 100644 --- a/client/ticket/src/list/ticket-list.html +++ b/client/ticket/src/list/ticket-list.html @@ -30,7 +30,7 @@ - @@ -62,7 +62,8 @@ - + + diff --git a/client/ticket/src/list/ticket-list.js b/client/ticket/src/list/ticket-list.js index 5f6297a09..d1aa2ac86 100644 --- a/client/ticket/src/list/ticket-list.js +++ b/client/ticket/src/list/ticket-list.js @@ -31,10 +31,11 @@ export default class Controller { } search(index) { - this.tickets = []; + index.accept(); + /* this.tickets = []; index.accept().then(res => { this.tickets = res.instances; - }); + }); */ } } diff --git a/client/ticket/src/sale-checked/sale-checked.html b/client/ticket/src/sale-checked/sale-checked.html index 66d3416f8..8337c22f1 100644 --- a/client/ticket/src/sale-checked/sale-checked.html +++ b/client/ticket/src/sale-checked/sale-checked.html @@ -13,7 +13,7 @@ - + - + + diff --git a/client/ticket/src/sale/sale.html b/client/ticket/src/sale/sale.html index 7894e19c4..245509ce8 100644 --- a/client/ticket/src/sale/sale.html +++ b/client/ticket/src/sale/sale.html @@ -61,7 +61,8 @@ - + + diff --git a/client/ticket/src/tracking/index.html b/client/ticket/src/tracking/index.html index 4d12238ef..0f7f4af2e 100644 --- a/client/ticket/src/tracking/index.html +++ b/client/ticket/src/tracking/index.html @@ -12,7 +12,7 @@ + ng-repeat="ticket in index.model.instances track by ticket.id"> {{::ticket.state.name}} {{::ticket.worker.firstName}} {{ticket.worker.name}} {{::ticket.created | date:'dd/MM/yyyy HH:mm'}} @@ -22,7 +22,8 @@ - + + diff --git a/client/ticket/src/volume/ticket-volume.html b/client/ticket/src/volume/ticket-volume.html index 2c47ca7cd..d562e6aa6 100644 --- a/client/ticket/src/volume/ticket-volume.html +++ b/client/ticket/src/volume/ticket-volume.html @@ -15,7 +15,7 @@ - + {{::sale.itemFk}} {{::sale.quantity}} @@ -30,5 +30,6 @@ - + +