From 6f691353a384cee36e7831494e6c9a68014126e4 Mon Sep 17 00:00:00 2001 From: Joan Sanchez Date: Thu, 17 Oct 2019 14:01:23 +0200 Subject: [PATCH] solved conflicts --- .../back/methods/worker-time-control/addTime.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/modules/worker/back/methods/worker-time-control/addTime.js b/modules/worker/back/methods/worker-time-control/addTime.js index cb639f9af8..516519359f 100644 --- a/modules/worker/back/methods/worker-time-control/addTime.js +++ b/modules/worker/back/methods/worker-time-control/addTime.js @@ -32,11 +32,12 @@ module.exports = Self => { throw new UserError(`You don't have enough privileges`); const subordinate = await Worker.findById(data.workerFk); + const timed = new Date(data.timed); - return Self.create({ - userFk: subordinate.userFk, - timed: data.timed, - manual: 1 - }); + let offset = timed.getTimezoneOffset() * 60000; + timed.setTime(timed.getTime() - offset); + + return Self.rawSql('CALL vn.workerTimeControl_add(?, ?, ?, ?)', [ + subordinate.userFk, null, timed, true]); }; };