diff --git a/app.js b/app.js index 200fd95..e83646d 100644 --- a/app.js +++ b/app.js @@ -1779,7 +1779,7 @@ app.get('/print_workreport/:id',utils.ensureAuthenticated,async function(req,res if (workTimesSum.length>0) wtSum=workTimesSum[0].count*8 var data=await printWorkReport(reports,workHeader) - console.log(JSON.stringify(data)); + //console.log(JSON.stringify(data)); // fss.writeFile(path.normalize('d:\\test.json'), JSON.stringify(data)); res.send(data); //res.send({'response':'ok','reports':reports, 'workTimesSum':wtSum}); diff --git a/views/work.pug b/views/work.pug index 5744b5d..44ac731 100644 --- a/views/work.pug +++ b/views/work.pug @@ -220,7 +220,7 @@ block content col(width='10%') col(width='auto') col(width='10%') - col(width='10%') + col(width='15%') thead tr -//th # diff --git a/views/workReportEdit.pug b/views/workReportEdit.pug index 393c512..3d5e4e8 100644 --- a/views/workReportEdit.pug +++ b/views/workReportEdit.pug @@ -40,11 +40,13 @@ block content col(width='auto') col(width='15%') col(width='15%') + col(width='15%') thead tr th(style='text-align:left') # th(style='text-align:left') Munkavégzés leírása + th(style='text-align:left') Cég th(style='text-align:left') Résztvevők th(style='text-align:center') Művelet @@ -100,12 +102,14 @@ block content var rid if (item._id){ rid=item._id} else {rid=item.cid} if (idx==0){ + newRow+=`${employee.company}` newRow+=`${employee.name}`+ `` newRow+= `` } else { - newRow+=`${employee.name}`//+ + //newRow+=`${employee.company}`//+ + newRow+=`${employee.company}${employee.name}`//+ //`` }