From db5ed9f310bcf92df9353239f272ef5be2a0516f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vincze=20J=C3=B3zsef?= Date: Sat, 25 Jan 2025 16:21:59 +0100 Subject: [PATCH] =?UTF-8?q?Jelenl=C3=A9ti=20=C3=ADv=20nyomtat=C3=A1s=20hib?= =?UTF-8?q?a=20jav=C3=ADtva?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- routes/employee.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/routes/employee.js b/routes/employee.js index 855d944..830e95e 100644 --- a/routes/employee.js +++ b/routes/employee.js @@ -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 })