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

1763-worker_time_control_add #17

Merged
bernat merged 10 commits from 1763-worker_time_control_add into dev 2019-10-15 05:35:54 +00:00
Conversation 0 Commits 10 Files Changed 2 +3 -8
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/worker/back/methods/worker-time-control/addTime.js
View File

@ -33,10 +33,7 @@ module.exports = Self => {
const subordinate = await Worker.findById(data.workerFk); const subordinate = await Worker.findById(data.workerFk);
return Self.create({ return Self.rawSql('CALL vn.workerTimeControl_add(?, ?, ?, ?)', [
userFk: subordinate.userFk, subordinate.userFk, null, data.timed, true]);
timed: data.timed,
manual: 1
});
}; };
}; };

4
modules/worker/front/time-control/index.js
View File

@ -235,9 +235,7 @@ class Controller {
if (response === 'ACCEPT') { if (response === 'ACCEPT') {
let data = {workerFk: this.worker.id, timed: this.newTime}; let data = {workerFk: this.worker.id, timed: this.newTime};
let query = `/api/WorkerTimeControls/addTime`; let query = `/api/WorkerTimeControls/addTime`;
this.$http.post(query, data).then(() => { this.$http.post(query, data).then(() => this.refresh());
this.refresh();
});
} }
} }
} }