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

Merge branch 'dev' of https://git.verdnatura.es/salix into dev

This commit is contained in:
gerard 2018-05-11 09:04:09 +02:00
parent 19223a6013 bd069a1f39
commit b0d5e2958e
20 changed files with 73 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
Jenkinsfile vendored
View File

@ -1,30 +1,30 @@
#!/usr/bin/env groovy #!/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 // 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.BRANCH_NAME = branchName;
env.salixUser="${env.salixUser}"; env.salixUser = env.salixUser;
env.salixPassword="${env.salixPassword}"; env.salixPassword = env.salixPassword;
switch (branchName) { switch (branchName) {
case "test": case 'test':
env.NODE_ENV = "test"; env.NODE_ENV = 'test';
env.salixHost = "${env.testSalixHost}"; env.salixHost = env.testSalixHost;
env.salixPort = "${env.testSalixPort}"; env.salixPort = env.testSalixPort;
break; break;
case "master": case 'master':
env.NODE_ENV = "production" env.NODE_ENV = 'production'
env.salixHost = "${env.productionSalixHost}"; env.salixHost = env.productionSalixHost;
env.salixPort = "${env.productionSalixPort}"; env.salixPort = env.productionSalixPort;
env.DOCKER_HOST = "tcp://vch1.verdnatura.es:2375"; env.DOCKER_HOST = 'tcp://vch1.verdnatura.es:2375';
break; break;
} }
node { node {
stage ('Print environment variables') { 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') { stage ('Checkout') {
checkout scm checkout scm
@ -32,16 +32,16 @@ node {
stage ('Install client Node dependencies') { stage ('Install client Node dependencies') {
sh "npm install" sh "npm install"
} }
stage ("Removing old dockers") {
sh "docker-compose down --rmi 'all'"
}
stage ('Build project') { stage ('Build project') {
sh "gulp build" sh "gulp build"
} }
stage ("Install services Node dependencies") { stage ('Install services Node dependencies') {
sh "cd ./services/loopback && npm install" 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" sh "docker-compose up -d --build"
} }
} }

5
client/client/src/credit-insurance-list/credit-insurance-list.html
View File

@ -12,7 +12,7 @@
<vn-horizontal <vn-horizontal
vn-one class="list list-element text-center" vn-one class="list list-element text-center"
pad-small-bottom pad-small-bottom
ng-repeat="insurance in $ctrl.instances track by insurance.id"> ng-repeat="insurance in index.model.instances track by insurance.id">
<vn-one pad-medium-h>{{::insurance.credit}}</vn-one> <vn-one pad-medium-h>{{::insurance.credit}}</vn-one>
<vn-one pad-medium-h>{{::insurance.grade}}</vn-one> <vn-one pad-medium-h>{{::insurance.grade}}</vn-one>
<vn-two pad-medium-h>{{::insurance.created | date: 'dd/MM/yyyy'}}</vn-two> <vn-two pad-medium-h>{{::insurance.created | date: 'dd/MM/yyyy'}}</vn-two>
@ -22,7 +22,8 @@
<vn-horizontal vn-one class="list list-footer"></vn-horizontal> <vn-horizontal vn-one class="list list-footer"></vn-horizontal>
</vn-vertical> </vn-vertical>
</vn-card> </vn-card>
<vn-auto-paging vn-one margin-large-top index="index" total="index.model.count" items="$ctrl.instances"></vn-auto-paging> <vn-paging vn-one margin-large-top index="index" total="index.model.count"></vn-paging>
<!-- <vn-auto-paging vn-one margin-large-top index="index" total="index.model.count" items="$ctrl.instances"></vn-auto-paging> -->
</vn-vertical> </vn-vertical>
<a ui-sref="clientCard.creditInsurance.create({classificationId: {{index.params.classificationId}}})" <a ui-sref="clientCard.creditInsurance.create({classificationId: {{index.params.classificationId}}})"
fixed-bottom-right vn-tooltip="New classification" vn-bind="+" tooltip-position="left" ng-if="!$ctrl.isClosed"> fixed-bottom-right vn-tooltip="New classification" vn-bind="+" tooltip-position="left" ng-if="!$ctrl.isClosed">

5
client/client/src/credit-list/credit-list.html
View File

@ -12,7 +12,7 @@
<vn-horizontal <vn-horizontal
vn-one class="list list-element text-center" vn-one class="list list-element text-center"
pad-small-bottom pad-small-bottom
ng-repeat="credit in $ctrl.instances track by credit.id"> ng-repeat="credit in index.model.instances track by credit.id">
<vn-one pad-medium-h>{{::credit.amount | number:2}} €</vn-one> <vn-one pad-medium-h>{{::credit.amount | number:2}} €</vn-one>
<vn-two pad-medium-h>{{::credit.created | date:'dd/MM/yyyy HH:mm'}}</vn-two> <vn-two pad-medium-h>{{::credit.created | date:'dd/MM/yyyy HH:mm'}}</vn-two>
<vn-two pad-medium-h>{{::credit.worker.firstName}} {{::credit.worker.name}}</vn-two> <vn-two pad-medium-h>{{::credit.worker.firstName}} {{::credit.worker.name}}</vn-two>
@ -22,7 +22,8 @@
<vn-horizontal vn-one class="list list-footer"></vn-horizontal> <vn-horizontal vn-one class="list list-footer"></vn-horizontal>
</vn-vertical> </vn-vertical>
</vn-card> </vn-card>
<vn-auto-paging vn-one margin-large-top index="index" total="index.model.count" items="$ctrl.instances"></vn-auto-paging> <vn-paging vn-one margin-large-top index="index" total="index.model.count"></vn-paging>
<!-- <vn-auto-paging vn-one margin-large-top index="index" total="index.model.count" items="$ctrl.instances"></vn-auto-paging> -->
</vn-vertical> </vn-vertical>
<a ui-sref="clientCard.credit.create" vn-bind="+" fixed-bottom-right> <a ui-sref="clientCard.credit.create" vn-bind="+" fixed-bottom-right>
<vn-float-button icon="add"></vn-float-button> <vn-float-button icon="add"></vn-float-button>

5
client/client/src/greuge-list/greuge-list.html
View File

@ -14,7 +14,7 @@
<vn-horizontal <vn-horizontal
class="list list-element text-center" class="list list-element text-center"
pad-small-bottom pad-small-bottom
ng-repeat="greuge in $ctrl.instances track by $index"> ng-repeat="greuge in index.model.instances track by $index">
<vn-one pad-medium-h>{{::greuge.shipped | date:'dd/MM/yyyy HH:mm' }}</vn-one> <vn-one pad-medium-h>{{::greuge.shipped | date:'dd/MM/yyyy HH:mm' }}</vn-one>
<vn-two pad-medium-h>{{::greuge.description}}</vn-two> <vn-two pad-medium-h>{{::greuge.description}}</vn-two>
<vn-one pad-medium-h>{{::greuge.amount | number:2}} €</vn-one> <vn-one pad-medium-h>{{::greuge.amount | number:2}} €</vn-one>
@ -30,7 +30,8 @@
</vn-horizontal> </vn-horizontal>
</vn-vertical> </vn-vertical>
</vn-card> </vn-card>
<vn-auto-paging margin-large-top vn-one index="index" total="index.model.count" items="$ctrl.instances"></vn-auto-paging> <vn-paging margin-large-top vn-one index="index" total="index.model.count"></vn-paging>
<!-- <vn-auto-paging margin-large-top vn-one index="index" total="index.model.count" items="$ctrl.instances"></vn-auto-paging> -->
</vn-vertical> </vn-vertical>
<a ui-sref="clientCard.greuge.create" vn-bind="+" fixed-bottom-right> <a ui-sref="clientCard.greuge.create" vn-bind="+" fixed-bottom-right>
<vn-float-button icon="add"></vn-float-button> <vn-float-button icon="add"></vn-float-button>

5
client/client/src/index/index.html
View File

@ -14,11 +14,12 @@
</vn-card> </vn-card>
<vn-card margin-medium-top> <vn-card margin-medium-top>
<vn-item-client <vn-item-client
ng-repeat="client in $ctrl.clients" ng-repeat="client in index.model.instances track by client.id"
client="client"> client="client">
</vn-item-client> </vn-item-client>
</vn-card> </vn-card>
<vn-auto-paging index="index" total="index.model.count" items="$ctrl.clients"></vn-auto-paging> <vn-paging index="index" total="index.model.count"></vn-paging>
<!-- <vn-auto-paging index="index" total="index.model.count" items="$ctrl.clients"></vn-auto-paging> -->
</div> </div>
</div> </div>
<a ui-sref="create" vn-bind="+" fixed-bottom-right> <a ui-sref="create" vn-bind="+" fixed-bottom-right>

5
client/client/src/index/index.js
View File

@ -9,10 +9,11 @@ export default class Controller {
} }
search(index) { search(index) {
this.clients = []; index.accept();
/* this.clients = [];
index.accept().then(res => { index.accept().then(res => {
this.clients = res.instances; this.clients = res.instances;
}); }); */
} }
openSummary(client) { openSummary(client) {

5
client/client/src/invoices/invoices.html
View File

@ -17,7 +17,7 @@
<vn-horizontal <vn-horizontal
class="list list-element" class="list list-element"
pad-small-bottom pad-small-bottom
ng-repeat="invoice in $ctrl.instances track by greuge.id"> ng-repeat="invoice in index.model.instances track by greuge.id">
<vn-one>{{::invoice.ref}}</vn-one> <vn-one>{{::invoice.ref}}</vn-one>
<vn-one>{{::invoice.issued | date:'dd/MM/yyyy' }}</vn-one> <vn-one>{{::invoice.issued | date:'dd/MM/yyyy' }}</vn-one>
<vn-one>{{::invoice.dued | date:'dd/MM/yyyy' }}</vn-one> <vn-one>{{::invoice.dued | date:'dd/MM/yyyy' }}</vn-one>
@ -30,5 +30,6 @@
</vn-vertical> </vn-vertical>
</vn-vertical> </vn-vertical>
</vn-card> </vn-card>
<vn-auto-paging margin-large-top vn-one index="index" total="index.model.count" items="$ctrl.instances"></vn-auto-paging> <vn-paging margin-large-top vn-one index="index" total="index.model.count"></vn-paging>
<!-- <vn-auto-paging margin-large-top vn-one index="index" total="index.model.count" items="$ctrl.instances"></vn-auto-paging> -->
</vn-vertical> </vn-vertical>

5
client/client/src/mandate/mandate.html
View File

@ -14,7 +14,7 @@
<vn-horizontal <vn-horizontal
vn-one class="list list-element text-center" vn-one class="list list-element text-center"
pad-small-bottom pad-small-bottom
ng-repeat="mandate in $ctrl.instances track by mandate.id"> ng-repeat="mandate in index.model.instances track by mandate.id">
<vn-one pad-medium-h>{{::mandate.id}}</vn-one> <vn-one pad-medium-h>{{::mandate.id}}</vn-one>
<vn-one pad-medium-h>{{::mandate.company.code}}</vn-one> <vn-one pad-medium-h>{{::mandate.company.code}}</vn-one>
<vn-one pad-medium-h>{{::mandate.mandateType.name}}</vn-one> <vn-one pad-medium-h>{{::mandate.mandateType.name}}</vn-one>
@ -26,5 +26,6 @@
<vn-horizontal vn-one class="list list-footer"></vn-horizontal> <vn-horizontal vn-one class="list list-footer"></vn-horizontal>
</vn-vertical> </vn-vertical>
</vn-card> </vn-card>
<vn-auto-paging vn-one margin-large-top index="index" total="index.model.count" items="$ctrl.instances"></vn-auto-paging> <vn-paging vn-one margin-large-top index="index" total="index.model.count"></vn-paging>
<!-- <vn-auto-paging vn-one margin-large-top index="index" total="index.model.count" items="$ctrl.instances"></vn-auto-paging> -->
</vn-vertical> </vn-vertical>

5
client/client/src/recovery-list/recovery-list.html
View File

@ -13,7 +13,7 @@
<vn-horizontal <vn-horizontal
vn-one class="list list-element text-center" vn-one class="list list-element text-center"
pad-small-bottom pad-small-bottom
ng-repeat="recovery in $ctrl.instances track by $index"> ng-repeat="recovery in index.model.instances track by $index">
<vn-none pad-medium-h style="color:#FFA410;"> <vn-none pad-medium-h style="color:#FFA410;">
<i class="material-icons pointer" <i class="material-icons pointer"
vn-tooltip="Finish that recovery period" vn-tooltip="Finish that recovery period"
@ -30,7 +30,8 @@
<vn-horizontal vn-one class="list list-footer"></vn-horizontal> <vn-horizontal vn-one class="list list-footer"></vn-horizontal>
</vn-vertical> </vn-vertical>
</vn-card> </vn-card>
<vn-auto-paging vn-one margin-large-top index="index" total="index.model.count" items="$ctrl.instances"></vn-auto-paging> <vn-paging vn-one margin-large-top index="index" total="index.model.count"></vn-paging>
<!-- <vn-auto-paging vn-one margin-large-top index="index" total="index.model.count" items="$ctrl.instances"></vn-auto-paging> -->
</vn-vertical> </vn-vertical>
<a ui-sref="clientCard.recovery.create" vn-bind="+" fixed-bottom-right> <a ui-sref="clientCard.recovery.create" vn-bind="+" fixed-bottom-right>
<vn-float-button icon="add"></vn-float-button> <vn-float-button icon="add"></vn-float-button>

3
client/item/src/history/history.html
View File

@ -24,5 +24,6 @@
<vn-horizontal vn-one class="list list-footer text-center"></vn-horizontal> <vn-horizontal vn-one class="list list-footer text-center"></vn-horizontal>
</vn-vertical> </vn-vertical>
</vn-card> </vn-card>
<vn-auto-paging vn-one margin-large-top index="index" total="index.model.count" items="$ctrl.instances"></vn-auto-paging> <vn-paging vn-one margin-large-top index="index" total="index.model.count"></vn-paging>
<!-- <vn-auto-paging vn-one margin-large-top index="index" total="index.model.count" items="$ctrl.instances"></vn-auto-paging> -->
</vn-vertical> </vn-vertical>

5
client/item/src/list/list.html
View File

@ -15,11 +15,12 @@
</vn-card> </vn-card>
<vn-card margin-medium-top> <vn-card margin-medium-top>
<vn-item-product <vn-item-product
ng-repeat="item in $ctrl.items track by $index" ng-repeat="item in index.model.instances track by item.id"
item="item"> item="item">
</vn-item-product> </vn-item-product>
</vn-card> </vn-card>
<vn-auto-paging index="index" total="index.model.count" items="$ctrl.items"></vn-auto-paging> <vn-paging index="index" total="index.model.count"></vn-paging>
<!-- <vn-auto-paging index="index" total="index.model.count" items="$ctrl.items"></vn-auto-paging> -->
</div> </div>
</div> </div>
<a ui-sref="item.create" vn-bind="+" fixed-bottom-right> <a ui-sref="item.create" vn-bind="+" fixed-bottom-right>

5
client/item/src/list/list.js
View File

@ -14,10 +14,11 @@ class ItemList {
} }
search(index) { search(index) {
this.items = []; index.accept();
/* this.items = [];
index.accept().then(res => { index.accept().then(res => {
this.items = res.instances; this.items = res.instances;
}); }); */
} }
cloneItem(item) { cloneItem(item) {

3
client/ticket/src/component/component.html
View File

@ -65,6 +65,7 @@
</tbody> </tbody>
</table> </table>
</vn-vertical> </vn-vertical>
<vn-auto-paging vn-one margin-large-top index="index" total="index.model.count" items="$ctrl.instances"></vn-auto-paging> <vn-paging vn-one margin-large-top index="index" total="index.model.count"></vn-paging>
<!-- <vn-auto-paging vn-one margin-large-top index="index" total="index.model.count" items="$ctrl.instances"></vn-auto-paging> -->
</vn-card> </vn-card>
</vn-vertical> </vn-vertical>

5
client/ticket/src/expedition/ticket-expedition.html
View File

@ -17,7 +17,7 @@
<vn-horizontal <vn-horizontal
vn-one class="list list-element text-center" vn-one class="list list-element text-center"
pad-small-bottom pad-small-bottom
ng-repeat="expedition in $ctrl.instances track by expedition.id"> ng-repeat="expedition in index.model.instances track by expedition.id">
<vn-one pad-medium-h style="color:#FFA410;"> <vn-one pad-medium-h style="color:#FFA410;">
<i <i
pointer pointer
@ -38,5 +38,6 @@
<vn-horizontal vn-one class="list list-footer"></vn-horizontal> <vn-horizontal vn-one class="list list-footer"></vn-horizontal>
</vn-vertical> </vn-vertical>
</vn-card> </vn-card>
<vn-auto-paging vn-one margin-large-top index="index" total="index.model.count" items="$ctrl.instances"></vn-auto-paging> <vn-paging vn-one margin-large-top index="index" total="index.model.count"></vn-paging>
<!-- <vn-auto-paging vn-one margin-large-top index="index" total="index.model.count" items="$ctrl.instances"></vn-auto-paging> -->
</vn-vertical> </vn-vertical>

5
client/ticket/src/list/ticket-list.html
View File

@ -30,7 +30,7 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr ng-repeat="ticket in $ctrl.tickets track by ticket.id" <tr ng-repeat="ticket in index.model.instances track by ticket.id"
class="{{::$ctrl.compareDate(ticket.shipped)}} clickable" class="{{::$ctrl.compareDate(ticket.shipped)}} clickable"
ui-sref="ticket.card.summary({id: {{::ticket.id}}})"> ui-sref="ticket.card.summary({id: {{::ticket.id}}})">
<td> <td>
@ -62,7 +62,8 @@
</table> </table>
</vn-horizontal> </vn-horizontal>
</vn-card> </vn-card>
<vn-auto-paging vn-one index="index" total="index.model.count" items="$ctrl.tickets"></vn-auto-paging> <vn-paging vn-one index="index" total="index.model.count"></vn-paging>
<!-- <vn-auto-paging vn-one index="index" total="index.model.count" items="$ctrl.tickets"></vn-auto-paging> -->
</div> </div>
</div> </div>
<a ui-sref="ticket.create" vn-bind="+" fixed-bottom-right> <a ui-sref="ticket.create" vn-bind="+" fixed-bottom-right>

5
client/ticket/src/list/ticket-list.js
View File

@ -31,10 +31,11 @@ export default class Controller {
} }
search(index) { search(index) {
this.tickets = []; index.accept();
/* this.tickets = [];
index.accept().then(res => { index.accept().then(res => {
this.tickets = res.instances; this.tickets = res.instances;
}); }); */
} }
} }

5
client/ticket/src/sale-checked/sale-checked.html
View File

@ -13,7 +13,7 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr ng-repeat="sale in $ctrl.instances track by sale.id"> <tr ng-repeat="sale in index.model.instances track by sale.id">
<td style="text-align:center!important"> <td style="text-align:center!important">
<vn-check style="text-align:center!important" <vn-check style="text-align:center!important"
vn-one field="sale.isChecked.isChecked" vn-one field="sale.isChecked.isChecked"
@ -31,5 +31,6 @@
</table> </table>
</vn-vertical> </vn-vertical>
</vn-card> </vn-card>
<vn-auto-paging vn-one margin-large-top index="index" total="index.model.count" items="$ctrl.instances"></vn-auto-paging> <vn-paging vn-one margin-large-top index="index" total="index.model.count"></vn-paging>
<!-- <vn-auto-paging vn-one margin-large-top index="index" total="index.model.count" items="$ctrl.instances"></vn-auto-paging> -->
</vn-vertical> </vn-vertical>

3
client/ticket/src/sale/sale.html
View File

@ -61,7 +61,8 @@
</table> </table>
</vn-vertical> </vn-vertical>
</vn-card> </vn-card>
<vn-auto-paging vn-one margin-large-top index="index" total="index.model.count" items="index.model.instances"></vn-auto-paging> <vn-paging vn-one margin-large-top index="index" total="index.model.count"></vn-paging>
<!-- <vn-auto-paging vn-one margin-large-top index="index" total="index.model.count" items="index.model.instances"></vn-auto-paging> -->
<vn-item-descriptor-popover vn-id="descriptor"> <vn-item-descriptor-popover vn-id="descriptor">
</vn-item-descriptor-popover> </vn-item-descriptor-popover>
</vn-popover> </vn-popover>

5
client/ticket/src/tracking/index.html
View File

@ -12,7 +12,7 @@
<vn-horizontal <vn-horizontal
vn-one class="list list-element text-center" vn-one class="list list-element text-center"
pad-small-bottom pad-small-bottom
ng-repeat="ticket in $ctrl.instances track by ticket.id"> ng-repeat="ticket in index.model.instances track by ticket.id">
<vn-one pad-medium-h>{{::ticket.state.name}}</vn-one> <vn-one pad-medium-h>{{::ticket.state.name}}</vn-one>
<vn-two pad-medium-h>{{::ticket.worker.firstName}} {{ticket.worker.name}}</vn-two> <vn-two pad-medium-h>{{::ticket.worker.firstName}} {{ticket.worker.name}}</vn-two>
<vn-two pad-medium-h>{{::ticket.created | date:'dd/MM/yyyy HH:mm'}}</vn-two> <vn-two pad-medium-h>{{::ticket.created | date:'dd/MM/yyyy HH:mm'}}</vn-two>
@ -22,7 +22,8 @@
<vn-horizontal vn-one class="list list-footer"></vn-horizontal> <vn-horizontal vn-one class="list list-footer"></vn-horizontal>
</vn-vertical> </vn-vertical>
</vn-card> </vn-card>
<vn-auto-paging vn-one margin-large-top index="index" total="index.model.count" items="$ctrl.instances"></vn-auto-paging> <vn-paging vn-one margin-large-top index="index" total="index.model.count"></vn-paging>
<!-- <vn-auto-paging vn-one margin-large-top index="index" total="index.model.count" items="$ctrl.instances"></vn-auto-paging> -->
</vn-vertical> </vn-vertical>
<a ui-sref="ticket.card.tracking.edit" vn-bind="+" fixed-bottom-right> <a ui-sref="ticket.card.tracking.edit" vn-bind="+" fixed-bottom-right>
<vn-float-button icon="add"></vn-float-button> <vn-float-button icon="add"></vn-float-button>

5
client/ticket/src/volume/ticket-volume.html
View File

@ -15,7 +15,7 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr ng-repeat="sale in $ctrl.instances track by sale.id" class="list list-element"> <tr ng-repeat="sale in index.model.instances track by sale.id" class="list list-element">
<td number>{{::sale.itemFk}}</td> <td number>{{::sale.itemFk}}</td>
<td><vn-fetched-tags sale="sale"/></td> <td><vn-fetched-tags sale="sale"/></td>
<td number>{{::sale.quantity}}</td> <td number>{{::sale.quantity}}</td>
@ -30,5 +30,6 @@
</table> </table>
</vn-vertical> </vn-vertical>
</vn-card> </vn-card>
<vn-auto-paging vn-one margin-large-top index="index" total="index.model.count" items="$ctrl.instances"></vn-auto-paging> <vn-paging vn-one margin-large-top index="index" total="index.model.count"></vn-paging>
<!-- <vn-auto-paging vn-one margin-large-top index="index" total="index.model.count" items="$ctrl.instances"></vn-auto-paging> -->
</vn-vertical> </vn-vertical>