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

Céges megjegyzés hozzáadva

This commit is contained in:
Vincze József 2024-06-20 13:06:15 +02:00
parent 7ff5555726
commit 49aa293794
1 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
routes/employee.js
View File

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