From ddcec00c4faf4467dfb0719a6e6df8764312563a Mon Sep 17 00:00:00 2001 From: nelo Date: Thu, 29 Jun 2017 09:48:00 +0200 Subject: [PATCH] change time --- client/production/src/index/index.js | 2 +- .../common/methods/ticket/change-time.js | 32 ++++++++++++------- services/production/common/models/agency.js | 4 --- .../common/models/fake-production.js | 3 -- services/production/common/models/state.js | 4 --- .../production/common/models/ticket-state.js | 3 -- services/production/common/models/ticket.js | 3 -- .../production/common/models/warehouse.js | 4 --- 8 files changed, 21 insertions(+), 34 deletions(-) diff --git a/client/production/src/index/index.js b/client/production/src/index/index.js index 404a5ebfa..eec32c72d 100644 --- a/client/production/src/index/index.js +++ b/client/production/src/index/index.js @@ -58,7 +58,7 @@ export default class ProductionIndex { ); } _changeTime(ids, time, index) { - this.$http.put(`/production/api/changeTime?time=${time}`, {tickets: ids}).then( + this.$http.put(`/production/api/Tickets/${time}/changeTime`, {tickets: ids}).then( () => { index.forEach( val => { diff --git a/services/production/common/methods/ticket/change-time.js b/services/production/common/methods/ticket/change-time.js index 78e328cb7..feca79c59 100644 --- a/services/production/common/methods/ticket/change-time.js +++ b/services/production/common/methods/ticket/change-time.js @@ -1,36 +1,44 @@ module.exports = function(Ticket) { Ticket.remoteMethodCtx('changeTime', { - description: 'List tickets for production', - accepts: { + description: 'Change time of tickets', + accepts: [{ arg: 'time', type: 'string', required: true, - description: 'New time of ticket', + description: 'New time of tickets', http: {source: 'path'} + }], + returns: { + arg: 'response', + type: 'boolean' }, http: { - verb: 'get', - path: '/changeTime' + verb: 'put', + path: '/:time/changeTime' } }); Ticket.changeTime = function(ctx, time, cb) { var tickets = ctx.req.body.tickets; + changeTime(tickets, time, cb); }; var changeTime = function(tickets, time, cb){ var FakeProduction = Ticket.app.models.FakeProduction; + var hour = `${time}:00`; - time = `CONCAT(DATE(Fecha), ' ${time}')`; - - Ticket.updateAll({id: {inq: tickets}}, {date: time}, function(err, res){ + var query = `update Ticket set date = CONCAT(DATE(date), ' ', ?) where id in (?)`; + var params = [time, tickets]; + + FakeProduction.updateAll({ticketFk: {inq: tickets}}, {hour: hour}, function(err, res){ if(err) cb(err, null) - else - FakeProduction.updateAll({id: {inq: tickets}}, {date: time}, function(err, res){ - (err) ? cb(err, null) : cb(null, res) - }); + else{ + var response = Ticket.rawSql(query, params, cb); + cb(null, response); + } }); + } } \ No newline at end of file diff --git a/services/production/common/models/agency.js b/services/production/common/models/agency.js index 79fbe7a96..ac3aec84a 100644 --- a/services/production/common/models/agency.js +++ b/services/production/common/models/agency.js @@ -1,9 +1,5 @@ var app = require('../../server/server'); module.exports = function(Agency) { - var models = app.models; - - // Methods - require('../methods/agency/list.js')(Agency); }; \ No newline at end of file diff --git a/services/production/common/models/fake-production.js b/services/production/common/models/fake-production.js index 912d025b1..383862ef7 100644 --- a/services/production/common/models/fake-production.js +++ b/services/production/common/models/fake-production.js @@ -1,9 +1,6 @@ var app = require('../../server/server'); module.exports = function(FakeProduction) { - var models = app.models; - - // Methods require('../methods/fake-production/list.js')(FakeProduction); require('../methods/fake-production/message-send.js')(FakeProduction); }; \ No newline at end of file diff --git a/services/production/common/models/state.js b/services/production/common/models/state.js index 072b036cb..9e7db9ccb 100644 --- a/services/production/common/models/state.js +++ b/services/production/common/models/state.js @@ -1,9 +1,5 @@ var app = require('../../server/server'); module.exports = function(State) { - var models = app.models; - - // Methods - require('../methods/state/list.js')(State); }; \ No newline at end of file diff --git a/services/production/common/models/ticket-state.js b/services/production/common/models/ticket-state.js index 58606e1e9..46b979506 100644 --- a/services/production/common/models/ticket-state.js +++ b/services/production/common/models/ticket-state.js @@ -1,8 +1,5 @@ var app = require('../../server/server'); module.exports = function(TicketState) { - var models = app.models; - - // Methods require('../methods/ticket-state/change-state.js')(TicketState); }; \ No newline at end of file diff --git a/services/production/common/models/ticket.js b/services/production/common/models/ticket.js index 556a224a4..99768bf88 100644 --- a/services/production/common/models/ticket.js +++ b/services/production/common/models/ticket.js @@ -1,8 +1,5 @@ var app = require('../../server/server'); module.exports = function(Ticket) { - var models = app.models; - - // Methods require('../methods/ticket/change-time.js')(Ticket); }; \ No newline at end of file diff --git a/services/production/common/models/warehouse.js b/services/production/common/models/warehouse.js index 062013911..3ad0a9ccb 100644 --- a/services/production/common/models/warehouse.js +++ b/services/production/common/models/warehouse.js @@ -1,9 +1,5 @@ var app = require('../../server/server'); module.exports = function(Warehouse) { - var models = app.models; - - // Methods - require('../methods/warehouse/list.js')(Warehouse); }; \ No newline at end of file