verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 49 Releases Wiki Activity

Merge pull request 'the absences are now fetched alongside the hours' (#689) from 3018-time_control_info into dev
gitea/salix/pipeline/head This commit looks good Details 

Reviewed-on: #689
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
This commit is contained in:
Joan Sanchez 2021-07-14 09:17:42 +00:00
parent 4eabba115f 675a48d8ad
commit a5ea19b527
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -106,6 +106,7 @@ class Controller extends Section {
}; };
this.$.model.applyFilter(filter, params).then(() => { this.$.model.applyFilter(filter, params).then(() => {
this.getWorkedHours(this.started, this.ended); this.getWorkedHours(this.started, this.ended);
this.getAbsences();
}); });
} }
@ -129,7 +130,7 @@ class Controller extends Section {
onData(data) { onData(data) {
const events = {}; const events = {};
let addEvent = (day, event) => { const addEvent = (day, event) => {
events[new Date(day).getTime()] = event; events[new Date(day).getTime()] = event;
}; };