From 6bcdf70902b528039c0f615b9a487ad3708caa4a Mon Sep 17 00:00:00 2001
From: Korina Cordero <cordero.korina@gmail.com>
Date: Mon, 3 Feb 2020 11:03:52 +0000
Subject: [PATCH] Display the battery to be added to the form. #323

---
 src/Controller/BatteryController.php | 17 +++++++++++++++--
 templates/vehicle/form.html.twig     | 28 ++++++++++++++++++++--------
 2 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/src/Controller/BatteryController.php b/src/Controller/BatteryController.php
index bea9eafd..5786945f 100644
--- a/src/Controller/BatteryController.php
+++ b/src/Controller/BatteryController.php
@@ -419,7 +419,6 @@ class BatteryController extends Controller
     {
         // no access check, grant all for this ajax call
 
-        error_log($req->query->get('id'));
         // parse the id: model size
         $batt_specs = explode(" ", $req->query->get('id'));
         $bmodel_id = $batt_specs[0];
@@ -435,10 +434,24 @@ class BatteryController extends Controller
 
         $result = $query->getResult();
 
+        if (empty($result))
+            throw $this->createNotFoundException('The item does not exist');
+
+        $batteries = [];
+
         foreach ($result as $row)
         {
-            error_log('id ' . $row->getID());
+            $batteries[] = [
+                'id' => $row->getID(),
+                'model' => $row->getModel()->getName(),
+                'size' => $row->getSize()->getName(),
+                'price' => $row->getSellingPrice(),
+            ];
         }
+
+        return $this->json([
+            'data' => $batteries
+        ]);
     }
 
     // check if datatable filter is present and append to query
diff --git a/templates/vehicle/form.html.twig b/templates/vehicle/form.html.twig
index fdfa1a64..cabb658e 100644
--- a/templates/vehicle/form.html.twig
+++ b/templates/vehicle/form.html.twig
@@ -292,16 +292,28 @@ $(function() {
                 url: "{{ url('battery_get') }}",
                 data: {id: bmodelsize}
             }).done(function(response) {
-                
-            })
+                if (response.data.length > 0) {
+                    var batt = response.data[0];
 
-            // add battery to arrays
-            battModelSize.push(bmodelsize);
+                    batteryIds.push(batt.id);
+
+                    brow = {
+                        id: batt.id,
+                        model: batt.model,
+                        size: batt.size,
+                        sell_price: batt.price
+                    };
+
+                    battRows.push(brow);
             
-            // refresh the data table
-            battTable.originalDataSet = battRows;
-            battTable.reload();
-
+                    // add battery to arrays
+                    battModelSize.push(bmodelsize);
+            
+                    // refresh the data table
+                    battTable.originalDataSet = battRows;
+                    battTable.reload();
+                }
+            })
         });
 
 	// battery data table