From 3fa433f2f1269f8b87aa160430ea79110737f439 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vincze=20J=C3=B3zsef?= Date: Tue, 31 Oct 2023 11:11:24 +0100 Subject: [PATCH] =?UTF-8?q?Vehicle=20Poz=C3=ADci=C3=B3=20modal=20jav=C3=AD?= =?UTF-8?q?tva?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- js/vehicleApi.js | 4 +++- models/vehicle.js | 2 ++ routes/employee.js | 4 ++-- routes/vehicles.js | 2 +- views/Modals/modal_oilChangeNew.pug | 2 +- views/vehicles.pug | 19 ++++++++++++------- 6 files changed, 21 insertions(+), 12 deletions(-) diff --git a/js/vehicleApi.js b/js/vehicleApi.js index 29576bb..ed793d9 100644 --- a/js/vehicleApi.js +++ b/js/vehicleApi.js @@ -7,12 +7,14 @@ const { isValidObjectId } = require('mongoose'); const { sendEmail } = require('./mailHelper.js'); -exports.apiVehicleSetCity=function(vehicleId,lastCity,rfid_device_id,callback){ +exports.apiVehicleSetCity=function(vehicleId,lastCity,rfid_device_id,lat,lon,callback){ let lc={ timestamp: new Date(), city:lastCity, + lat:lat, + lon:lon, rfid_device_id:rfid_device_id }; diff --git a/models/vehicle.js b/models/vehicle.js index a19f226..ca154bf 100644 --- a/models/vehicle.js +++ b/models/vehicle.js @@ -39,6 +39,8 @@ const vehicleSchema=new mongoose.Schema({ lastCity:[{ timestamp: Date, city:String, + lat:String, + lon:String, rfid_device_id:{type: mongoose.Schema.Types.ObjectId} }], visible:{ diff --git a/routes/employee.js b/routes/employee.js index f9c9bdf..45b3ff0 100644 --- a/routes/employee.js +++ b/routes/employee.js @@ -242,7 +242,7 @@ transporter = nodemailer.createTransport({ //road: resp[0].streetName, })); // Utolsó pozíció mentése adatbázisba. - apiVehicle.apiVehicleSetCity(device.vehicle_id,resp.city,device._id,function(err,re){ + apiVehicle.apiVehicleSetCity(device.vehicle_id,resp.city,device._id,dec1,dec2,function(err,re){ if(err) console.log(err); else @@ -295,7 +295,7 @@ transporter = nodemailer.createTransport({ //road: resp[0].streetName, })); // Utolsó pozíció mentése adatbázisba. - apiVehicle.apiVehicleSetCity(device.vehicle_id,resp.city,device._id,function(err,re){ + apiVehicle.apiVehicleSetCity(device.vehicle_id,resp.city,device._id,data.lat,data.lon,function(err,re){ if(err) console.log(err); else diff --git a/routes/vehicles.js b/routes/vehicles.js index db4882a..fb8a156 100644 --- a/routes/vehicles.js +++ b/routes/vehicles.js @@ -206,7 +206,7 @@ router.get('/getvehicle/:id', utils.ensureAuthenticated, function(req, res) { else { var locations=[]; vehicle.lastCity.forEach(element => { - locations.push({title:element.city,start:element.timestamp,allDay:false}) + locations.push({title:element.city,start:element.timestamp,allDay:false,id:element._id,lat:element.lat,lon:element.lon}) }); res.send(locations); diff --git a/views/Modals/modal_oilChangeNew.pug b/views/Modals/modal_oilChangeNew.pug index 4bf732d..272b5de 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/vehicles.pug b/views/vehicles.pug index 574918d..2d24e2e 100644 --- a/views/vehicles.pug +++ b/views/vehicles.pug @@ -29,6 +29,7 @@ block content h4#vehicleId.modal-title A .modal-body #calendar(style="background-color: white") + //iframe(src='https://www.google.com/maps/embed?pb=!1m10!1m8!1m3!1d116862.54554679655!2d90.40409584970706!3d23.749000170125925!3m2!1i1024!2i768!4f13.1!5e0!3m2!1sen!2sbd!4v1550040341458' width='100%' height='450' frameborder='0' style='border:0' allowfullscreen='') br .modal-footer button.btn.btn-primary(type='button', data-dismiss='modal') Bezár @@ -318,20 +319,24 @@ block content success: function(res) { //console.log(res.at(-1).title); // alert(res.at(-1).title); - var newEvent = new Object(); - newEvent.title = "some text"; - newEvent.start = new Date(); - newEvent.allDay = false; - + var calendarEl = document.getElementById('calendar'); var calendar = new FullCalendar.Calendar(calendarEl, { //themeSystem: 'bootstrap', initialView: 'dayGridMonth', locale: 'hu', firstDay: 1, - initialEvents: res, + //initialEvents: res, + events:res, weekNumbers: true, - themeSystem: 'default' + themeSystem: 'default', + eventClick: function(info) { + alert('Event: ' + info.event.title+info.event.id+' '+info.event.extendedProps.lat+' '+info.event.extendedProps.lon); + + + // change the border color just for fun + info.el.style.borderColor = 'red'; + } }); calendar.render();