diff --git a/client/ticket/routes.json b/client/ticket/routes.json index 49cb84b9c3..41cb8057bc 100644 --- a/client/ticket/routes.json +++ b/client/ticket/routes.json @@ -107,8 +107,14 @@ } }, { - "url" : "/tracking", + "url": "/tracking", "state": "ticket.card.tracking", + "abstract": true, + "component": "ui-view" + }, + { + "url" : "/index", + "state": "ticket.card.tracking.index", "component": "vn-ticket-tracking", "params": { "ticket": "$ctrl.ticket" @@ -118,6 +124,14 @@ "icon": "remove_red_eye" } }, + { + "url": "/edit", + "state": "ticket.card.tracking.edit", + "component": "vn-ticket-tracking-edit", + "params": { + "ticket": "$ctrl.ticket" + } + }, { "url": "/create", "state": "ticket.card.tracking.create", diff --git a/client/ticket/src/ticket.js b/client/ticket/src/ticket.js index 5a84ce4277..c904652310 100644 --- a/client/ticket/src/ticket.js +++ b/client/ticket/src/ticket.js @@ -10,6 +10,7 @@ import './expedition/ticket-expedition'; import './volume/ticket-volume'; import './package/package'; import './sale/sale'; -import './tracking/tracking'; +import './tracking/index'; +import './tracking/edit/edit'; import './fetched-tags/fetched-tags'; import './sale-checked/sale-checked'; diff --git a/client/ticket/src/tracking/tracking.html b/client/ticket/src/tracking/index.html similarity index 90% rename from client/ticket/src/tracking/tracking.html rename to client/ticket/src/tracking/index.html index ec827fac3a..3d287d9405 100644 --- a/client/ticket/src/tracking/tracking.html +++ b/client/ticket/src/tracking/index.html @@ -1,5 +1,5 @@ <mg-ajax path="/ticket/api/TicketTrackings/filter" options="vnIndexNonAuto"></mg-ajax> -<vn-vertical pad-medium> +<vn-vertical> <vn-card pad-large> <vn-vertical> <vn-title>Tracking</vn-title> @@ -7,7 +7,6 @@ <vn-column-header vn-one pad-medium-h field="state.name" text="State"></vn-column-header> <vn-column-header vn-two pad-medium-h field="employee" text="Employee"></vn-column-header> <vn-column-header vn-two pad-medium-h field="created" text="Created" default-order="ASC"></vn-column-header> - </vn-grid-header> <vn-one class="list list-content"> <vn-horizontal @@ -15,9 +14,8 @@ pad-small-bottom ng-repeat="ticket in index.model.instances track by ticket.id"> <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.created | date:'dd/MM/yyyy HH:mm' }}</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-horizontal> </vn-one> <vn-one class="text-center pad-small-v" ng-if="index.model.count === 0" translate>No results</vn-one> @@ -26,6 +24,6 @@ </vn-vertical> </vn-card> </vn-vertical> -<a ui-sref="ticket.card.tracking.create" fixed-bottom-right> +<a ui-sref="ticket.card.tracking.edit" fixed-bottom-right> <vn-float-button icon="add"></vn-float-button> </a> \ No newline at end of file diff --git a/client/ticket/src/tracking/tracking.js b/client/ticket/src/tracking/index.js similarity index 79% rename from client/ticket/src/tracking/tracking.js rename to client/ticket/src/tracking/index.js index be147ed918..fc0777775c 100644 --- a/client/ticket/src/tracking/tracking.js +++ b/client/ticket/src/tracking/index.js @@ -2,6 +2,6 @@ import ngModule from '../module'; import FilterTicketList from '../filter-ticket-list'; ngModule.component('vnTicketTracking', { - template: require('./tracking.html'), + template: require('./index.html'), controller: FilterTicketList }); diff --git a/client/ticket/src/tracking/locale/es.yml b/client/ticket/src/tracking/locale/es.yml deleted file mode 100644 index e61e1dd246..0000000000 --- a/client/ticket/src/tracking/locale/es.yml +++ /dev/null @@ -1,5 +0,0 @@ -Date : Fecha -Employee : Empleado -State: Estado -Tracking: Revisión -Created : Añadido \ No newline at end of file diff --git a/services/ticket/common/models/ticketTracking.js b/services/ticket/common/models/ticketTracking.js index ab8a13f1e1..91f890af51 100644 --- a/services/ticket/common/models/ticketTracking.js +++ b/services/ticket/common/models/ticketTracking.js @@ -1,3 +1,14 @@ module.exports = function(Self) { require('../methods/ticketTracking/filter')(Self); + + Self.observe('before save', function(ctx, next) { + let token = ctx.options.accessToken; + let userId = token && token.userId; + + Self.app.models.Worker.findOne({where: {userFk: userId}}, (err, user) => { + if (err) return next(err); + ctx.instance.workerFk = user.id; + next(); + }); + }); }; diff --git a/services/ticket/common/models/ticketTracking.json b/services/ticket/common/models/ticketTracking.json index b1f2769d40..176f84b274 100644 --- a/services/ticket/common/models/ticketTracking.json +++ b/services/ticket/common/models/ticketTracking.json @@ -3,7 +3,8 @@ "base": "VnModel", "options": { "mysql": { - "table": "ticketTracking" + "table": "ticketTracking", + "database": "vn" } }, "properties": {