kutafaja
/
klnodekb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Munkaidő összesítő javítva

This commit is contained in:
Vincze József 2025-02-13 15:30:58 +01:00
parent 8391e6aa8c
commit bd1fb958af
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
js/workTime.js
View File

@ -401,7 +401,7 @@ var _getAccessDetails=async function(id,mindate,callback) {
callback(err); callback(err);
} }
else { 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={overTime:0,workHours:0,fullWorkHours:0,days:0};
var weekend={ var weekend={
Saturday:{overTime:0,workHours:0,fullWorkHours:0,days:0,Surrogate:0}, 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'); return moment(a.date,'YYYY.MM.DD') - moment(b.date,'YYYY.MM.DD');
}); });
month.sickPays=sickpaysArray.length; month.sickPays=sickpaysArray.length;
month.holidays=holidaysArray.length;
//callback(null,som,month,weekend); //callback(null,som,month,weekend);
callback(null,ja,month,weekend); callback(null,ja,month,weekend);
} }

2
public/js/workingtime.js
View File

@ -500,7 +500,7 @@ function renderWorkingTimesTableDetailed2(wtList)
'"</tr>'+ '"</tr>'+
'<tr>"'+ '<tr>"'+
'<td style="text-align:left;color: white;font-size: 16px;"> Kiadott szabadságok: '+'</td>'+ '<td style="text-align:left;color: white;font-size: 16px;"> Kiadott szabadságok: '+'</td>'+
'<td style="text-align:center;font-size: 16px;"> '+wtList.munkaszunet.length+'</td>'+ '<td style="text-align:center;font-size: 16px;"> '+wtList.month.holidays+'</td>'+
'"</tr>'+ '"</tr>'+
'<tr>"'+ '<tr>"'+
'<td style="text-align:left;color: white;font-size: 16px;"> Táppénz: '+'</td>'+ '<td style="text-align:left;color: white;font-size: 16px;"> Táppénz: '+'</td>'+