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

Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2940-invoiceInTax-section
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Carlos Jimenez Ruiz 2021-07-19 11:20:38 +02:00
parent ee30bc9e1e d46c9bbfa7
commit e5b1f47478
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;
}; };