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

Merge branch '1763-worker_time_control_add' of verdnatura/salix into master
gitea/salix/master This commit looks good Details 

LGTM
This commit is contained in:
Joan Sanchez 2019-10-10 12:19:50 +00:00 committed by Gitea
parent 144f13c400 8af7f13ac6
commit 9f608b725b
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

@ -238,9 +238,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();
});
} }
} }
} }