From 29ded633ba128cc5108242ceb117349f66128c86 Mon Sep 17 00:00:00 2001
From: wayanrivan <rivanwayan867@gmail.com>
Date: Tue, 7 Jul 2026 13:59:57 +0700
Subject: [PATCH] update

---
 app/Http/Controllers/ReportsController.php    | 47 ++++++++++---------
 .../menu_v1/reports/vehicle_trips.blade.php   |  4 +-
 2 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.php
index 8dea0e6..f5b135d 100644
--- a/app/Http/Controllers/ReportsController.php
+++ b/app/Http/Controllers/ReportsController.php
@@ -166,30 +166,35 @@ class ReportsController extends Controller
             //         and if(? , vt.id = ? , 1=1)
             //         and if(? , t.pool_code = ? , 1=1)
             // ", [$from_date, $to_date, $from_date, $to_date, $vid, $vid, $vt, $vt, $poolcode, $poolcode]);
-            $sql = "WITH TotalMileage AS (
-            SELECT id, SUM(mileage) AS total_mileage, count(*) total_trip
-            FROM trips
-            WHERE start BETWEEN ? AND ?
-            GROUP BY id
-        )
-        SELECT
-            t.*,
-            tm.total_mileage, total_trip,
-            vt.name as type_name,
-            ROW_NUMBER() OVER (PARTITION BY t.id ORDER BY t.start) AS trip_id,
-            -- tgt.latitude,
-            -- tgt.longitude
-        FROM trips t
+            $sql =
+            "WITH TotalMileage AS (
+                SELECT
+                    id,
+                    SUM(mileage) AS total_mileage,
+                    COUNT(*) AS total_trip
+                FROM trips
+                WHERE start BETWEEN ? AND ?
+                GROUP BY id
+            )
+            SELECT
+                t.*,
+                tm.total_mileage,
+                tm.total_trip,
+                vt.name AS type_name,
+                ROW_NUMBER() OVER (
+                    PARTITION BY t.id
+                    ORDER BY t.start
+                ) AS trip_id
+            FROM trips t
             JOIN TotalMileage tm ON t.id = tm.id
             LEFT JOIN t_vehicles tvt ON tvt.id = t.vhc_id
             LEFT JOIN t_vehicles_cats vt ON vt.id = tvt.cat_id
-            -- LEFT JOIN t_gps_tracks tgt ON t.vhc_id = tgt.vhc_id
-        WHERE
-            t.start BETWEEN ? AND ?
-            and (? IS NULL or t.id = ?)
-            and (? IS NULL or vt.id = ?)
-            and (? IS NULL or t.pool_code = ?)
-    ";
+            WHERE
+                t.start BETWEEN ? AND ?
+                AND (? IS NULL OR t.id = ?)
+                AND (? IS NULL OR vt.id = ?)
+                AND (? IS NULL OR t.pool_code = ?);
+                ";
 
             $vid = $vid ?: null;
             $vt = $vt ?: null;
diff --git a/resources/views/menu_v1/reports/vehicle_trips.blade.php b/resources/views/menu_v1/reports/vehicle_trips.blade.php
index 2a7d160..3a938e5 100644
--- a/resources/views/menu_v1/reports/vehicle_trips.blade.php
+++ b/resources/views/menu_v1/reports/vehicle_trips.blade.php
@@ -117,8 +117,8 @@
                                 <th class="hidden">Date</th>
                                 <th class="hidden">Hour Start</th>
                                 <th class="hidden">Hour Finish</th>
-                                <th class="hidden">Latitude</th>
-                                <th class="hidden">Longitude</th>
+                                {{-- <th class="hidden">Latitude</th>
+                                <th class="hidden">Longitude</th> --}}
                                 <th class="">Start</th>
                                 <th class="">Finish</th>
                                 <th class="">Duration</th>