Jelenléti ív nyomtatás hiba javítva

This commit is contained in:
Vincze József 2025-01-25 16:21:59 +01:00
parent 758690ecb0
commit db5ed9f310
1 changed files with 5 additions and 4 deletions

View File

@ -5168,10 +5168,7 @@ function printPage(employee,som,month,weekend,mindate,holidaysArray,sickpaysArra
var day = moment(element.date,'YYYY.MM.DD.').day();
var notes="";
if (Object.keys(element.workReport).length!=0){
workReport=element.workReport.wt+' '+element.workReport.wf;
wrShift='\r\n'
}
if (element.dailyReport!='') drShift='\r\n'; else drShift='';
drShift='';
if (element.dailyReport)
@ -5201,6 +5198,10 @@ function printPage(employee,som,month,weekend,mindate,holidaysArray,sickpaysArra
}
else
{
if (Object.keys(element.workReport).length!=0){
workReport=element.workReport.wt+' '+element.workReport.wf;
wrShift='\r\n'
}
element.notes.forEach(note=>{
notes+=note.userNote+' '+note.companyNote
})