From 49aa293794baae1d14fee3184390cbf3a6556e06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vincze=20J=C3=B3zsef?= <v.joszef@gmail.com>
Date: Thu, 20 Jun 2024 13:06:15 +0200
Subject: [PATCH] =?UTF-8?q?C=C3=A9ges=20megjegyz=C3=A9s=20hozz=C3=A1adva?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 routes/employee.js | 31 +++++++++++++++++++++++++------
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/routes/employee.js b/routes/employee.js
index 8151ee1..689003d 100644
--- a/routes/employee.js
+++ b/routes/employee.js
@@ -4783,6 +4783,8 @@ function printPage(employee,som,month,weekend,mindate,holidaysArray,sickpaysArra
           var locs="";
           var dreportList='';
           var day = moment(element.date,'YYYY.MM.DD.').day();
+          var notes="";
+          
           if (element.dailyReport!='') drShift='\r\n'; else drShift='';
           drShift='';
           if (element.dailyReport)
@@ -4791,7 +4793,7 @@ function printPage(employee,som,month,weekend,mindate,holidaysArray,sickpaysArra
             dreportList+= drelem.name.substring(0,60) +'\r\n';
             drShift+='\r\n';
           })
-        }
+          }
             if (element.isHoliday || element.isSickpay)
             {
               var txt='';
@@ -4812,6 +4814,9 @@ function printPage(employee,som,month,weekend,mindate,holidaysArray,sickpaysArra
             }
             else
             {
+                  element.notes.forEach(note=>{
+                    notes+=note.userNote+' '+note.companyNote
+                  })
                   if (element.isWeekend)
                   {
                     // Hétvége
@@ -4839,7 +4844,8 @@ function printPage(employee,som,month,weekend,mindate,holidaysArray,sickpaysArra
                     {text:drShift+convertMinsToHrsMins(element.hours), style:'tableDataWe', alignment: 'center'},
                     {text:drShift+convertMinsToHrsMins(element.overTime), style:'tableDataWe', alignment: 'center'},
                     
-                    {text:element.notes, style:'tableDataWe', alignment: 'left'}]);            
+                    //{text:element.notes, style:'tableDataWe', alignment: 'left'}]);
+                    {text:drShift+notes, style:'tableDataWe', alignment: 'left'}]);            
                   }
                   else
                   {
@@ -4863,7 +4869,7 @@ function printPage(employee,som,month,weekend,mindate,holidaysArray,sickpaysArra
                     {text:moment(element.date,'YYYY.MM.DD. HH:mm').format('DD'), style:'tableData'},
                     {text:moment(element.date,'YYYY.MM.DD. HH:mm').format('dddd'), style:'tableData', alignment: 'left'},
                     //{text:element.expiryDate, italics: true, color: 'gray'},
-                    [{text:dreportList, style:'dailyReport'},{text:locs, style:'tableData', alignment: 'center'}],
+                    [{text:dreportList, style:'dailyReport'},{text:locs, style:'tableDataLoc', alignment: 'center'}],
                     //{text:element.locations[0].arriveLoc+' - '+element.locations[0].getawayLoc, style:'tableData', alignment: 'center'},
                     {text:drShift+arrives, style:'tableData', alignment: 'center'},
                     {text:drShift+getaways, style:'tableData', alignment: 'center'},
@@ -4871,7 +4877,8 @@ function printPage(employee,som,month,weekend,mindate,holidaysArray,sickpaysArra
                     {text:drShift+convertMinsToHrsMins(element.hours), style:'tableData', alignment: 'center'},
                     {text:drShift+convertMinsToHrsMins(element.overTime), style:'tableData', alignment: 'center'},
                     
-                    {text:element.notes, style:'tableData', alignment: 'left'}]);            
+                    //{text:element.notes, style:'tableData', alignment: 'left'}]);            
+                    {text:drShift+notes, style:'tableDataWe', alignment: 'left'}]);            
                   }
               }//else
         
@@ -5033,6 +5040,12 @@ var dd = {
 			fontSize: 10,
 			italics: true,
 			color: 'green'
+    },
+    tableDataLoc: {
+			bold: false,
+			fontSize: 8,
+			italics: true,
+			color: 'green'
     },
 		tableDataWe: {
 			bold: false,
@@ -5089,6 +5102,7 @@ function printPageContractor(employee,som,month,weekend,mindate,holidaysArray,ca
           var getaways="";
           var locs="";
           var dreportList='';
+          var notes="";
           var day = moment(element.date,'YYYY.MM.DD.').day();
           if (element.dailyReport!='') drShift='\r\n'; else drShift='';
           drShift='';
@@ -5113,6 +5127,9 @@ function printPageContractor(employee,som,month,weekend,mindate,holidaysArray,ca
             }
             else
             {
+              element.notes.forEach(note=>{
+                notes+=note.userNote+' '+note.companyNote
+              })
               if (element.isWeekend)
               {
                 // Hétvége
@@ -5139,7 +5156,8 @@ function printPageContractor(employee,som,month,weekend,mindate,holidaysArray,ca
                 {text:drShift+convertMinsToHrsMins(element.hours), style:'tableDataWe', alignment: 'center'},
                 {text:drShift+convertMinsToHrsMins(element.overTime), style:'tableDataWe', alignment: 'center'},
                 
-                {text:element.notes, style:'tableDataWe', alignment: 'left'}]);            
+                //{text:element.notes, style:'tableDataWe', alignment: 'left'}]);            
+                {text:drShift+notes, style:'tableDataWe', alignment: 'left'}]);            
               }
               else
               {
@@ -5175,7 +5193,8 @@ function printPageContractor(employee,som,month,weekend,mindate,holidaysArray,ca
                 {text:drShift+convertMinsToHrsMins(element.hours), style:'tableData', alignment: 'center'},
                 {text:drShift+convertMinsToHrsMins(element.overTime), style:'tableData', alignment: 'center'},
                 
-                {text:element.notes, style:'tableData', alignment: 'left'}]);            
+                //{text:element.notes, style:'tableData', alignment: 'left'}]);            
+                {text:drShift+notes, style:'tableDataWe', alignment: 'left'}]);            
               }
             }