update latitude and longitude for trips

app/Http/Controllers/ReportsController.php

@@ -178,6 +178,10 @@ class ReportsController extends Controller
             )
             SELECT
                 t.*,
+                ttll.start_latitude,
+                ttll.start_longitude,
+                ttll.finish_latitude,
+                ttll.finish_longitude,
                 tm.total_mileage,
                 tm.total_trip,
                 vt.name AS type_name,
@@ -189,6 +193,7 @@ class ReportsController extends Controller
             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_trips_latitude_longitude ttll ON t.id = ttll.tripsid
             WHERE
                 t.start BETWEEN ? AND ?
                 AND (? IS NULL OR t.id = ?)

resources/views/menu_v1/reports/vehicle_trips.blade.php

@@ -472,9 +472,25 @@
                             render: (data, type, row, meta) => {
                                 // saat export, hanya tampilkan lokasi tanpa tanggal/jam
                                 if (type === 'export') {
+                                    const nearestSite = findNearestSite(
+                                        row.start_latitude,
+                                        row.start_longitude
+                                    );
+
+                                    if (nearestSite) {
+                                        return formatSiteLabel(nearestSite);
+                                    }
                                     return Helper.shortenText(decodeURIComponent(row.startLoc ||
                                         'address'), 255) || "-";
                                 }
+                                const nearestSite = findNearestSite(
+                                    row.start_latitude,
+                                    row.start_longitude
+                                );
+
+                                if (nearestSite) {
+                                    return formatSiteLabel(nearestSite);
+                                }
                                 return `
 								${moment.unix(data + AppState.TIMEFIX).format('DD MMM YYYY HH:mm:ss')}<br>
 								${Helper.shortenText(decodeURIComponent(row.startLoc || 'address'), 255) || "-"}
@@ -507,14 +523,14 @@
                                 // Saat export Excel
                                 if (type === 'export') {
 
-                                    // const nearestSite = findNearestSite(
+                                    const nearestSite = findNearestSite(
-                                    //     row.latitude,
+                                        row.finish_latitude,
-                                    //     row.longitude
+                                        row.finish_longitude
-                                    // );
+                                    );
 
-                                    // if (nearestSite) {
+                                    if (nearestSite) {
-                                    //     return formatSiteLabel(nearestSite);
+                                        return formatSiteLabel(nearestSite);
-                                    // }
+                                    }
 
                                     return Helper.shortenText(
                                         decodeURIComponent(row.finishLoc || 'address'),
@@ -522,6 +538,15 @@
                                     ) || '-';
                                 }
 
+                                const nearestSite = findNearestSite(
+                                    row.finish_latitude,
+                                    row.finish_longitude
+                                );
+
+                                if (nearestSite) {
+                                    return formatSiteLabel(nearestSite);
+                                }
+
                                 // Tampilan di tabel
                                 return `
             ${moment.unix(data + AppState.TIMEFIX)

resources/views/template/navbar.blade.php

@@ -75,6 +75,7 @@
 					auth()->user()->can('config_distribution_category.view') ||
 					auth()->user()->can('config_pool.view') ||
 					auth()->user()->can('user_logs.view')
+                    || auth()->user()->can('config_vehicle_maintenance_type.view')
 				)
                     <li class="nav-item dropdown {{ Request::segment(1) == 'config' ? 'active' : '' }}">
                         <a class="nav-link dropdown-toggle" href="#" id="dropdownConfig" role="button" data-bs-toggle="dropdown" aria-expanded="false">
@@ -86,6 +87,11 @@
                                     <a class="dropdown-item {{ Request::segment(2) == 'truck_types' ? 'active' : '' }}" href="{{ route('view_config_truck_types') }}" title="">Vehicle Type</a>
                                 </li>
                             @endcan
+                            @can('vehicle_maintenance_type.view')
+                                <li>
+                                    <a class="dropdown-item {{ Request::segment(2) == 'maintenance_type' ? 'active' : '' }}" href="{{ route('view_vehicle_maintenance_type') }}" title="">Maintenance Type</a>
+                                </li>
+                            @endcan
                             @can('config_master_device.view')
                                 <li>
                                     <a class="dropdown-item {{ Request::segment(2) == 'devices' ? 'active' : '' }}" href="{{ route('view_config_devices') }}" title="">Master Devices</a>

routes/web.php

@@ -141,6 +141,10 @@ Route::middleware(["auth", "auth.user"])->group(function () {
         ->name("view_config_truck_types")
         ->middleware("permission:config_truck_type.view");
 
+    Route::get("/config/maintenance_type", "VehicleMaintenanceController@view_vehicle_maintenance_type")
+        ->name("view_vehicle_maintenance_type")
+        ->middleware("permission:vehicle_maintenance_type.view");
+
     Route::get("/config/devices", "DevicesController@view_devices")
         ->name("view_config_devices")
         ->middleware("permission:config_master_device.view");
@@ -611,6 +615,24 @@ Route::middleware(["auth", "auth.user"])->group(function () {
         "api_conf_del_truck_type"
     );
 
+    Route::get("/api/conf/maintenance_type/{id}", "VehicleMaintenanceController@api_show_maintenance_type")->name(
+        "api_show_maintenance_type"
+    );
+
+    Route::get("/api/conf/maintenance_type", "VehicleMaintenanceController@api_list_vehicle_maintenance_type")->name(
+        "api_list_vehicle_maintenance_type"
+    );
+
+    Route::post("/api/conf/maintenance_type", "VehicleMaintenanceController@api_add_vehicle_maintenance_type")->name(
+        "api_add_vehicle_maintenance_type"
+    );
+    Route::put("/api/conf/maintenance_type/{id}", "VehicleMaintenanceController@api_edit_vehicle_maintenance_type")->name(
+        "api_edit_vehicle_maintenance_type"
+    );
+    Route::delete("/api/conf/maintenance_type/{id}", "VehicleMaintenanceController@api_del_vehicle_maintenance_type")->name(
+        "api_del_vehicle_maintenance_type"
+    );
+
     Route::get("/api/devices", "DevicesController@api_list_devices")->name("api_list_devices");
     Route::get("/api/devices/{id}", "DevicesController@api_show_device")->name("api_show_device");
     Route::post("/api/devices", "DevicesController@api_add_device")->name("api_add_device");