From 81dbd93d66c7a9362aaada39abfec7ff1a2c59a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vincze=20J=C3=B3zsef?= Date: Wed, 19 Jun 2024 12:24:51 +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 --- app.js | 5 ++-- models/workingtime.js | 5 ++++ public/js/workingtime.js | 28 +++++++++++-------- routes/employee.js | 12 ++++++-- views/Modals/modal_oilChange.pug | 3 +- views/Modals/modal_oilChangeNew.pug | 2 +- views/Modals/modal_timingReplacementNew.pug | 2 +- views/employee_access_details.pug | 31 +++++++++++++++++---- 8 files changed, 64 insertions(+), 24 deletions(-) diff --git a/app.js b/app.js index 53eb2bf..7bfbafb 100644 --- a/app.js +++ b/app.js @@ -24,7 +24,7 @@ var PdfPrinter=require('pdfmake'); //const util = require('util'); //var currentWorkNumber=0; const { XMLParser, XMLBuilder, XMLValidator} = require("fast-xml-parser/src/fxp"); -var apkUpdater = require('apk-updater'); +//var apkUpdater = require('apk-updater'); const fss = require('fs'); global.currentWorkNumber=0; @@ -203,6 +203,7 @@ app.use(express.static(path.join(__dirname, 'public'))); app.use(express.static(path.join(__dirname, 'media'))); app.use(express.static(path.join(__dirname, 'docs'))); app.use(express.static(path.join(__dirname, '/views/Modals'))); + app.use(flash()); // Express session middlevare app.use(session({ @@ -1889,7 +1890,7 @@ app.use('/certificates_tr',certificates_tr); app.use('/certificates_mc',certificates_mc); app.use('/components',components); app.use('/components_base',components_base); -apkUpdater.enable(app, '/anyUpdateServerRoute'); +//apkUpdater.enable(app, '/anyUpdateServerRoute'); /* app.delete('/devices/:id',utils.ensureAuthenticated,function(req,res){ let query = { _id:req.params.id} diff --git a/models/workingtime.js b/models/workingtime.js index d83186b..dba475f 100644 --- a/models/workingtime.js +++ b/models/workingtime.js @@ -52,6 +52,11 @@ let workingTimeSchema = mongoose.Schema({ type: String, require: true }, + // Munkáltatói Megjegyzés + company_notes:{ + type: String, + require: true + }, // Day day:{ type: String, diff --git a/public/js/workingtime.js b/public/js/workingtime.js index 1199fea..7457103 100644 --- a/public/js/workingtime.js +++ b/public/js/workingtime.js @@ -245,7 +245,8 @@ function renderWorkingTimesTableDetailed2(wtList) var ot= 0; var drName=''; var drShift=''; - + var notes=""; + //var companyNotes=""; /* if (wt.dailyReport==='') { drName=''; @@ -337,20 +338,25 @@ function renderWorkingTimesTableDetailed2(wtList) } //'a(href="/articles/"+article._id+"/"+work._id)='+loc.arriveLoc })//arriveCoords - newRow.append( - ''+moment(wt.date,'YYYY.MM.DD. HH:mm').format('DD')+ - ''+moment(wt.date,'YYYY.MM.DD. HH:mm').format('dddd')+ - ''+drName+locs+''+//wt.location+ - ''+drShift+arrives+//moment(wt.timeArrive,'YYYY.MM.DD. HH:mm').format('HH:mm')+ - ''+drShift+getaways+ + $.each(wt.notes,function(i,note){ + notes+='
'+note.userNote+''+ ' '+note.companyNote+'
' + }) + newRow.append( + ''+moment(wt.date,'YYYY.MM.DD. HH:mm').format('DD')+''+ + ''+moment(wt.date,'YYYY.MM.DD. HH:mm').format('dddd')+''+ + ''+drName+locs+''+''+//wt.location+ + ''+drShift+arrives+''+//moment(wt.timeArrive,'YYYY.MM.DD. HH:mm').format('HH:mm')+ + + ''+drShift+getaways+''+ modifyColumn+ deleteColumn+ //''+convertMinsToHrsMins(wt.workHours)+ - ''+drShift+convertMinsToHrsMins(wt.hours)+ - ''+drShift+convertMinsToHrsMins(wt.overTime)+ - ''+wt.notes+ - ''); + ''+drShift+convertMinsToHrsMins(wt.hours)+''+ + ''+drShift+convertMinsToHrsMins(wt.overTime)+''+ + //''+wt.notes+''+ ' '+wt.companyNotes+''+'' + ''+notes+'' + ); } else { diff --git a/routes/employee.js b/routes/employee.js index 164f892..8151ee1 100644 --- a/routes/employee.js +++ b/routes/employee.js @@ -2864,6 +2864,8 @@ function sumOfMonth(employee_id,mindate,callback) var lonS=element.longitudeS; var latE=element.latitudeE; var lonE=element.longitudeE; + //var cNotes=""; + //var notes=""; //var dr=wt.rd.find(element => element.date==drDate) var dr=wt.rd.filter(element => element.date==drDate) if (typeof element.latitudeS==='undefined') latS='N/A' @@ -2883,6 +2885,7 @@ function sumOfMonth(employee_id,mindate,callback) arriveCoords:{lat:latS,lon:lonS}, getavayCoords:{lat:latE,lon:lonE} }); + wdays.notes.push({userNote:element.notes, companyNote: element.company_notes}); wdays.fullHours+=element.workHours; } @@ -2909,7 +2912,11 @@ function sumOfMonth(employee_id,mindate,callback) isWeekend:isWeekend, state:element.state, location:element.location, - notes:element.notes, + notes:[{ + userNote: element.notes, + companyNote: element.company_notes ?? "-" + }], + companyNotes: element.company_notes ?? "", locations:[{ arriveLoc:element.location, getawayLoc:element.locationStop, @@ -2971,7 +2978,8 @@ router.post('/setWorkingTimeById/:id',utils.ensureAuthenticated,function(req, re 'timeGetaway':moment(req.body.dtPickerGetaway,'YYYY-MM-DDTHH:mm').format('YYYY.MM.DD. HH:mm'), 'date':moment(req.body.dtPickerArrive,'YYYY-MM-DDTHH:mm').format('YYYY.MM.DD.'), 'day':moment(req.body.dtPickerArrive,'YYYY-MM-DDTHH:mm').format('dddd'), - 'workHours':workhours + 'workHours':workhours, + 'company_notes':req.body.companyNotes }, function(err,result){ if (err) diff --git a/views/Modals/modal_oilChange.pug b/views/Modals/modal_oilChange.pug index c411eb8..1d9de86 100644 --- a/views/Modals/modal_oilChange.pug +++ b/views/Modals/modal_oilChange.pug @@ -39,6 +39,7 @@ link(rel='stylesheet', type='text/css', href='https://unpkg.com/lightpick@latest //-script(src='https://unpkg.com/lightpick@latest/lightpick.js') script. + $(document).on('show.bs.modal','#oilChangeModal', function () { // Generate Table @@ -76,10 +77,10 @@ script. // }) }) + $(document).ready( function() { - } ); \ No newline at end of file diff --git a/views/Modals/modal_oilChangeNew.pug b/views/Modals/modal_oilChangeNew.pug index 5181458..11f2fca 100644 --- a/views/Modals/modal_oilChangeNew.pug +++ b/views/Modals/modal_oilChangeNew.pug @@ -43,7 +43,7 @@ link(rel='stylesheet', type='text/css', href='https://unpkg.com/lightpick@latest button#oilChangeSave.btn.btn-primary(type='button' ) i.fa.fa-save | | Mentés - //script(src='/bower_components/jquery/dist/jquery.js') + //-script(src='/bower_components/jquery/dist/jquery.js') script(type='text/javascript', src='/bower_components/moment/min/moment.min.js') script(src='https://unpkg.com/lightpick@latest/lightpick.js') diff --git a/views/Modals/modal_timingReplacementNew.pug b/views/Modals/modal_timingReplacementNew.pug index 0d0dc07..a701b2e 100644 --- a/views/Modals/modal_timingReplacementNew.pug +++ b/views/Modals/modal_timingReplacementNew.pug @@ -43,7 +43,7 @@ link(rel='stylesheet', type='text/css', href='https://unpkg.com/lightpick@latest button#timingReplacementSave.btn.btn-primary(type='button' ) i.fa.fa-save | | Mentés - //script(src='/bower_components/jquery/dist/jquery.js') + //-script(src='/bower_components/jquery/dist/jquery.js') script(type='text/javascript', src='/bower_components/moment/min/moment.min.js') script(src='https://unpkg.com/lightpick@latest/lightpick.js') diff --git a/views/employee_access_details.pug b/views/employee_access_details.pug index 328d606..23ac657 100644 --- a/views/employee_access_details.pug +++ b/views/employee_access_details.pug @@ -20,12 +20,24 @@ block content cursor:not-allowed; } - - #wtimeEditModal.modal(tabindex='-1', role='dialog', aria-labelledby='wtimeEditModalLabel', aria-hidden='true') + .ibr { + //display: flex !important; + clor: blue; + display: flex; + // background-color: #006100; + // width: 140px; + // height: 140px; + } + span2 { + //border: 2px solid crimson; + //margin: 4px; + color: magenta + } + #wtimeEditModal.fade.modal(tabindex='-1', role='dialog', aria-labelledby='wtimeEditModalLabel', aria-hidden='true') form(method='POST',id='wtimeEditForm' action='/employee/setWorkingTimeById/'+employee._id) .modal-dialog(role='document', style='width:620px') .modal-content - .modal-header + .modal-header.bg-primary h4#wtimeEditModalLabel.modal-title Munkaidő módosítás #{employee.name} .modal-body @@ -75,6 +87,12 @@ block content //input.form-control(id='arrivePicker',name='arrivePicker',type=text, tabindex='2',readonly,style='background-color:#c9ddfc;') //input(type="text",id="datepicker") br + .row + .col-sm-3 + p Munkáltató megjegyzés: + .col-sm-4 + input#companyNotes(name='companyNotes',type=text) + br //input#birthdaytime(type='datetime-local',pattern="[0-9]{4}.[0-9]{2}.[0-9]{2}. T[0-9]{2}:[0-9]{2}",required, name='birthdaytime') .modal-footer button.btn.btn-secondary(type='button', data-dismiss='modal') Mégsem @@ -184,10 +202,10 @@ block content br table#monthHoursTableDetails.container(style='width:90%;') col(width='5%') - col(width='10%') + col(width='5%') col(width='40%') - col(width='8%') - col(width='8%') + col(width='6%') + col(width='6%') if(userIsAdmin==true) col(width='3%') col(width='3%') @@ -267,6 +285,7 @@ block content $(".modal-body #lonStartField").val( resp.longitudeS); $(".modal-body #latStopField").val( resp.latitudeE); $(".modal-body #lonStopField").val( resp.longitudeE); + $(".modal-body #companyNotes").val( resp.company_notes); document.getElementById("dtPickerArrive").value=moment(resp.timeArrive,'YYYY.MM.DD. HH:mm').format('YYYY-MM-DDTHH:mm'); document.getElementById("dtPickerGetaway").value=moment(resp.timeGetaway,'YYYY.MM.DD. HH:mm').format('YYYY-MM-DDTHH:mm');