Tankolás km ellenőrzés javítva; showAll hozzáadva

js/vehicleApi.js

@@ -229,8 +229,9 @@ exports.apiRefuelingById=asyncHandler(async (req,res)=>{
     }
     // Ez a kilométeróra állás lett e már rögzítve.
     const checkKilometer=await Vehicle.find({refueling: {$elemMatch: {kilometer:kmcounter}}})
-    if (checkKilometer)
+    if (checkKilometer.length> 0)
     {
+      
       req.flash('error',kmcounter+' Kilométeróra állás már rögzítve van!');
       res.redirect('/');
       return; 
@@ -289,17 +290,31 @@ exports.apiRefuelingById=asyncHandler(async (req,res)=>{
 // Tankolás adatainak lekérdezése
 exports.apiGetFueling=asyncHandler(async (req,res)=>{
   
-  const {id, selectedMonth}=req.params;
+  const {id, selectedMonth, showAll}=req.params;
   if (isValidObjectId(id)==false)
   {
     req.flash('error','Nem létező jármű');
     res.redirect('/');
     return;
   }
+  
   var firstDay= moment(selectedMonth,"YYYY.MM").startOf('month').toISOString();
   var lastDay = moment(selectedMonth,"YYYY.MM").endOf('month').toISOString();
   try{
-  const vehicle=await Vehicle//.findById(req.params.id).sort({dateTime:-1});
+    let vehicle=[];
+    if (showAll=='true') // Mutasd mindet
+    {
+      vehicle=await Vehicle    .aggregate([ 
+        { "$match" : { _id: mongoose.Types.ObjectId(id) } },
+        { "$unwind" : "$refueling"} , 
+   
+        { "$sort" : { "refueling.dateTime" : 1}}, 
+        { "$group" : { "refueling" : { "$push" : { "dateTime" : "$refueling.dateTime", "quantity": "$refueling.quantity","kilometer":"$refueling.kilometer","fueledHUF":"$refueling.fueledHUF"}} , "_id" : "$_id"}},
+        ])
+    }
+    else
+    {
+    vehicle=await Vehicle//.findById(req.params.id).sort({dateTime:-1});
     .aggregate([ 
     { "$match" : { _id: mongoose.Types.ObjectId(id) } },
     { "$unwind" : "$refueling"} , 
@@ -313,7 +328,7 @@ exports.apiGetFueling=asyncHandler(async (req,res)=>{
     { "$sort" : { "refueling.dateTime" : 1}}, 
     { "$group" : { "refueling" : { "$push" : { "dateTime" : "$refueling.dateTime", "quantity": "$refueling.quantity","kilometer":"$refueling.kilometer","fueledHUF":"$refueling.fueledHUF"}} , "_id" : "$_id"}},
     ])
-
+  }
     if (vehicle.length)
     {
       var refueling=vehicle[0].refueling;

routes/vehicles.js

@@ -10,7 +10,7 @@ const { apiGetVehicles, apiRefuelingById, apiGetVehicle, apiUpdateVehicle, apiOi
 
 router.route('/api/getVehicles').get(apiGetVehicles);
 router.route('/api/refueling/').post(apiRefuelingById);
-router.route('/api/fueling/:id/:selectedMonth').get(apiGetFueling);
+router.route('/api/fueling/:id/:selectedMonth/:showAll').get(apiGetFueling);
 router.route('/api/getVehicle/:id').get(apiGetVehicle);
 router.route('/api/updateVehicle/:id').post(apiUpdateVehicle);
 router.route('/api/oilchangeVehicle/:id').post(apiOilChangeVehicle);

views/Modals/modal_fuelingInfo.pug

@@ -4,7 +4,7 @@
         .modal-content
             .modal-header#fuelingHeader.bg-primary(style="background: Primary")
                 h4#vehicleId.modal-title 
-                h6#id
+                h6#id(style='display:none')
             .modal-body(style='background-color:#4f5b69')
                 .container(style='width:100%;')
                     #darktable.container
@@ -37,6 +37,12 @@
                         input.form-control(id='calcDate',name='dateEmission', tabindex='6',type='text',style='color: white;background-color:#2C3446;')
                         span.input-group-addon
                             span.glyphicon.glyphicon-calendar  
+                .form-group
+                    label.form-label(for='fasz') Mutasd mind:
+                    
+                    input#showAll(type='checkbox' data-width=84 data-height=35 data-toggle='switchbutton' checked='' data-onlabel="Havi" data-offlabel="Mind" data-onstyle="success" data-offstyle="warning")
+                            //-input#mobilePortalAccessEnabled(type='checkbox',name='mobilePortalAccessEnabled',data-onstyle="primary",value='on', data-offstyle="default", data-toggle='toggle',data-on="Be", data-off="Ki")
+                    br                          
                 button#fmodalClose.btn.btn-primary(type='button', data-dismiss='modal') Bezár
             //-button.btn.btn-primary(type='submit') Rendben
 script.
@@ -73,12 +79,37 @@ script.
               var selectedDate=$('#datetimepickerFuel').data("DateTimePicker").viewDate().format("YYYY.MM");
               $(this).find('#vehicleId').html($('<b> Tankolások: '+ getVnameFromRow  + '</b> <b style="float:right">'+getVidFromRow+'</b>' ))
               $('#id').text(getIdFromRow);
-              $.get('/vehicles/api/fueling/'+getIdFromRow+'/'+selectedDate,function(data)
+              $.get('/vehicles/api/fueling/'+getIdFromRow+'/'+selectedDate+'/false',function(data)
               {
                 createTable(data);
               })
            })  
             $(document).ready(function () {
+
+                $('#showAll').change(function() {
+
+
+                    if (!$(this).prop('checked'))
+                    {
+                        $('#datetimepickerFuel').hide();
+                        var id=$('#id').text();
+                        var selectedDate=$('#datetimepickerFuel').data("DateTimePicker").viewDate().format("YYYY.MM");
+                        $.get('/vehicles/api/fueling/'+id+'/'+selectedDate+'/true',function(data)
+                        {
+                            createTable(data);
+                        })
+                    }
+                    else 
+                    {
+                        $('#datetimepickerFuel').show();
+                        var id=$('#id').text();
+                        var selectedDate=$('#datetimepickerFuel').data("DateTimePicker").viewDate().format("YYYY.MM");
+                        $.get('/vehicles/api/fueling/'+id+'/'+selectedDate+'/false',function(data)
+                        {
+                            createTable(data);
+                        })                        
+                    }
+                })                
                 $('#datetimepickerFuel').datetimepicker({
                     locale: 'hu',
                     format: 'LD',
@@ -92,7 +123,7 @@ script.
                     //moment.locale('hu');
                     var id=$('#id').text();
                     //document.getElementById('month').innerHTML='Munkaidő lista '+moment(calcdate,'YYYY.MM').format('MMMM');
-                    $.get('/vehicles/api/fueling/'+id+'/'+calcdate,function(data)
+                    $.get('/vehicles/api/fueling/'+id+'/'+calcdate+'/false',function(data)
                     {
                         createTable(data);
                     })

views/vehicles.pug

@@ -12,10 +12,9 @@ block content
           }
         }
     link(rel='stylesheet', href='https://use.fontawesome.com/releases/v5.6.1/css/all.css', integrity='sha384-gfdkjb5BdAXd+lj+gudLWI+BXq4IuLW5IT+brZEZsLFm++aCMlF1V92rMkPaX4PP', crossorigin='anonymous')
-    link(rel='stylesheet' href='/bower_components/bootstrap/dist/css/bootstrap.css')
+    link(rel='stylesheet' href='/bower_components/bootstrap/dist/css/bootstrap.min.css')
     link(href='/bower_components/bootstrap-toggle/css/bootstrap-toggle.min.css', rel='stylesheet', type='text/css')
     link(href='https://cdn.jsdelivr.net/gh/gitbrent/bootstrap-switch-button@1.1.0/css/bootstrap-switch-button.min.css' rel='stylesheet')
-
     //-link(rel='stylesheet', href='https://cdnjs.cloudflare.com/ajax/libs/animate.css/3.5.2/animate.min.css')
     
     include Modals/modal_settings
@@ -154,8 +153,8 @@ 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(src='https://cdn.jsdelivr.net/gh/gitbrent/bootstrap-switch-button@1.1.0/dist/bootstrap-switch-button.min.js')
 
     script.
      // $(document).ready(function () {