Nyomtatáshoz cég hozzáadva

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});  

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 #

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+=`<td>${employee.company}</td>`
                     newRow+=`<td>${employee.name}</td>`+
                 `<td rowspan="${rows}" class="vcenter"><button class="btn btn-success" data-rid='${rid}' data-toggle='modal' type='button' data-target='#workReportEditModal'>Szerkeszt</button></td>`
                 newRow+= `</tr>`
                 } else 
                 {
-                newRow+=`<tr><td>${employee.name}</td></tr>`//+
+                //newRow+=`<tr><td>${employee.company}</td></tr>`//+
+                newRow+=`<tr><td>${employee.company}</td><td>${employee.name}</td></tr>`//+
                 //`<td><button>Edit</button></td></tr>`
                 }