From 217b08cd0ae6f4b7805a7ddb1f9edf7124116e87 Mon Sep 17 00:00:00 2001 From: Bernat Date: Thu, 6 Jun 2019 13:50:12 +0200 Subject: [PATCH] Tarea #1509 route/ticket/delete ticket --- e2e/paths/08-route-module/03_tickets.spec.js | 2 +- modules/route/front/tickets/index.html | 2 +- modules/route/front/tickets/index.js | 17 ++++++++++++++--- modules/route/front/tickets/locale/es.yml | 2 +- 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/e2e/paths/08-route-module/03_tickets.spec.js b/e2e/paths/08-route-module/03_tickets.spec.js index 0ae3fe0ad4..18d54ff4ad 100644 --- a/e2e/paths/08-route-module/03_tickets.spec.js +++ b/e2e/paths/08-route-module/03_tickets.spec.js @@ -108,7 +108,7 @@ describe('Route basic Data path', () => { .waitToClick(selectors.routeTickets.confirmButton) .waitForLastSnackbar(); - expect(result).toEqual('Ticket deleted from route'); + expect(result).toEqual('Ticket removed from route'); }); it('should now count how many tickets are in route to find one less', async() => { diff --git a/modules/route/front/tickets/index.html b/modules/route/front/tickets/index.html index a8d8655e7c..af266d35a4 100644 --- a/modules/route/front/tickets/index.html +++ b/modules/route/front/tickets/index.html @@ -110,5 +110,5 @@ + on-response="$ctrl.removeTicketFromRoute(response)"> \ No newline at end of file diff --git a/modules/route/front/tickets/index.js b/modules/route/front/tickets/index.js index 2b3aa26f19..ce12d88acd 100644 --- a/modules/route/front/tickets/index.js +++ b/modules/route/front/tickets/index.js @@ -69,17 +69,25 @@ class Controller { this.$.confirm.show(); } - deleteFromRoute(response) { + removeTicketFromRoute(response) { if (response === 'ACCEPT') { let params = {routeFk: null}; let query = `/api/Tickets/${this.selectedTicket}/`; this.$http.patch(query, params).then(() => { - this.vnApp.showSuccess(this.$translate.instant('Ticket deleted from route')); - this.$.model.refresh(); + this.vnApp.showSuccess(this.$translate.instant('Ticket removed from route')); + this.updateVolume(); }); } } + updateVolume() { + let url = `/route/api/Routes/${this.$stateParams.id}/updateVolume`; + this.$http.post(url).then(() => { + this.card.reload(); + this.$.model.refresh(); + }); + } + guessPriority() { let query = `/api/Routes/${this.$stateParams.id}/guessPriority/`; this.$http.get(query).then(() => { @@ -107,5 +115,8 @@ Controller.$inject = ['$stateParams', '$scope', '$translate', '$http', 'vnApp']; ngModule.component('vnRouteTickets', { template: require('./index.html'), + require: { + card: '^vnRouteCard' + }, controller: Controller }); diff --git a/modules/route/front/tickets/locale/es.yml b/modules/route/front/tickets/locale/es.yml index e339f6b201..d668e0a8a9 100644 --- a/modules/route/front/tickets/locale/es.yml +++ b/modules/route/front/tickets/locale/es.yml @@ -1,6 +1,6 @@ Remove ticket: Borrar ticket Open buscaman: Abrir buscaman -Ticket deleted from route: Ticket borrado de la ruta +Ticket removed from route: Ticket borrado de la ruta Order changed: Orden cambiado Delete ticket from route?: ¿Borrar ticket de la ruta? Sort routes: Ordenar rutas \ No newline at end of file