diff --git a/src/Controller/ReportController.php b/src/Controller/ReportController.php index 99c7bcb0..75bdc2b4 100644 --- a/src/Controller/ReportController.php +++ b/src/Controller/ReportController.php @@ -636,6 +636,11 @@ class ReportController extends Controller // csv output $csv_handle = fopen('php://output', 'w+'); fputcsv($csv_handle, [ + 'Vehicle Manufacturer', + 'Vehicle Make', + 'Battery Manufacturer', + 'Battery Model', + 'Battery Size', ]); foreach ($data as $row) { @@ -961,6 +966,38 @@ class ReportController extends Controller { $results = []; + $conn = $em->getConnection(); + $sql = 'SELECT vm.name AS vm_name, v.make, + bm.name AS bm_name, bmodel.name AS bmodel_name, + bsize.name AS bsize_name + FROM vehicle_manufacturer vm, vehicle v, battery_vehicle bv, + battery b, battery_manufacturer bm, battery_model bmodel, + battery_size bsize + WHERE vm.id = v.manufacturer_id + AND v.id = bv.vehicle_id + AND bv.battery_id = b.id + AND b.manufacturer_id = bm.id + AND b.model_id = bmodel.id + AND b.size_id = bsize.id + ORDER BY vm.name, v.make'; + + $stmt = $conn->prepare($sql); + $stmt->execute(); + + $query_results = $stmt->fetchAll(); + + foreach($query_results as $row) + { + $results[] = [ + 'vehicle_manufacturer' => $row['vm_name'], + 'vehicle_make' => $row['make'], + 'battery_manufacturer' => $row['bm_name'], + 'battery_model' => $row['bmodel_name'], + 'battery_size' => $row['bsize_name'], + ]; + } + + return $results; } }