diff --git a/js/vehicleApi.js b/js/vehicleApi.js index 975987a..54a5042 100644 --- a/js/vehicleApi.js +++ b/js/vehicleApi.js @@ -174,6 +174,50 @@ exports.apiOilChangeVehicle=asyncHandler(async (req,res) => { } })*/ +}); +// Vezérléscsere +exports.apiTimingReplacementVehicle=asyncHandler(async (req,res) => { + const {timingReplacementLast, timingReplacementDate}=req.body; + // Get errors + if (isValidObjectId(req.params.id)==false) + { + //req.flash('error','Nem létező jármű'); + res.status(400).send('Nem Létező Jármű!') + return; + } + /* if (!oilChangeDate._isAMomentObject) + { + res.status(400).send('Dátum hiba!') + return; + }*/ + try{ + await Vehicle.findByIdAndUpdate(req.params.id, + {$push:{timingReplacementLast:{ + dateTime: Date.parse(timingReplacementDate), + kilometer:timingReplacementLast} + } + }) + res.status(200).send('Sikeres rögzítés') + } + catch(e) + { + res.status(500).send(e.message) + } + /*Vehicle.findByIdAndUpdate(req.params.id,{ + oilChangeLast: req.body.oilChangeLast + },function(err,docs){ + if (err){ + console.log(err) + } + else{ + console.log("Updated Vehicle : ", docs); + + console.log('Jármű sikeresen módosítva'); + //res.redirect('/vehicles/view'); + res.status(200).send('Sikeres rögzítés') + } + })*/ + }); // JSON Legnagyobb érték a tömbben function getTopN(arr, prop, n) { diff --git a/models/vehicle.js b/models/vehicle.js index ca154bf..ec49e14 100644 --- a/models/vehicle.js +++ b/models/vehicle.js @@ -19,6 +19,13 @@ const vehicleSchema=new mongoose.Schema({ kilometer:{type: Number,require:true,default: 0}, dateTime:{type: Date,require: true}, }], + // Vezérlés csere + timingReplacementInterval:{type: Number,require:true,default: 50000}, + timingReplacementRemainingKm:{type: Number,require:true,default: 0}, + timingReplacementLast:[{ + kilometer:{type: Number,require:true,default: 0}, + dateTime:{type: Date,require: true}, + }], /* service: [ { dateTime_Start:{type: Date,require: true}, diff --git a/public/css/style.css b/public/css/style.css index d2dcd28..e2a1a61 100644 --- a/public/css/style.css +++ b/public/css/style.css @@ -26,4 +26,4 @@ margin-left: 5%; width: 90%; -} \ No newline at end of file +} diff --git a/routes/vehicles.js b/routes/vehicles.js index 9d6b42c..b41fdf0 100644 --- a/routes/vehicles.js +++ b/routes/vehicles.js @@ -5,7 +5,7 @@ const moment = require('moment'); var utils = require('../js/utils'); let Vehicle = require('../models/vehicle.js'); const fullCalendar=require('../node_modules/fullcalendar'); -const { apiGetVehicles, apiRefuelingById, apiGetVehicle, apiUpdateVehicle, apiOilChangeVehicle, apiGetFueling, apiGetSettings, apiUpdateSettings } = require('../js/vehicleApi'); +const { apiGetVehicles, apiRefuelingById, apiGetVehicle, apiUpdateVehicle, apiOilChangeVehicle, apiGetFueling, apiGetSettings, apiUpdateSettings, apiTimingReplacementVehicle } = require('../js/vehicleApi'); router.route('/api/getVehicles').get(apiGetVehicles); @@ -16,6 +16,7 @@ router.route('/api/updateVehicle/:id').post(apiUpdateVehicle); router.route('/api/oilchangeVehicle/:id').post(apiOilChangeVehicle); router.route('/api/settings/:keyName').get(apiGetSettings); router.route('/api/settings').post(apiUpdateSettings); +router.route('/api/timingReplacementVehicle/:id').post(apiTimingReplacementVehicle); // Edit Vehicle router.get('/edit/:id', utils.ensureAuthenticated,function (req,res) { Vehicle.findById(req.params.id, function(err,vehicle) diff --git a/views/Modals/modal_fuelingInfo.pug b/views/Modals/modal_fuelingInfo.pug index 82865dc..9bcb0b3 100644 --- a/views/Modals/modal_fuelingInfo.pug +++ b/views/Modals/modal_fuelingInfo.pug @@ -1,4 +1,4 @@ -#fuelingModal.modal(tabindex='-1', role='dialog', aria-labelledby='fuelingModalLabel', aria-hidden='true') +#fuelingModal.fade.modal(tabindex='-1', role='dialog', aria-labelledby='fuelingModalLabel', aria-hidden='true') //-form(method='GET',id='holidayForm' action='/employee/holidays_byperson/') .modal-dialog(role='document', style='width:1000px;') .modal-content diff --git a/views/Modals/modal_map.pug b/views/Modals/modal_map.pug index f901f74..22a7f12 100644 --- a/views/Modals/modal_map.pug +++ b/views/Modals/modal_map.pug @@ -8,8 +8,8 @@ //-form(method='GET',id='holidayForm' action='/employee/holidays_byperson/') .modal-dialog(role='document', style='width:720px') .modal-content - .modal-header#oilChangeHeader.bg-primary(style="background: Primary") - h4#vehicleId.modal-title A + .modal-header#mapModalHeader.bg-primary(style="background: Primary") + h4#vehicleIdMap.modal-title Arc .modal-body(style='background-color:#4f5b69') .container(style='width:100%;') #darktable.container @@ -23,15 +23,16 @@ //script(src='https://unpkg.com/lightpick@latest/lightpick.js') script. - //- Olajcsere modal - $('#mapModal').on('show.bs.modal', function () { + //- Trackinginfo modal + $(document).on('show.bs.modal','#mapModal', function () { + console.log('modal') $(this).find('form').trigger('reset'); var getIdFromRow = $(event)[0].currentTarget.activeElement.getAttribute('data-id')//$(event.target).closest('tr').data('id'); var getVidFromRow = $(event)[0].currentTarget.activeElement.getAttribute('data-vid');//$(event.target).closest('tr').data('vid'); var getVnameFromRow = $(event)[0].currentTarget.activeElement.getAttribute('data-name');//$(event.target).closest('tr').data('name'); - $('#vehicleId').val(getIdFromRow); + $('#vehicleIdMap').val(getIdFromRow); //-$("#fuelingHeader").html(getIdFromRow); - $(this).find('#vehicleId').html($(' Olaj csere: '+ getVnameFromRow + ' '+getVidFromRow+'' )) + $(this).find('#vehicleIdMap').html($(' Olaj csere: '+ getVnameFromRow + ' '+getVidFromRow+'' )) $.get('/vehicles/api/getVehicle/'+getIdFromRow,function(data) { console.log(data.name) diff --git a/views/Modals/modal_oilChange.pug b/views/Modals/modal_oilChange.pug index 8f54ff4..c411eb8 100644 --- a/views/Modals/modal_oilChange.pug +++ b/views/Modals/modal_oilChange.pug @@ -1,5 +1,5 @@ link(rel='stylesheet', type='text/css', href='https://unpkg.com/lightpick@latest/css/lightpick.css') -#oilChangeModal.modal(tabindex='-1', +#oilChangeModal.fade.modal(tabindex='-1', role='dialog', aria-labelledby='oilChangeModalLabel', aria-hidden='true', @@ -9,7 +9,7 @@ link(rel='stylesheet', type='text/css', href='https://unpkg.com/lightpick@latest .modal-dialog(role='document', style='width:720px') .modal-content .modal-header#oilChangeHeader.bg-primary(style="background: Primary") - h4#vehicleId.modal-title A + h4#vehicleId.modal-title Olaj csere időpontok .modal-body(style='background-color:#4f5b69') .container(style='width:100%;') #darktable.container @@ -32,14 +32,16 @@ link(rel='stylesheet', type='text/css', href='https://unpkg.com/lightpick@latest button.btn.btn-primary(type='button', data-dismiss='modal') i.fa.fa-arrow-left | | Bezár - button.btn.btn-primary(data-toggle='modal',data-target='#oilChangeNewModal',style='width:40px;',type='button') + button.btn.btn-primary(data-toggle='modal',data-dismiss='modal',data-target='#oilChangeNewModal',style='width:40px;',type='button') i.fa.fa-tint - script(type='text/javascript', src='/bower_components/moment/min/moment.min.js') - script(src='https://unpkg.com/lightpick@latest/lightpick.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') script. - $(document).ready(function() { + $(document).on('show.bs.modal','#oilChangeModal', function () { // Generate Table + var createOilChangeTable=function (data){ var sum=0; var consumption=0; @@ -57,7 +59,8 @@ script. } } //- Olajcsere modal - $('#oilChangeModal').on('show.bs.modal', function () { + // $('#oilChangeModal').on('show.bs.modal', function () { + $(this).find('form').trigger('reset'); var getIdFromRow = $(event)[0].currentTarget.activeElement.getAttribute('data-id')//$(event.target).closest('tr').data('id'); var getVidFromRow = $(event)[0].currentTarget.activeElement.getAttribute('data-vid');//$(event.target).closest('tr').data('vid'); @@ -71,7 +74,12 @@ script. $('#oilChangeLast').val(data.oilChangeLast); }) - }) + // }) + }) + $(document).ready( + function() { + } + ); \ No newline at end of file diff --git a/views/Modals/modal_oilChangeNew.pug b/views/Modals/modal_oilChangeNew.pug index 272b5de..5181458 100644 --- a/views/Modals/modal_oilChangeNew.pug +++ b/views/Modals/modal_oilChangeNew.pug @@ -1,5 +1,5 @@ link(rel='stylesheet', type='text/css', href='https://unpkg.com/lightpick@latest/css/lightpick.css') -#oilChangeNewModal.modal(tabindex='-1', +#oilChangeNewModal.fade.modal(tabindex='-1', role='dialog', aria-labelledby='oilChangeModalLabel', aria-hidden='true', @@ -119,7 +119,7 @@ script. $.get('/vehicles/api/getVehicles',function(data) { data.forEach((element)=>{ - console.log(element.vehicle_id+' '+element.name) + //console.log(element.vehicle_id+' '+element.name) $('#select-vehicle').append(''); }) } diff --git a/views/Modals/modal_settings.pug b/views/Modals/modal_settings.pug index fe0cc24..54ce936 100644 --- a/views/Modals/modal_settings.pug +++ b/views/Modals/modal_settings.pug @@ -1,4 +1,4 @@ -#settingsModal.modal(tabindex='-1', role='dialog', aria-labelledby='settingsModalLabel', aria-hidden='true') +#settingsModal.fade.modal(tabindex='-1', role='dialog', aria-labelledby='settingsModalLabel', aria-hidden='true') //-form(method='GET',id='holidayForm' action='/employee/holidays_byperson/') .modal-dialog(role='document', style='width:1000px') .modal-content diff --git a/views/Modals/modal_timingReplacementNew.pug b/views/Modals/modal_timingReplacementNew.pug new file mode 100644 index 0000000..0d0dc07 --- /dev/null +++ b/views/Modals/modal_timingReplacementNew.pug @@ -0,0 +1,143 @@ +link(rel='stylesheet', type='text/css', href='https://unpkg.com/lightpick@latest/css/lightpick.css') +#timingReplacementNewModal.fade.modal(tabindex='-1', + role='dialog', + aria-labelledby='timingReplacementModalLabel', + aria-hidden='true', + + ) + //-form(method='GET',id='holidayForm' action='/employee/holidays_byperson/') + .modal-dialog(role='document', style='width:720px') + .modal-content + .modal-header#timingReplacementHeader.bg-primary(style="background: Primary") + h4#vehicleIdoc.modal-title Vezérlés csere felvitele + .modal-body(style='background-color:#4f5b69') + .container(style='width:100%;') + .form-group + label.form-label(for='timingReplacementPicker',style='color:white') Vezérlés csere időpontja + .input-group + input.form-control(id='timingReplacementPicker',required,placeholder='Vezérlés csere időpontja',name='timingReplacementPicker',type=text, tabindex='2',readonly,style='background-color:#c9ddfc;') + span.input-group-addon + span.glyphicon.glyphicon-calendar + br + .row + .col-sm-6 + .form-group + input#vehicleIdTR.form-control(name='vehicleIdTR',type=text,readonly,required, style='display:none;') + label.form-label(for='select-vehicleTR',style='color:white') Rendszám + select#select-vehicleTR.form-control(required,data-live-search='true') + option.selected.disabled(data-tokens='') Válasszon járművet + .col-sm-6 + .form-group + label.form-label(for='select-vehicleTR',style='color:white') Kilométeróra állás + .input-group + span.input-group-addon.transparent + span.glyphicon.glyphicon-dashboard + input#timingReplacementKilometer.form-control(name="timingReplacementKilometer" placeholder='Óra állás olajcsere után' min=0 type='number') + p.help-block.hidden Please enter a name 3 characters or more. + + + .modal-footer(style="background-color: #2C3446") + button.btn.btn-primary(type='button', data-dismiss='modal') + i.fa.fa-arrow-left + | | Bezár + button#timingReplacementSave.btn.btn-primary(type='button' ) + i.fa.fa-save + | | Mentés + //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') + +script. + $(document).ready( + function() { + //- Vezérlés csere modal + $('#timingReplacementNewModal').on('show.bs.modal', function () { + $('#timingReplaceModal').modal().hide(); + var getIdFromRow = $('#vehicleIdTR').val() + if (getIdFromRow) // Ha kaptunk Id-t Kiválasztjuk a listából! + { + $.get('/vehicles/api/getVehicle/'+getIdFromRow,function(data) + { + $('#vehicleIdoc').html($(' Olaj csere: '+ data.name + ' '+data.vehicle_id+'' )) + $('#select-vehicleTR').val(getIdFromRow); + $('#select-vehicleTR').attr('disabled',true) + }) + } + else + { + $('#select-vehicleTR').attr('disabled',false) + } + $(this).find('form').trigger('reset'); + $(this).find('#vehicleIdoc').html($('Vezérlés csere hozzáadás '+'' )) + //- Mentés + }) + $( "#timingReplacementSave" ).click(function() { + + event.preventDefault(); + //-validate name + var th=$(this); + var timingReplacementKilometer = $('#timingReplacementKilometer').val(); + var timingReplacementLast=$('#timingReplacementLast').val(); + var timingReplacementDate=pickerTR.getDate(); + const editId = $('#select-vehicleTR').val(); + if (timingReplacementKilometer.length < 4) { + return showErrorSuccess($('#timingReplacementKilometer'), false, 'Legalláb 4 karakter!'); + } + if (timingReplacementKilometer<=timingReplacementLast) { + return showErrorSuccess($('#timingReplacementKilometer'), false, 'Az olajcsere óra állása nem lehet kisebb, mint az előző!'); + } + //- disable button + $(this).prop("disabled", true); + //- add spinner to button + $(this).html(' Várjon!'); + showErrorSuccess($('#timingReplacementKilometer')); + $.post( "/vehicles/api/timingReplacementVehicle/"+editId, { timingReplacementLast:timingReplacementKilometer,timingReplacementDate:timingReplacementDate.toISOString()}) + .done(function( data ) { + // disable button + th.prop("disabled", false); + // add spinner to buttoni.fa.fa-save + th.html(' Mentés'); + $('.modal-backdrop').remove() + $('#timingReplacementNewModal').hide(); + + }).fail(function(xhr,status,error){ + alert( "Hiba: " + xhr.responseText ); + // disable button + th.prop("disabled", false); + // add spinner to buttoni.fa.fa-save + th.html(' Mentés'); + }) + + }); + $('#select-vehicleTR').empty(); + $('#select-vehicleTR').on('change',function() { + var id=$(this).val(); + + $.get('/vehicles/api/getVehicle/'+id,function(data) + { + $('#vehicleIdoc').html($(' Olaj csere: '+ data.name + ' '+data.vehicle_id+'' )) + }) + }); + $('#select-vehicleTR').append(''); + $.get('/vehicles/api/getVehicles',function(data) + { + data.forEach((element)=>{ + //console.log(element.vehicle_id+' '+element.name) + $('#select-vehicleTR').append(''); + }) + } + ) + var pickerTR = new Lightpick({ field: document.getElementById('timingReplacementPicker'), + singleDate: true, + inline: false, + //numberOfColumns: 2, + //numberOfMonths: 4, + format: 'YYYY.MM.DD', + disableWeekends: false, + maxDate: moment(), + //maxDays: remaining, + //disableDates: [['21.09.2020', '22.09.2020'], ['24.09.2020', '25.09.2020']], + + + }); + }) \ No newline at end of file diff --git a/views/Modals/modal_timingReplacements.pug b/views/Modals/modal_timingReplacements.pug new file mode 100644 index 0000000..0b74f81 --- /dev/null +++ b/views/Modals/modal_timingReplacements.pug @@ -0,0 +1,85 @@ +link(rel='stylesheet', type='text/css', href='https://unpkg.com/lightpick@latest/css/lightpick.css') +#timingReplaceModal.fade.modal(tabindex='-1', + role='dialog', + aria-labelledby='timingReplaceModalLabel', + aria-hidden='true', + + ) + //-form(method='GET',id='holidayForm' action='/employee/holidays_byperson/') + .modal-dialog(role='document', style='width:720px') + .modal-content + .modal-header#timingReplaceHeader.bg-primary(style="background: Primary") + h4#vehicleId.modal-title Olaj csere időpontok + .modal-body(style='background-color:#4f5b69') + .container(style='width:100%;') + #darktable.container + table#timingReplaceTable(style='width:100%;') + col(width='2%') + col(width='10%') + col(width='10%') + + thead + tr + th + h1(style='text-align:right') # + th + h1(style='text-align:center') Időpont + th + h1(style='text-align:center') Kilométer óra állás + tbody + + .modal-footer(style="background-color: #2C3446") + button.btn.btn-primary(type='button', data-dismiss='modal') + i.fa.fa-arrow-left + | | Bezár + button.btn.btn-primary(data-toggle='modal',data-dismiss='modal',data-target='#timingReplacementNewModal',style='width:40px;',type='button') + i.fa.fa-cogs + //-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') + +script. + $(document).on('show.bs.modal','#timingReplaceModal', function () { + // Generate Table + + var createtimingReplaceTable=function (data){ + var sum=0; + var consumption=0; + $('#timingReplaceTable > tbody').empty(); + if (data) + { + $.each(data.timingReplacementLast,function(i,el){ + var newRow=$('"'+//); + ''+(i+1)+''+ + ''+moment(el.dateTime).format("YYYY.MM.DD")+''+ + ''+el.kilometer.toLocaleString('hu-HU')+' km'+''+ + ''); + $('#timingReplaceTable > tbody:last-child').append (newRow); + }) + } + } + //- Olajcsere modal + // $('#timingReplaceModal').on('show.bs.modal', function () { + + $(this).find('form').trigger('reset'); + var getIdFromRow = $(event)[0].currentTarget.activeElement.getAttribute('data-id')//$(event.target).closest('tr').data('id'); + var getVidFromRow = $(event)[0].currentTarget.activeElement.getAttribute('data-vid');//$(event.target).closest('tr').data('vid'); + var getVnameFromRow = $(event)[0].currentTarget.activeElement.getAttribute('data-name');//$(event.target).closest('tr').data('name'); + $('#vehicleId').val(getIdFromRow); + //-$("#fuelingHeader").html(getIdFromRow); + $(this).find('#vehicleId').html($(' Olaj csere: '+ getVnameFromRow + ' '+getVidFromRow+'' )) + $.get('/vehicles/api/getVehicle/'+getIdFromRow,function(data) + { + createtimingReplaceTable(data) + $('#timingReplaceLast').val(data.timingReplacementLast); + }) + + // }) + }) + $(document).ready( + function() { + + + } + ); + \ No newline at end of file diff --git a/views/index.pug b/views/index.pug index 38c24fc..65cb405 100644 --- a/views/index.pug +++ b/views/index.pug @@ -22,6 +22,7 @@ block content display:inline-block; } include Modals/modal_oilChangeNew + include Modals/modal_timingReplacementNew #refuelModal.modal(tabindex='-1', role='dialog', aria-labelledby='refuelModalLabel', aria-hidden='true') form(method='POST',id='refuelForm' data-toggle="validator" role="form" action='/vehicles/api/refueling/') .modal-dialog(role='document', style='width:620px') @@ -81,8 +82,10 @@ block content a.btn.btn-primary.col-sm-1(type='button',href='/gantt',value='Idővonal') Idővonal a.btn.btn-warning.col-sm-1(type='button',href='#',data-toggle='modal', data-target='#refuelModal') Tankolás - button.btn.btn-primary(data-toggle='modal',data-target='#oilChangeNewModal',style='width:40px;',type='button') + button.btn.btn-primary(data-toggle='modal',data-target='#oilChangeNewModal',title='Olajcsere felvitele',style='width:40px;',type='button') i.fa.fa-tint + button.btn.btn-primary(data-toggle='modal',data-target='#timingReplacementNewModal',title='Vezérlés csere',style='width:40px;',type='button') + i.fa.fa-cogs a.btn.btn-primary.col-sm-1(id='print',name='print',type='button') span.glyphicon.glyphicon-print(aria-hidden='true') | Nyomtat @@ -229,6 +232,16 @@ block content $('#refuelModal').on('shown', function () { $(this).find('form').trigger('reset'); }) + var showErrorSuccess = function(element, status, message) { + if (status === false) { + element.next().removeClass('hidden')//.parent().addClass('has-error'); + element.parent().addClass('has-error'); + element.parent().next().text(message) + return false; + } + element.next().addClass('hidden')//.parent().removeClass('has-error').addClass('has-success'); + element.parent().removeClass('has-error'); + }; $(function () { //$('#refuelForm').validator() $('#select-country').on('click',function() { diff --git a/views/layout_vehicles.pug b/views/layout_vehicles.pug index 3569dbd..ffd2d20 100644 --- a/views/layout_vehicles.pug +++ b/views/layout_vehicles.pug @@ -6,30 +6,33 @@ html script(src='/bower_components/bootstrap/dist/js/bootstrap.js') link(rel='stylesheet' href='/bower_components/bootstrap/dist/css/bootstrap.css') - //link(rel='stylesheet', href='https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css', integrity='sha384-MCw98/SFnGE8fJT3GXwEOngsV7Zt27NXFoaoApmYm81iuXoPkFOJwJ8ERdknLPMO', crossorigin='anonymous') + //-link(rel='stylesheet', href='https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css', integrity='sha384-MCw98/SFnGE8fJT3GXwEOngsV7Zt27NXFoaoApmYm81iuXoPkFOJwJ8ERdknLPMO', crossorigin='anonymous') link(href='//maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css', rel='stylesheet') - //script(type='text/javascript', src='/bower_components/jquery/dist/jquery.min.js') + //-script(type='text/javascript', src='/bower_components/jquery/dist/jquery.min.js') link(rel='stylesheet', href='/bower_components/bootstrap/dist/css/bootstrap.min.css') link(rel='stylesheet', href='/bower_components/eonasdan-bootstrap-datetimepicker/build/css/bootstrap-datetimepicker.min.css') link(rel='stylesheet', href='//maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css') - //script(src='https://code.jquery.com/jquery-3.3.1.slim.min.js', integrity='sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo', crossorigin='anonymous') + //-script(src='https://code.jquery.com/jquery-3.3.1.slim.min.js', integrity='sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo', crossorigin='anonymous') script(src='https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js', integrity='sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49', crossorigin='anonymous') - //script(src='https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/js/bootstrap.min.js', integrity='sha384-ChfqqxuZUCnJSK3+MXmPNIyE6ZbWh2IMqE241rYiqJxyMiZ6OW/JmZQ5stwEULTy', crossorigin='anonymous') + //-script(src='https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/js/bootstrap.min.js', integrity='sha384-ChfqqxuZUCnJSK3+MXmPNIyE6ZbWh2IMqE241rYiqJxyMiZ6OW/JmZQ5stwEULTy', crossorigin='anonymous') - //link(rel='stylesheet' href='/css/style.css') - //link(rel='stylesheet' href='/css/switch.css') - //link(rel='stylesheet' href='/css/switchsmall.css') - //link(rel='stylesheet' href='/css/checkmark.css') + //-link(rel='stylesheet' href='/css/style.css') + //-link(rel='stylesheet' href='/css/switch.css') + //-link(rel='stylesheet' href='/css/switchsmall.css') + //-link(rel='stylesheet' href='/css/checkmark.css') link(rel='stylesheet' href='/css/table.css') link(rel='stylesheet', href='/css/sidebar.css') link(rel='stylesheet' href='/bower_components/jquery-typeahead/dist/jquery.typeahead.min.css') link(rel='stylesheet' href='/css/darktable.css') - //link(rel='stylesheet' href='/css/infopanel.css') + //-link(rel='stylesheet' href='/css/infopanel.css') style. div.a { text-indent: 50px; } - + .modal-body { + max-height:600px; + overflow-y: auto; + } body nav.nav-side-menu @@ -81,7 +84,7 @@ html hr footer p(style='margin-left:10px;') IO-Technic Hungary Copyright © 2018 - //#picsa + //-#picsa script(type='text/javascript',src='/bower_components/jquery/dist/jquery.js') script(type='text/javascript',src='/js/datepicker.js') @@ -90,10 +93,10 @@ script(type='text/javascript',src='/js/datepicker.js') script(src='https://maxcdn.bootstrapcdn.com/bootstrap/3.3.1/js/bootstrap.min.js') script(type='text/javascript', src='/bower_components/moment/min/moment.min.js') script(src='/bower_components/moment/min/moment-with-locales.js') - //script(type='text/javascript', src='/bower_components/bootstrap/dist/js/bootstrap.min.js') + //-script(type='text/javascript', src='/bower_components/bootstrap/dist/js/bootstrap.min.js') script(type='text/javascript', src='/bower_components/eonasdan-bootstrap-datetimepicker/build/js/bootstrap-datetimepicker.min.js') - //script(type='text/javascript',src='/js/invoice.js') - //script(type='text/javascript',src='/js/datepicker.js') + //-script(type='text/javascript',src='/js/invoice.js') + //-script(type='text/javascript',src='/js/datepicker.js') script(src='https://cdn.jsdelivr.net/npm/fullcalendar/index.global.min.js') script(type='text/javascript',src='/build/pdfmake.js') diff --git a/views/vehicles.pug b/views/vehicles.pug index 41f97cd..daf63df 100644 --- a/views/vehicles.pug +++ b/views/vehicles.pug @@ -22,7 +22,9 @@ block content include Modals/modal_oilChange include Modals/modal_oilChangeNew include Modals/modal_map - #vehicleModal.modal(tabindex='-1', role='dialog', aria-labelledby='vehicleModalLabel', aria-hidden='true') + include Modals/modal_timingReplacementNew + include Modals/modal_timingReplacements + #vehicleModal.fade.modal(tabindex='-1', role='dialog', aria-labelledby='vehicleModalLabel', aria-hidden='true') //-form(method='GET',id='holidayForm' action='/employee/holidays_byperson/') .modal-dialog(role='document', style='width:720px') .modal-content @@ -38,7 +40,7 @@ block content //-button.btn.btn-primary(type='submit') Rendben - #vehicleEditModal.modal(tabindex='-1', role='dialog', aria-labelledby='vehicleEditModalLabel', aria-hidden='true') + #vehicleEditModal.fade.modal(tabindex='-1', role='dialog', aria-labelledby='vehicleEditModalLabel', aria-hidden='true') //-form(method='GET',id='holidayForm' action='/employee/holidays_byperson/') .modal-dialog(role='document', style='width:720px') .modal-content @@ -93,12 +95,13 @@ block content #darktable.container table#vehicleTable(style='width:100%;') col(width='5%') - col(width='20%') + col(width='15%') col(width='8%') col(width='10%') col(width='6%') col(width='6%') col(width='6%') + col(width='6%') col(width='8%') col(width='auto') col(width='8%') @@ -119,6 +122,8 @@ block content h1(style='text-align:center') Tankolások th h1(style='text-align:center') Olajcsere + th + h1(style='text-align:center') Vezérlés th h1(style='text-align:center') Esedékes Olajcsere th @@ -145,6 +150,9 @@ block content td(style='text-align:center') button.btn.btn-primary(data-id=vehicle._id, data-vid=vehicle.vehicle_id,data-name=vehicle.name,data-toggle='modal', data-target='#oilChangeModal',style='width:40px;',type='button') i.fa.fa-tint + td(style='text-align:center') + button.btn.btn-primary(data-id=vehicle._id, data-vid=vehicle.vehicle_id,data-name=vehicle.name,data-toggle='modal', data-target='#timingReplaceModal',style='width:40px;',type='button') + i.fa.fa-cogs td(style='text-align:center') #{vehicle.oilChangeRemainingKm} km if (vehicle.lastCity.length>0) td(style='text-align:center; font-size: 12px') #{lastPos=vehicle.lastCity.at(-1).city} #{moment(vehicle.lastCity.at(-1).timestamp).format("YYYY.MM.DD HH:mm")} @@ -153,7 +161,7 @@ block content td(style='text-align:center') button.btn.btn-success(data-id=vehicle._id, data-vid=vehicle.vehicle_id,data-name=vehicle.name,data-toggle='modal', data-target='#vehicleEditModal',style='width:40px;',type='button') i.fa.fa-edit - //script(type='text/javascript', src='/bower_components/bootstrap-toggle/js/bootstrap-toggle.min.js') + //-script(type='text/javascript', src='/bower_components/bootstrap-toggle/js/bootstrap-toggle.min.js') script(src='https://cdn.jsdelivr.net/gh/gitbrent/bootstrap-switch-button@1.1.0/dist/bootstrap-switch-button.min.js') script. @@ -213,7 +221,10 @@ block content }*/ // Szerkesztés modal - $('#vehicleEditModal').on('show.bs.modal', function () { + $(document).on('show.bs.modal','#vehicleEditModal', function () { + //$('#vehicleEditModal').on('show.bs.modal', function () { + console.log('PICSA!'); + //$(document).on('show.bs.modal','#vehicleEditModal', function () { var getIdFromRow = $(event)[0].currentTarget.activeElement.getAttribute('data-id')//$(event.target).closest('tr').data('id'); var getVidFromRow = $(event)[0].currentTarget.activeElement.getAttribute('data-vid');//$(event.target).closest('tr').data('vid'); var getVnameFromRow = $(event)[0].currentTarget.activeElement.getAttribute('data-name');//$(event.target).closest('tr').data('name');