Add filtering for inactive batteries. #733

src/Command/GenerateBatteryCompatibilityCommand.php

@@ -47,6 +47,10 @@ class GenerateBatteryCompatibilityCommand extends Command
                 $comp_batt = [];
                 foreach ($batteries as $battery)
                 {
+                    // check if battery is active
+                    if (!($battery->isActive()))
+                        continue;
+
                     // set to the first compatible battery found until a more expensive one is found
                     $comp_batt['id'] = $battery->getID();
                     $comp_batt['name'] = $battery->getModel()->getName() . ' ' . 

src/Controller/APIController.php

@@ -825,6 +825,9 @@ class APIController extends Controller implements LoggedController
         $batt_list = [];
         $batts = $vehicle->getBatteries();
         foreach ($batts as $batt)
+        {
+            // check if battery is active
+            if ($batt->isActive())
             {
                 // TODO: Add warranty_tnv to battery information
                 $batt_list[] = [
@@ -841,6 +844,7 @@ class APIController extends Controller implements LoggedController
                     'image_url' => $this->getBatteryImageURL($req, $batt),
                 ];
             }
+        }
 
         // data
         $data = [

src/Controller/TAPI/BatteryController.php

@@ -47,6 +47,9 @@ class BatteryController extends APIController
         $batt_list = [];
         $batts = $vehicle->getBatteries();
         foreach ($batts as $batt)
+        {
+            // check if battery is active
+            if ($batt->isActive())
             {
                 // TODO: Add warranty_tnv to battery information
                 $batt_list[] = [
@@ -63,6 +66,7 @@ class BatteryController extends APIController
                     'image_url' => $this->getBatteryImageURL($req, $batt),
                 ];
             }
+        }
 
         // data
         $data = [

src/Controller/VehicleController.php

@@ -496,6 +496,9 @@ class VehicleController extends Controller
 
         // get compatible batteries from selected manufacturer
         foreach ($vobj->getBatteries() as $battery)
+        {
+            // need to check if battery is active
+            if ($battery->isActive())
             {
                 $batteries[] = [
                     'id' => $battery->getID(),
@@ -509,6 +512,7 @@ class VehicleController extends Controller
                 ];
                 $battery_index[$battery->getID()] = 1;
             }
+        }
 
         // add all other batteries, because they want options
         foreach ($all_batts as $battery)

src/Service/RiderAPIHandler/ResqRiderAPIHandler.php

@@ -714,7 +714,7 @@ class ResqRiderAPIHandler implements RiderAPIHandlerInterface
         if (isset($data['error']))
             return $data;
 
-        $batts = $this->em->getRepository(Battery::class)->findAll();
+        $batts = $this->em->getRepository(Battery::class)->findBy(['flag_active' => true]);
         $models = $this->em->getRepository(BatteryModel::class)->findAll();
         $sizes = $this->em->getRepository(BatterySize::class)->findAll();
 

templates/vehicle/form.html.twig

@@ -239,7 +239,8 @@ $(function() {
                 manufacturer: "{{ batt.getManufacturer.getName|default('') }} ",
                 model: "{{ batt.getModel.getName|default('') }}",
                 size: "{{ batt.getSize.getName|default('') }}",
-                sell_price: "{{ batt.getSellingPrice }}"
+                sell_price: "{{ batt.getSellingPrice }}",
+                flag_active: "{{ batt.isActive }}"
             };
 
             battRows.push(trow);
@@ -341,6 +342,14 @@ $(function() {
 		layout: {
 			scroll: true
 		},
+                rows: {
+                    beforeTemplate: function(row, data, index) {
+                        var is_active = data.flag_active;
+                        if (is_active == false) {
+                            $(row).addClass('hide');
+                        }
+                    }
+                },
 		columns: [
 			{
 				field: 'id',