diff --git a/js/workTime.js b/js/workTime.js index a51ded4..c3ca66b 100644 --- a/js/workTime.js +++ b/js/workTime.js @@ -401,7 +401,7 @@ var _getAccessDetails=async function(id,mindate,callback) { callback(err); } else { - var month={overTime:0,workHours:0,fullWorkHours:0,sickPays:0}; + var month={overTime:0,workHours:0,fullWorkHours:0,sickPays:0,holidays:0}; //var weekend={overTime:0,workHours:0,fullWorkHours:0,days:0}; var weekend={ Saturday:{overTime:0,workHours:0,fullWorkHours:0,days:0,Surrogate:0}, @@ -483,6 +483,7 @@ var _getAccessDetails=async function(id,mindate,callback) { return moment(a.date,'YYYY.MM.DD') - moment(b.date,'YYYY.MM.DD'); }); month.sickPays=sickpaysArray.length; + month.holidays=holidaysArray.length; //callback(null,som,month,weekend); callback(null,ja,month,weekend); } diff --git a/public/js/workingtime.js b/public/js/workingtime.js index 446f691..ab2f28c 100644 --- a/public/js/workingtime.js +++ b/public/js/workingtime.js @@ -500,7 +500,7 @@ function renderWorkingTimesTableDetailed2(wtList) '"'+ '"'+ ' Kiadott szabadságok: '+''+ - ' '+wtList.munkaszunet.length+''+ + ' '+wtList.month.holidays+''+ '"'+ '"'+ ' Táppénz: '+''+