diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.php
index 398653a..e69330f 100644
--- a/app/Http/Controllers/ReportsController.php
+++ b/app/Http/Controllers/ReportsController.php
@@ -16,240 +16,248 @@ use App\Models\UserLogs;
 use Illuminate\Support\Facades\Crypt;
 use Illuminate\Contracts\Encryption\DecryptException;
 use Illuminate\Support\Facades\Log;
+use App\Models\ConfTruckTypes;
 
 class ReportsController extends Controller
 {
-	public function view_report_vehicle_trips(Request $req)
-	{
-		$q = "SELECT id, nopol1 from t_vehicles WHERE dlt is null order by nopol1";
-		$listNopol = DB::select($q);
+    public function view_report_vehicle_trips(Request $req)
+    {
+        $q = "SELECT id, nopol1 from t_vehicles WHERE dlt is null order by nopol1";
+        $vehicletype = DB::table('t_vehicles_types')->where('is_active', 1)->get();
+        $listNopol = DB::select($q);
 
-		$data = [
-			'listNopol' => $listNopol,
-		];
+        $data = [
+            'listNopol' => $listNopol,
+            'vehicletype' => $vehicletype
+        ];
 
-		$log = [
-			"module" => "Vehicle Trips Report",
-			"action" => "View",
-			"desc" => "Open Vehicle Trips Report menu",
-		];
-		UserLogs::insert(Auth::user()->id, $log);
-		return view('menu_v1.reports.vehicle_trips', $data);
-	}
-	public function api_report_vehicle_trips_list(Request $req)
-	{
-		// $TIMEFIX = Helper::TIMEFIX;
-		// Validate input
-		// date in unix datetime format
-		// dd($req->type);
-		$rules = [
-			// 'from_date' => 'required|date',
-			// 'to_date' => 'required|date|after_or_equal:from_date',
-			'type' => 'nullable|in:report,list', // enum "report", "list". nullable default "list"
-		];
+        $log = [
+            "module" => "Vehicle Trips Report",
+            "action" => "View",
+            "desc" => "Open Vehicle Trips Report menu",
+        ];
+        UserLogs::insert(Auth::user()->id, $log);
+        return view('menu_v1.reports.vehicle_trips', $data);
+    }
+    public function api_report_vehicle_trips_list(Request $req)
+    {
+        // $TIMEFIX = Helper::TIMEFIX;
+        // Validate input
+        // date in unix datetime format
+        // dd($req->type);
+        $rules = [
+            // 'from_date' => 'required|date',
+            // 'to_date' => 'required|date|after_or_equal:from_date',
+            'type' => 'nullable|in:report,list', // enum "report", "list". nullable default "list"
+        ];
 
-		$isValidInput = Validator::make($req->all(), $rules);
-		if (!$isValidInput->passes()) {
-			$apiResp = Responses::bad_input($isValidInput->messages()->first());
-			return new Response($apiResp, $apiResp["meta"]["code"]);
-		}
+        $isValidInput = Validator::make($req->all(), $rules);
+        if (!$isValidInput->passes()) {
+            $apiResp = Responses::bad_input($isValidInput->messages()->first());
+            return new Response($apiResp, $apiResp["meta"]["code"]);
+        }
 
-		// $from_date = $req->input('from_date');
-		// $to_date = $req->input('to_date');
-		$from_date = $req->input('from_date') - Helper::TIMEFIX;
-		$to_date = $req->input('to_date') - Helper::TIMEFIX;
-		$vid = $req->input('vid');
-		// $from_date = 1756054800;
-		// $to_date = 1756745940;
+        // $from_date = $req->input('from_date');
+        // $to_date = $req->input('to_date');
+        $from_date = $req->input('from_date') - Helper::TIMEFIX;
+        $to_date = $req->input('to_date') - Helper::TIMEFIX;
+        $vid = $req->input('vid');
+        $vt = $req->input('vt');
+        // $from_date = 1756054800;
+        // $to_date = 1756745940;
 
-		// get month year
-		$date = Carbon::createFromTimestamp($from_date);
-		$yymm = $date->format('ym');
+        // get month year
+        $date = Carbon::createFromTimestamp($from_date);
+        $yymm = $date->format('ym');
 
-		try {
-			// $list = DB::select("WITH 
-			// 	gaps AS (
-			// 		SELECT
-			// 			-- previous gap since previous row > 1 hour (3600s)
-			// 			CASE
-			// 				WHEN (crt_d - LAG(crt_d, 1, NULL) OVER (PARTITION BY vhc_id ORDER BY crt_d)) > 3600
-			// 				THEN 1 ELSE 0
-			// 			END AS isStop,
-			// 			t.*
-			// 		FROM tracks_2509 t
-			// 		WHERE 
-			// 		t.latitude IS NOT NULL
-			// 		AND t.longitude IS NOT NULL
-			// 		AND t.action = 'location'
-			// 		AND t.crt_d BETWEEN ? AND ?
-			// 	)
-			// 	, trips AS (
-			// 		SELECT
-			// 			-- mark the start of a trip when ignition=4 and previous ignition <> 4
-			// 			CASE
-			// 				WHEN ignition = 4 
-			// 					AND LAG(ignition, 1, 0) OVER (PARTITION BY vhc_id ORDER BY crt_d) <> 4
-			// 					or LAG(isStop, 1, 0) over (PARTITION BY vhc_id ORDER BY crt_d) = 1
-			// 				THEN 1 ELSE 0
-			// 			END AS trip_start,
-			// 			g.*
-			// 		FROM gaps g
-			// 	)
-			// 	, numbered AS (
-			// 		SELECT
-			// 			*,
-			// 			-- assign a trip_id by cumulative sum of trip_start
-			// 			SUM(trip_start) OVER (PARTITION BY vhc_id ORDER BY crt_d) AS trip_id
-			// 		FROM trips
-			// 		where 
-			// 			ignition = 4
-			// 			and isStop = 0
-			// 	),
-			// 	agg AS (
-			// 		SELECT
-			// 			COUNT(*) AS row_count,
-			// 			v.name,
-			// 			v.nopol1,
-			// 			vhc_id,
-			// 			-- trip_id,
-			// 			ROW_NUMBER() OVER (PARTITION BY v.id ORDER BY MIN(a.crt_d)) AS trip_id,
-			// 			SUM(pre_milleage) AS mileage,
-			// 			MIN(a.crt_d) AS start,
-			// 			MAX(a.crt_d) AS finish,
-			// 			MIN(a.vhc_milleage) AS startMileage,
-			// 			MAX(a.vhc_milleage) AS finishMileage,
-			// 			(SELECT fulladdress FROM t_gps_tracks_address WHERE master_id = MIN(a.id) LIMIT 1) AS startLoc,
-			// 			(SELECT fulladdress FROM t_gps_tracks_address WHERE master_id = MAX(a.id) LIMIT 1) AS finishLoc
-			// 		FROM t_vehicles v
-			// 		LEFT JOIN numbered a ON a.vhc_id = v.id
-			// 		WHERE 
-			// 			v.dlt is null and trip_id != 0 
-			// 			and if(? , v.id = ? , 1=1)
-			// 		GROUP BY v.id, a.trip_id
-			// 		HAVING COUNT(*) > 1
-			// 	)
-			// 	SELECT
-			// 		*,
-			// 		SUM(mileage) OVER (PARTITION BY agg.id) AS total_mileage,
-			// 		COUNT(trip_id) OVER (PARTITION BY agg.id) AS total_trip,
-			// 		tvd.pool_code, tvd.dc_code
-			// 	FROM agg agg
-			// 		join t_vehicles_detail tvd on tvd.vid = agg.vhc_id
-			// 	ORDER BY agg.id, trip_id			
-			// ", [$from_date, $to_date, $vid, $vid]);
+        try {
+            // $list = DB::select("WITH
+            // 	gaps AS (
+            // 		SELECT
+            // 			-- previous gap since previous row > 1 hour (3600s)
+            // 			CASE
+            // 				WHEN (crt_d - LAG(crt_d, 1, NULL) OVER (PARTITION BY vhc_id ORDER BY crt_d)) > 3600
+            // 				THEN 1 ELSE 0
+            // 			END AS isStop,
+            // 			t.*
+            // 		FROM tracks_2509 t
+            // 		WHERE
+            // 		t.latitude IS NOT NULL
+            // 		AND t.longitude IS NOT NULL
+            // 		AND t.action = 'location'
+            // 		AND t.crt_d BETWEEN ? AND ?
+            // 	)
+            // 	, trips AS (
+            // 		SELECT
+            // 			-- mark the start of a trip when ignition=4 and previous ignition <> 4
+            // 			CASE
+            // 				WHEN ignition = 4
+            // 					AND LAG(ignition, 1, 0) OVER (PARTITION BY vhc_id ORDER BY crt_d) <> 4
+            // 					or LAG(isStop, 1, 0) over (PARTITION BY vhc_id ORDER BY crt_d) = 1
+            // 				THEN 1 ELSE 0
+            // 			END AS trip_start,
+            // 			g.*
+            // 		FROM gaps g
+            // 	)
+            // 	, numbered AS (
+            // 		SELECT
+            // 			*,
+            // 			-- assign a trip_id by cumulative sum of trip_start
+            // 			SUM(trip_start) OVER (PARTITION BY vhc_id ORDER BY crt_d) AS trip_id
+            // 		FROM trips
+            // 		where
+            // 			ignition = 4
+            // 			and isStop = 0
+            // 	),
+            // 	agg AS (
+            // 		SELECT
+            // 			COUNT(*) AS row_count,
+            // 			v.name,
+            // 			v.nopol1,
+            // 			vhc_id,
+            // 			-- trip_id,
+            // 			ROW_NUMBER() OVER (PARTITION BY v.id ORDER BY MIN(a.crt_d)) AS trip_id,
+            // 			SUM(pre_milleage) AS mileage,
+            // 			MIN(a.crt_d) AS start,
+            // 			MAX(a.crt_d) AS finish,
+            // 			MIN(a.vhc_milleage) AS startMileage,
+            // 			MAX(a.vhc_milleage) AS finishMileage,
+            // 			(SELECT fulladdress FROM t_gps_tracks_address WHERE master_id = MIN(a.id) LIMIT 1) AS startLoc,
+            // 			(SELECT fulladdress FROM t_gps_tracks_address WHERE master_id = MAX(a.id) LIMIT 1) AS finishLoc
+            // 		FROM t_vehicles v
+            // 		LEFT JOIN numbered a ON a.vhc_id = v.id
+            // 		WHERE
+            // 			v.dlt is null and trip_id != 0
+            // 			and if(? , v.id = ? , 1=1)
+            // 		GROUP BY v.id, a.trip_id
+            // 		HAVING COUNT(*) > 1
+            // 	)
+            // 	SELECT
+            // 		*,
+            // 		SUM(mileage) OVER (PARTITION BY agg.id) AS total_mileage,
+            // 		COUNT(trip_id) OVER (PARTITION BY agg.id) AS total_trip,
+            // 		tvd.pool_code, tvd.dc_code
+            // 	FROM agg agg
+            // 		join t_vehicles_detail tvd on tvd.vid = agg.vhc_id
+            // 	ORDER BY agg.id, trip_id
+            // ", [$from_date, $to_date, $vid, $vid]);
 
-			$list = DB::select("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,
-					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
-				WHERE
-					t.start BETWEEN ? AND ?
-					and if(? , t.id = ? , 1=1)
-			", [$from_date, $to_date, $from_date, $to_date, $vid, $vid]);
+            $list = DB::select("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
+            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_types vt ON vt.id = tvt.type_id
+            WHERE
+                t.start BETWEEN ? AND ?
+                and if(? , t.id = ? , 1=1)
+                and if(? , vt.id = ? , 1=1)
+        ", [$from_date, $to_date, $from_date, $to_date, $vid, $vid, $vt, $vt]);
 
-			// // RETURN 1 - LIST
-			// if($req->type != 'report'){
-			$apiResp = Responses::success("success list vehicles report");
-			$apiResp["data"] = $list;
-			return new Response($apiResp, $apiResp["meta"]["code"]);
-			// }
+            // // RETURN 1 - LIST
+            // if($req->type != 'report'){
+            $apiResp = Responses::success("success list vehicles report");
+            $apiResp["data"] = $list;
+            return new Response($apiResp, $apiResp["meta"]["code"]);
+            // }
 
-			// // RETURN 2 - REPORT
-			// if($req->type == 'report'){
-			// 	$headings = ['Name', 'License Plate', 'Number of Trip', 'Total Mileage'];
+            // // RETURN 2 - REPORT
+            // if($req->type == 'report'){
+            // 	$headings = ['Name', 'License Plate', 'Number of Trip', 'Total Mileage'];
 
-			// 	$export = new class($list, $headings) implements FromArray, WithHeadings {
-			// 		private $list;
-			// 		private $headings;
+            // 	$export = new class($list, $headings) implements FromArray, WithHeadings {
+            // 		private $list;
+            // 		private $headings;
 
-			// 		public function __construct($list, $headings)
-			// 		{
-			// 			$this->list = $list;
-			// 			$this->headings = $headings;
-			// 		}
+            // 		public function __construct($list, $headings)
+            // 		{
+            // 			$this->list = $list;
+            // 			$this->headings = $headings;
+            // 		}
 
-			// 		public function array(): array
-			// 		{
-			// 			return array_map(function ($item) {
-			// 				return [
-			// 					$item->name,
-			// 					$item->nopol1,
-			// 					$item->numOfTrip,
-			// 					$item->total_milleage,
-			// 				];
-			// 			}, $this->list);
-			// 		}
+            // 		public function array(): array
+            // 		{
+            // 			return array_map(function ($item) {
+            // 				return [
+            // 					$item->name,
+            // 					$item->nopol1,
+            // 					$item->numOfTrip,
+            // 					$item->total_milleage,
+            // 				];
+            // 			}, $this->list);
+            // 		}
 
-			// 		public function headings(): array
-			// 		{
-			// 			return $this->headings;
-			// 		}
+            // 		public function headings(): array
+            // 		{
+            // 			return $this->headings;
+            // 		}
 
-			// 		// Start table from A3
-			// 		public function startCell(): string
-			// 		{
-			// 			return 'A3';
-			// 		}
+            // 		// Start table from A3
+            // 		public function startCell(): string
+            // 		{
+            // 			return 'A3';
+            // 		}
 
-			// 		// Add title & border styling
-			// 		public function styles(Worksheet $sheet)
-			// 		{
-			// 			$tgl0 = date('d-m-Y', $GLOBALS['from_date']);
-			// 			$tgl1 = date('d-m-Y', $GLOBALS['to_date']);
+            // 		// Add title & border styling
+            // 		public function styles(Worksheet $sheet)
+            // 		{
+            // 			$tgl0 = date('d-m-Y', $GLOBALS['from_date']);
+            // 			$tgl1 = date('d-m-Y', $GLOBALS['to_date']);
 
-			// 			// Title in A1
-			// 			$sheet->setCellValue('A1', 'Vehicle Trip Report $tgl0 until $tgl1');
-			// 			$sheet->getStyle('A1')->getFont()->setBold(true)->setSize(16);
-			// 			$sheet->getStyle('A1')->getAlignment()->setHorizontal('center');
-			// 			$sheet->mergeCells('A1:D1'); // Merge across 4 columns
+            // 			// Title in A1
+            // 			$sheet->setCellValue('A1', 'Vehicle Trip Report $tgl0 until $tgl1');
+            // 			$sheet->getStyle('A1')->getFont()->setBold(true)->setSize(16);
+            // 			$sheet->getStyle('A1')->getAlignment()->setHorizontal('center');
+            // 			$sheet->mergeCells('A1:D1'); // Merge across 4 columns
 
-			// 			// Get last row
-			// 			$lastRow = $this->list->count() + 3; // 3 = heading row
-			// 			$range = "A3:D{$lastRow}";
+            // 			// Get last row
+            // 			$lastRow = $this->list->count() + 3; // 3 = heading row
+            // 			$range = "A3:D{$lastRow}";
 
-			// 			// Add borders
-			// 			$sheet->getStyle($range)->getBorders()->getAllBorders()
-			// 				->setBorderStyle(\PhpOffice\PhpSpreadsheet\Style\Border::BORDER_THIN);
+            // 			// Add borders
+            // 			$sheet->getStyle($range)->getBorders()->getAllBorders()
+            // 				->setBorderStyle(\PhpOffice\PhpSpreadsheet\Style\Border::BORDER_THIN);
 
-			// 			// Bold headings
-			// 			$sheet->getStyle('A3:D3')->getFont()->setBold(true);
+            // 			// Bold headings
+            // 			$sheet->getStyle('A3:D3')->getFont()->setBold(true);
 
-			// 			return [];
-			// 		}
-			// 	};
+            // 			return [];
+            // 		}
+            // 	};
 
-			// 	return Excel::download($export, 'trip_report.xlsx');
-			// }
-		} catch (\Exception $e) {
-			$apiResp = Responses::error($e->getMessage());
-			return new Response($apiResp, $apiResp["meta"]["code"]);
-			// return Responses::json(Responses::SERVER_ERROR, 'An error occurred while generating the report.', (object)[]);
-		}
-	}
-	public function view_report_trip_detail(Request $req)
-	{
-		$vid = $req->vid;
-		$tgl0 = $req->tgl0;
-		$tgl1 = $req->tgl1;
-		$nopol1 = $req->nopol1;
+            // 	return Excel::download($export, 'trip_report.xlsx');
+            // }
+        } catch (\Exception $e) {
+            $apiResp = Responses::error($e->getMessage());
+            return new Response($apiResp, $apiResp["meta"]["code"]);
+            // return Responses::json(Responses::SERVER_ERROR, 'An error occurred while generating the report.', (object)[]);
+        }
+    }
+    public function view_report_trip_detail(Request $req)
+    {
+        $vid = $req->vid;
+        $tgl0 = $req->tgl0;
+        $tgl1 = $req->tgl1;
+        $nopol1 = $req->nopol1;
 
-		$d = [$vid, $tgl0, $tgl1];
-		$list = DB::select("SELECT
+        $d = [$vid, $tgl0, $tgl1];
+        $list = DB::select("SELECT
 				t.crt_d , t.latitude, t.longitude, t.speed,
 				tgta.fulladdress,
 				t.pre_milleage, t.vhc_milleage, fuel_count
-			FROM 
+			FROM
 				t_gps_tracks t
-				left join t_gps_tracks_address tgta on tgta.master_id = t.id 
-			WHERE 
+				left join t_gps_tracks_address tgta on tgta.master_id = t.id
+			WHERE
 				t.vhc_id = ?
 				and t.latitude IS NOT NULL
 				AND t.longitude IS NOT NULL
@@ -258,167 +266,167 @@ class ReportsController extends Controller
 			ORDER BY t.crt_d asc
 		", $d);
 
-		$start = [
-			'time' => $list[0]->crt_d,
-			'fulladdress' => urldecode($list[0]->fulladdress),
-			'mileage' => $list[0]->vhc_milleage,
-		];
-		$finish = [
-			'time' => $list[count($list) - 1]->crt_d,
-			'fulladdress' => urldecode($list[count($list) - 1]->fulladdress),
-			'mileage' => $list[count($list) - 1]->vhc_milleage,
-		];
+        $start = [
+            'time' => $list[0]->crt_d,
+            'fulladdress' => urldecode($list[0]->fulladdress),
+            'mileage' => $list[0]->vhc_milleage,
+        ];
+        $finish = [
+            'time' => $list[count($list) - 1]->crt_d,
+            'fulladdress' => urldecode($list[count($list) - 1]->fulladdress),
+            'mileage' => $list[count($list) - 1]->vhc_milleage,
+        ];
 
-		$t0 = Carbon::createFromTimestamp($list[0]->crt_d);
-		$t1 = Carbon::createFromTimestamp($list[count($list) - 1]->crt_d);
-		$diff = $t1->diff($t0);
-		$hours = $diff->h + ($diff->days * 24); // include days converted to hours
-		$minutes = $diff->i;
-		$duration = "{$hours} hour" . ($hours > 1 ? 's' : '') . " {$minutes} minute" . ($minutes > 1 ? 's' : '');
+        $t0 = Carbon::createFromTimestamp($list[0]->crt_d);
+        $t1 = Carbon::createFromTimestamp($list[count($list) - 1]->crt_d);
+        $diff = $t1->diff($t0);
+        $hours = $diff->h + ($diff->days * 24); // include days converted to hours
+        $minutes = $diff->i;
+        $duration = "{$hours} hour" . ($hours > 1 ? 's' : '') . " {$minutes} minute" . ($minutes > 1 ? 's' : '');
 
-		$distance = $list[count($list) - 1]->vhc_milleage - $list[0]->vhc_milleage;
-		$fuel_consumed = $list[count($list) - 1]->fuel_count - $list[0]->fuel_count;
+        $distance = $list[count($list) - 1]->vhc_milleage - $list[0]->vhc_milleage;
+        $fuel_consumed = $list[count($list) - 1]->fuel_count - $list[0]->fuel_count;
 
-		$data = [
-			'nopol1' => $nopol1,
-			'vid' => $vid,
-			'tgl0' => $tgl0,
-			'tgl1' => $tgl1,
-			'list' => $list,
-			'start' => $start,
-			'finish' => $finish,
-			'duration' => $duration,
-			'distance' => $distance,
-			'fuel_consumed' => $fuel_consumed,
-		];
-		// dd($list);
-		return view('menu_v1.reports._trip_detail', $data);
-	}
+        $data = [
+            'nopol1' => $nopol1,
+            'vid' => $vid,
+            'tgl0' => $tgl0,
+            'tgl1' => $tgl1,
+            'list' => $list,
+            'start' => $start,
+            'finish' => $finish,
+            'duration' => $duration,
+            'distance' => $distance,
+            'fuel_consumed' => $fuel_consumed,
+        ];
+        // dd($list);
+        return view('menu_v1.reports._trip_detail', $data);
+    }
 
-	public function view_report_abnormalities(Request $req)
-	{
-		$q = "select id, nopol1 from t_vehicles WHERE dlt is null order by nopol1";
-		$listNopol = DB::select($q);
+    public function view_report_abnormalities(Request $req)
+    {
+        $q = "select id, nopol1 from t_vehicles WHERE dlt is null order by nopol1";
+        $listNopol = DB::select($q);
 
-		$data = [
-			'listNopol' => $listNopol,
-		];
+        $data = [
+            'listNopol' => $listNopol,
+        ];
 
-		$log = [
-			"module" => "Abnormalities Report",
-			"action" => "View",
-			"desc" => "Open Abnormalities Report menu",
-		];
-		UserLogs::insert(Auth::user()->id, $log);
-		return view('menu_v1.reports.abnormalities', $data);
-	}
-	public function api_report_abnormalities_list(Request $req)
-	{
-		// Validate input
-		$rules = [
-			// 'from_date' => 'required|date',
-			// 'to_date' => 'required|date|after_or_equal:from_date',
-			'type' => 'nullable|in:report,list', // enum "report", "list". nullable default "list"
-		];
+        $log = [
+            "module" => "Abnormalities Report",
+            "action" => "View",
+            "desc" => "Open Abnormalities Report menu",
+        ];
+        UserLogs::insert(Auth::user()->id, $log);
+        return view('menu_v1.reports.abnormalities', $data);
+    }
+    public function api_report_abnormalities_list(Request $req)
+    {
+        // Validate input
+        $rules = [
+            // 'from_date' => 'required|date',
+            // 'to_date' => 'required|date|after_or_equal:from_date',
+            'type' => 'nullable|in:report,list', // enum "report", "list". nullable default "list"
+        ];
 
-		$isValidInput = Validator::make($req->all(), $rules);
-		if (!$isValidInput->passes()) {
-			$apiResp = Responses::bad_input($isValidInput->messages()->first());
-			return new Response($apiResp, $apiResp["meta"]["code"]);
-		}
+        $isValidInput = Validator::make($req->all(), $rules);
+        if (!$isValidInput->passes()) {
+            $apiResp = Responses::bad_input($isValidInput->messages()->first());
+            return new Response($apiResp, $apiResp["meta"]["code"]);
+        }
 
-		$from_date = $req->input('from_date') - Helper::TIMEFIX;
-		$to_date = $req->input('to_date') - Helper::TIMEFIX;
-		$vid = $req->input('vid');
+        $from_date = $req->input('from_date') - Helper::TIMEFIX;
+        $to_date = $req->input('to_date') - Helper::TIMEFIX;
+        $vid = $req->input('vid');
 
-		// Create a period between the two timestamps
-		$period = CarbonPeriod::create(
-			Carbon::createFromTimestamp($from_date)->startOfMonth(),
-			'1 month',
-			Carbon::createFromTimestamp($to_date)
-		);
-		$subQueryParts = [];
-		foreach ($period as $date) {
-			$tableName = "tracks_" . $date->format('ym');
+        // Create a period between the two timestamps
+        $period = CarbonPeriod::create(
+            Carbon::createFromTimestamp($from_date)->startOfMonth(),
+            '1 month',
+            Carbon::createFromTimestamp($to_date)
+        );
+        $subQueryParts = [];
+        foreach ($period as $date) {
+            $tableName = "tracks_" . $date->format('ym');
 
-			// We filter inside each table so the DB uses indexes immediately
-			$subQueryParts[] = "SELECT id, vhc_id, crt_d, speed 
-				FROM $tableName 
-				WHERE crt_d BETWEEN $from_date AND $to_date 
+            // We filter inside each table so the DB uses indexes immediately
+            $subQueryParts[] = "SELECT id, vhc_id, crt_d, speed
+				FROM $tableName
+				WHERE crt_d BETWEEN $from_date AND $to_date
 				AND action = 'location' and speed>60
 			";
-		}
-		$qString = "(" . implode(' UNION ALL ', $subQueryParts) . ")";
-		// dd("qString", $qString);
-		try {
-			$list = DB::select("SELECT 
-					tv.name, 
-					tv.nopol1, 
-					t.crt_d, 
-					t.speed, 
+        }
+        $qString = "(" . implode(' UNION ALL ', $subQueryParts) . ")";
+        // dd("qString", $qString);
+        try {
+            $list = DB::select("SELECT
+					tv.name,
+					tv.nopol1,
+					t.crt_d,
+					t.speed,
 					tgta.fulladdress,
-					tvd.speed_limit, 
-					tvd.pool_code, 
+					tvd.speed_limit,
+					tvd.pool_code,
 					tvd.dc_code
-				FROM 
+				FROM
 					$qString t
 				INNER JOIN t_vehicles tv ON tv.id = t.vhc_id
 				INNER JOIN t_vehicles_detail tvd ON tvd.vid = tv.id
 				LEFT JOIN t_gps_tracks_address tgta ON tgta.master_id = t.id
-				WHERE 
+				WHERE
 					if(? , tv.id = ? , 1=1)
 					AND t.speed > tvd.speed_limit
 				ORDER BY t.crt_d;
 			", [$vid, $vid]);
 
-			// // RETURN 1 - LIST
-			// if($req->type != 'report'){
-			$apiResp = Responses::success("success list abnormalities report");
-			$apiResp["data"] = $list;
-			return new Response($apiResp, $apiResp["meta"]["code"]);
-			// }
+            // // RETURN 1 - LIST
+            // if($req->type != 'report'){
+            $apiResp = Responses::success("success list abnormalities report");
+            $apiResp["data"] = $list;
+            return new Response($apiResp, $apiResp["meta"]["code"]);
+            // }
 
-		} catch (\Exception $e) {
-			$apiResp = Responses::error($e->getMessage());
-			return new Response($apiResp, $apiResp["meta"]["code"]);
-			// return Responses::json(Responses::SERVER_ERROR, 'An error occurred while generating the report.', (object)[]);
-		}
-	}
+        } catch (\Exception $e) {
+            $apiResp = Responses::error($e->getMessage());
+            return new Response($apiResp, $apiResp["meta"]["code"]);
+            // return Responses::json(Responses::SERVER_ERROR, 'An error occurred while generating the report.', (object)[]);
+        }
+    }
 
-	public function api_view_trip_detail(Request $req, $token)
-	{
-		// token = base64(unix(start_time) + '|' + unix(end_time) + '|' + nopol + '|' + unix(now()))
-		// $token = "1759686805|1759693045|B.10-517|1765845676";
-		$token = base64_decode($token);
-		$token = explode('|', $token);
-		$tgl0 = (int) $token[0] ?? null;
-		$tgl1 = (int) $token[1] ?? null;
-		$nopol1 = $token[2] ?? null;
-		$now = (int) $token[3] ?? null;
-		$isMoreThanOneHour = time() - $now > 60 * 60;
+    public function api_view_trip_detail(Request $req, $token)
+    {
+        // token = base64(unix(start_time) + '|' + unix(end_time) + '|' + nopol + '|' + unix(now()))
+        // $token = "1759686805|1759693045|B.10-517|1765845676";
+        $token = base64_decode($token);
+        $token = explode('|', $token);
+        $tgl0 = (int) $token[0] ?? null;
+        $tgl1 = (int) $token[1] ?? null;
+        $nopol1 = $token[2] ?? null;
+        $now = (int) $token[3] ?? null;
+        $isMoreThanOneHour = time() - $now > 60 * 60;
 
-		if ($tgl0 == null || $tgl1 == null || $nopol1 == null || $now == null || $isMoreThanOneHour) {
-			$apiResp = Responses::bad_request("Invalid token");
-			return new Response($apiResp, $apiResp["meta"]["code"]);
-		}
+        if ($tgl0 == null || $tgl1 == null || $nopol1 == null || $now == null || $isMoreThanOneHour) {
+            $apiResp = Responses::bad_request("Invalid token");
+            return new Response($apiResp, $apiResp["meta"]["code"]);
+        }
 
-		// get vid by nopol1
-		$vid = DB::select("SELECT id FROM t_vehicles WHERE nopol1 = ?", [$nopol1]);
-		if (count($vid) == 0) {
-			$apiResp = Responses::bad_request("Vehicle not found");
-			return new Response($apiResp, $apiResp["meta"]["code"]);
-		}
-		$vid = $vid[0]->id;
+        // get vid by nopol1
+        $vid = DB::select("SELECT id FROM t_vehicles WHERE nopol1 = ?", [$nopol1]);
+        if (count($vid) == 0) {
+            $apiResp = Responses::bad_request("Vehicle not found");
+            return new Response($apiResp, $apiResp["meta"]["code"]);
+        }
+        $vid = $vid[0]->id;
 
-		$d = [$vid, $tgl0, $tgl1];
-		$list = DB::select("SELECT
+        $d = [$vid, $tgl0, $tgl1];
+        $list = DB::select("SELECT
 				t.crt_d, t.latitude, t.longitude, t.speed,
 				tgta.fulladdress,
 				t.pre_milleage, t.vhc_milleage, fuel_count
-			FROM 
+			FROM
 				t_gps_tracks t
-				left join t_gps_tracks_address tgta on tgta.master_id = t.id 
-			WHERE 
+				left join t_gps_tracks_address tgta on tgta.master_id = t.id
+			WHERE
 				t.vhc_id = ?
 				and t.latitude IS NOT NULL
 				AND t.longitude IS NOT NULL
@@ -426,75 +434,75 @@ class ReportsController extends Controller
 				AND t.crt_d BETWEEN ? AND ?
 			ORDER BY t.crt_d asc
 		", $d);
-		if (count($list) == 0) {
-			$apiResp = Responses::not_found("Track not found");
-			return new Response($apiResp, $apiResp["meta"]["code"]);
-		}
+        if (count($list) == 0) {
+            $apiResp = Responses::not_found("Track not found");
+            return new Response($apiResp, $apiResp["meta"]["code"]);
+        }
 
-		$start = [
-			'time' => $list[0]->crt_d,
-			'fulladdress' => urldecode($list[0]->fulladdress),
-			'mileage' => $list[0]->vhc_milleage,
-		];
-		$finish = [
-			'time' => $list[count($list) - 1]->crt_d,
-			'fulladdress' => urldecode($list[count($list) - 1]->fulladdress),
-			'mileage' => $list[count($list) - 1]->vhc_milleage,
-		];
+        $start = [
+            'time' => $list[0]->crt_d,
+            'fulladdress' => urldecode($list[0]->fulladdress),
+            'mileage' => $list[0]->vhc_milleage,
+        ];
+        $finish = [
+            'time' => $list[count($list) - 1]->crt_d,
+            'fulladdress' => urldecode($list[count($list) - 1]->fulladdress),
+            'mileage' => $list[count($list) - 1]->vhc_milleage,
+        ];
 
-		$t0 = Carbon::createFromTimestamp($list[0]->crt_d);
-		$t1 = Carbon::createFromTimestamp($list[count($list) - 1]->crt_d);
-		$diff = $t1->diff($t0);
-		$hours = $diff->h + ($diff->days * 24); // include days converted to hours
-		$minutes = $diff->i;
-		$duration = "{$hours} hour" . ($hours > 1 ? 's' : '') . " {$minutes} minute" . ($minutes > 1 ? 's' : '');
+        $t0 = Carbon::createFromTimestamp($list[0]->crt_d);
+        $t1 = Carbon::createFromTimestamp($list[count($list) - 1]->crt_d);
+        $diff = $t1->diff($t0);
+        $hours = $diff->h + ($diff->days * 24); // include days converted to hours
+        $minutes = $diff->i;
+        $duration = "{$hours} hour" . ($hours > 1 ? 's' : '') . " {$minutes} minute" . ($minutes > 1 ? 's' : '');
 
-		$distance = $list[count($list) - 1]->vhc_milleage - $list[0]->vhc_milleage;
-		$fuel_consumed = $list[count($list) - 1]->fuel_count - $list[0]->fuel_count;
+        $distance = $list[count($list) - 1]->vhc_milleage - $list[0]->vhc_milleage;
+        $fuel_consumed = $list[count($list) - 1]->fuel_count - $list[0]->fuel_count;
 
-		$data = [
-			'nopol1' => $nopol1,
-			'vid' => $vid,
-			'tgl0' => $tgl0,
-			'tgl1' => $tgl1,
-			'list' => $list,
-			'start' => $start,
-			'finish' => $finish,
-			'duration' => $duration,
-			'distance' => $distance,
-			'fuel_consumed' => $fuel_consumed,
-		];
-		// dd($list);
-		return view('menu_v1.reports.view_trip_detail', $data);
-	}
+        $data = [
+            'nopol1' => $nopol1,
+            'vid' => $vid,
+            'tgl0' => $tgl0,
+            'tgl1' => $tgl1,
+            'list' => $list,
+            'start' => $start,
+            'finish' => $finish,
+            'duration' => $duration,
+            'distance' => $distance,
+            'fuel_consumed' => $fuel_consumed,
+        ];
+        // dd($list);
+        return view('menu_v1.reports.view_trip_detail', $data);
+    }
 
-	public function decryptText(string $ciphertext = "FqujI/06YPCpCSP0Xlt6bA==")
-	{
-		$secret = "Mg3Xt1169cRNJWX6HG12DVkgmAXINVuq";
-		$iv_str = "Mg3Xt1169cRNJWX6";
+    public function decryptText(string $ciphertext = "FqujI/06YPCpCSP0Xlt6bA==")
+    {
+        $secret = "Mg3Xt1169cRNJWX6HG12DVkgmAXINVuq";
+        $iv_str = "Mg3Xt1169cRNJWX6";
 
-		// Derive key and IV exactly as the web tool does
-		$md5 = md5($secret, true);                  // 16-byte raw binary MD5
-		$key = $md5 . $md5;                          // 32 bytes → AES-256 key
-		$iv = substr($md5, 0, 16);                   // IV = first 16 bytes of MD5
+        // Derive key and IV exactly as the web tool does
+        $md5 = md5($secret, true);                  // 16-byte raw binary MD5
+        $key = $md5 . $md5;                          // 32 bytes → AES-256 key
+        $iv = substr($md5, 0, 16);                   // IV = first 16 bytes of MD5
 
-		$data = base64_decode($ciphertext, true);
-		if ($data === false) {
-			return 'Invalid Base64';
-		}
+        $data = base64_decode($ciphertext, true);
+        if ($data === false) {
+            return 'Invalid Base64';
+        }
 
-		$plaintext = openssl_decrypt(
-			$data,
-			'aes-256-cbc',
-			$key,
-			0,
-			$iv
-		);
+        $plaintext = openssl_decrypt(
+            $data,
+            'aes-256-cbc',
+            $key,
+            0,
+            $iv
+        );
 
-		if ($plaintext === false) {
-			return 'Decryption failed: ' . openssl_error_string();
-		}
+        if ($plaintext === false) {
+            return 'Decryption failed: ' . openssl_error_string();
+        }
 
-		return $plaintext; // → "1764833739"
-	}
+        return $plaintext; // → "1764833739"
+    }
 }
diff --git a/resources/views/menu_v1/reports/abnormalities.blade.php b/resources/views/menu_v1/reports/abnormalities.blade.php
index a164ea2..6fa2643 100644
--- a/resources/views/menu_v1/reports/abnormalities.blade.php
+++ b/resources/views/menu_v1/reports/abnormalities.blade.php
@@ -210,7 +210,7 @@
 							data: 'pool_code',
 							className: 'text-start',
 						},
-						{ 
+						{
 							data: "crt_d",
 							className: 'text-nowrap',
 							render: (data, type, row, meta) => {
@@ -218,7 +218,7 @@
 							}
 						},
 						{ data: "speed", className: 'text-end'},
-						{ 
+						{
 							data: "fulladdress",
 							render: (data, type, row, meta) => {
 								return Helper.shortenText(decodeURIComponent(data || ''), 255)
@@ -231,9 +231,9 @@
 							extend: 'excelHtml5',
 							title: () => {
 								return `
-								Abnormality Trip Report - 
-								${moment($('#tgl0').val(), "DD-MM-YYYY HH:mm").format('DD MMM YYYY HH:mm')} 
-								to 
+								Abnormality Trip Report -
+								${moment($('#tgl0').val(), "DD-MM-YYYY HH:mm").format('DD MMM YYYY HH:mm')}
+								to
 								${moment($('#tgl1').val(), "DD-MM-YYYY HH:mm").format('DD MMM YYYY HH:mm')}`
 							},
 							className: 'd-none', // hide default button
diff --git a/resources/views/menu_v1/reports/vehicle_trips.blade.php b/resources/views/menu_v1/reports/vehicle_trips.blade.php
index 5e1446e..e565311 100644
--- a/resources/views/menu_v1/reports/vehicle_trips.blade.php
+++ b/resources/views/menu_v1/reports/vehicle_trips.blade.php
@@ -9,12 +9,8 @@
 @endsection
 
 @section('customcss')
-	<link
-		rel="stylesheet"
-		href="https://unpkg.com/leaflet@1.9.4/dist/leaflet.css"
-		integrity="sha256-p4NxAoJBhIIN+hmNHrzRCf9tD/miZyoHS5obTRR9BMY="
-		crossorigin=""
-	/>
+    <link rel="stylesheet" href="https://unpkg.com/leaflet@1.9.4/dist/leaflet.css"
+        integrity="sha256-p4NxAoJBhIIN+hmNHrzRCf9tD/miZyoHS5obTRR9BMY=" crossorigin="" />
 @endsection
 
 @section('content')
@@ -29,8 +25,8 @@
                         @if ($user_role == \App\Models\Users::ROLE_VENDOR || $user_role == \App\Models\Users::ROLE_ADMIN)
                             @can('vehicle.create')
                                 <!-- <div class="col text-end">
-                                    <button id="btnMdlNewVhc" class="btn btn-sm btn-danger">Add New Vehicle</button>
-                                </div> -->
+                                                            <button id="btnMdlNewVhc" class="btn btn-sm btn-danger">Add New Vehicle</button>
+                                                        </div> -->
                             @endcan
 
                             {{-- <div class="col-auto text-end ps-0">
@@ -43,170 +39,189 @@
                     </div>
                 </div>
                 <div class="card-body">
-					<!-- filter -->
-					<div class="row">
-						<div class="col-2">
-							<div class="form-group">
-								<label class="text-muted">From</label>
-								<!-- default today -->
-								<!-- <input class="form-control" id="tgl0" value="02-09-2025 00:00"> -->
-								<input class="form-control" id="tgl0" value="{{ date('d-m-Y 00:00') }}">
-							</div>
-						</div>
-						<div class="col-2">
-							<div class="form-group">
-								<label class="text-muted">To</label>
-								<!-- <input class="form-control" id="tgl1" value="02-09-2025 23:00"> -->
-								<input class="form-control" id="tgl1" value="{{ date('d-m-Y 23:59') }}">
-							</div>
-						</div>
-						<div class="col-2">
-							<div class="form-group">
-								<label class="text-muted">License Plate</label>
-								<select name="license_plate" class="form-control" id="filterNopol">
-									<option value="">-- All --</option>
-									@foreach ($listNopol as $nopol)
-										<option value="{{ $nopol->id }}">{{ $nopol->nopol1 }}</option>
-									@endforeach
-								</select>
-							</div>
-						</div>
-						<div class="col-1 d-flex align-items-end">
-							<button class="btn btn-primary" id="submitFilter">Submit</button>
-						</div>
-						<div class="col-5 d-flex align-items-end">
-							<button class="btn btn-sm btn-danger ms-auto" id="btnDownloadReport">Download Report</button>
-						</div>
-					</div>
-					</div>
-                    <div class="table-responsive p-3">
-                        <table id="tVehicleTrips" class="table table-hover dataTable w-100">
-                            <thead>
-                                <tr class="">
-                                    <th class="" hidden>Vehicle ID</th>
-                                    <th class="">License Plate Number</th>
-									<th class="">Dist. Cat.</th>
-									<th class="">Pool</th>
-                                    <th class="">Number of Trip</th>
-                                    <th class="">Total Mileage (km)</th>
-                                    <th class="">Trip #</th>
-                                    <th class="">Start</th>
-                                    <th class="">Finish</th>
-									<th class="">Duration</th>
-                                    <th class="">Start (km)</th>
-                                    <th class="">Finish (km)</th>
-                                    <th class="">Distance (km)</th>
-                                    <th class="">Fuel (L)</th>
-                                    <th class="">Detail</th>
-                                </tr>
-                            </thead>
-                            <!-- <tbody>
-								<tr>
-									<td>24-679</td>
-									<td>24-679</td>
-									<td>26</td>
-									<td>442.3</td>
-								</tr>
-								<tr>
-									<td>24-682</td>
-									<td>24-682</td>
-									<td>28</td>
-									<td>312.7</td>
-								</tr>
-								<tr>
-									<td>24-877</td>
-									<td>24-877</td>
-									<td>15</td>
-									<td>276.4</td>
-								</tr>
-								<tr>
-									<td>A.16-347</td>
-									<td>A.16-347</td>
-									<td>37</td>
-									<td>543.2</td>
-								</tr>
-								<tr>
-									<td>AL2025-B21</td>
-									<td>AL2025-B21</td>
-									<td>18</td>
-									<td>295.4</td>
-								</tr>
-								<tr>
-									<td>B.16-542</td>
-									<td>B.16-542</td>
-									<td>32</td>
-									<td>478.2</td>
-								</tr>
-								<tr>
-									<td>B.24-264</td>
-									<td>B.24-264</td>
-									<td>24</td>
-									<td>188.4</td>
-								</tr>
-								<tr>
-									<td>B.24-274</td>
-									<td>B.24-274</td>
-									<td>33</td>
-									<td>440.1</td>
-								</tr>
-								<tr>
-									<td>Ford Ranger</td>
-									<td>26-199</td>
-									<td>30</td>
-									<td>631.4</td>
-								</tr>
-								<tr>
-									<td>Nissan AD</td>
-									<td>B.10-517</td>
-									<td>27</td>
-									<td>375.9</td>
-								</tr>
-								<tr>
-									<td>Triton</td>
-									<td>A.29-127</td>
-									<td>26</td>
-									<td>508.2</td>
-								</tr>
-                            </tbody> -->
-                        </table>
+                    <!-- filter -->
+                    <div class="row g-3 align-items-end">
+                        <div class="col-md-2">
+                            <div class="form-group">
+                                <label class="form-label text-muted mb-1">From</label>
+                                <input type="text" class="form-control" id="tgl0" value="{{ date('d-m-Y 00:00') }}">
+                            </div>
+                        </div>
+
+                        <div class="col-md-2">
+                            <div class="form-group">
+                                <label class="form-label text-muted mb-1">To</label>
+                                <input type="text" class="form-control" id="tgl1" value="{{ date('d-m-Y 23:59') }}">
+                            </div>
+                        </div>
+
+                        <div class="col-md-2">
+                            <div class="form-group">
+                                <label class="form-label text-muted mb-1">License Plate</label>
+                                <select name="license_plate" class="form-control" id="filterNopol">
+                                    <option value="">-- All --</option>
+                                    @foreach ($listNopol as $nopol)
+                                        <option value="{{ $nopol->id }}">{{ $nopol->nopol1 }}</option>
+                                    @endforeach
+                                </select>
+                            </div>
+                        </div>
+
+                        <div class="col-md-2">
+                            <div class="form-group">
+                                <label class="form-label text-muted mb-1">Vehicle Type</label>
+                                <select name="vehicle_type" class="form-control" id="vehicleType">
+                                    <option value="">-- All --</option>
+                                    @foreach ($vehicletype as $vehicletypes)
+                                        <option value="{{ $vehicletypes->id }}">{{ $vehicletypes->name }}</option>
+                                    @endforeach
+                                </select>
+                            </div>
+                        </div>
+
+                        <div class="col-md-4 d-flex justify-content-end gap-2">
+                            <button class="btn btn-primary" id="submitFilter">
+                                <i class="fa fa-search me-1"></i> Submit
+                            </button>
+                            <button class="btn btn-danger" id="btnDownloadReport">
+                                <i class="fa fa-download me-1"></i> Download Report
+                            </button>
+                        </div>
                     </div>
                 </div>
+                <div class="table-responsive p-3">
+                    <table id="tVehicleTrips" class="table table-hover dataTable w-100">
+                        <thead>
+                            <tr class="">
+                                <th class="" hidden>Vehicle ID</th>
+                                <th class="">License Plate Number</th>
+                                <th class="">Dist. Cat.</th>
+                                <th class="">Pool</th>
+                                <th class="">Number of Trip</th>
+                                <th class="">Total Mileage (km)</th>
+                                <th class="">Trip #</th>
+                                <th class="">Start</th>
+                                <th class="">Finish</th>
+                                <th class="">Duration</th>
+                                <th class="">Start (km)</th>
+                                <th class="">Finish (km)</th>
+                                <th class="">Distance (km)</th>
+                                <th class="">Fuel (L)</th>
+                                <th class="">Vehicle Type</th>
+                                <th class="">Detail</th>
+                            </tr>
+                        </thead>
+                        <!-- <tbody>
+                    <tr>
+                     <td>24-679</td>
+                     <td>24-679</td>
+                     <td>26</td>
+                     <td>442.3</td>
+                    </tr>
+                    <tr>
+                     <td>24-682</td>
+                     <td>24-682</td>
+                     <td>28</td>
+                     <td>312.7</td>
+                    </tr>
+                    <tr>
+                     <td>24-877</td>
+                     <td>24-877</td>
+                     <td>15</td>
+                     <td>276.4</td>
+                    </tr>
+                    <tr>
+                     <td>A.16-347</td>
+                     <td>A.16-347</td>
+                     <td>37</td>
+                     <td>543.2</td>
+                    </tr>
+                    <tr>
+                     <td>AL2025-B21</td>
+                     <td>AL2025-B21</td>
+                     <td>18</td>
+                     <td>295.4</td>
+                    </tr>
+                    <tr>
+                     <td>B.16-542</td>
+                     <td>B.16-542</td>
+                     <td>32</td>
+                     <td>478.2</td>
+                    </tr>
+                    <tr>
+                     <td>B.24-264</td>
+                     <td>B.24-264</td>
+                     <td>24</td>
+                     <td>188.4</td>
+                    </tr>
+                    <tr>
+                     <td>B.24-274</td>
+                     <td>B.24-274</td>
+                     <td>33</td>
+                     <td>440.1</td>
+                    </tr>
+                    <tr>
+                     <td>Ford Ranger</td>
+                     <td>26-199</td>
+                     <td>30</td>
+                     <td>631.4</td>
+                    </tr>
+                    <tr>
+                     <td>Nissan AD</td>
+                     <td>B.10-517</td>
+                     <td>27</td>
+                     <td>375.9</td>
+                    </tr>
+                    <tr>
+                     <td>Triton</td>
+                     <td>A.29-127</td>
+                     <td>26</td>
+                     <td>508.2</td>
+                    </tr>
+                                        </tbody> -->
+                    </table>
+                </div>
             </div>
         </div>
     </div>
+    </div>
 
-	<!-- modal -->
-    <div class="modal fade" data-bs-backdrop="static" data-bs-keyboard="false" id="mdlDetailTrip" aria-labelledby="mdlDetailTripLabel" aria-hidden="true">
+    <!-- modal -->
+    <div class="modal fade" data-bs-backdrop="static" data-bs-keyboard="false" id="mdlDetailTrip"
+        aria-labelledby="mdlDetailTripLabel" aria-hidden="true">
         <!-- <div class="modal-dialog modal-dialog modal-dialog-centered modal-dialog-scrollable modal-xl">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <h5 class="modal-title" id="mdlDetailTripLabel">-----</h5>
-                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
-                </div>
-                <div class="modal-body">
-                </div>
-                <div class="modal-footer">
-                </div>
-            </div>
-        </div> -->
+                        <div class="modal-content">
+                            <div class="modal-header">
+                                <h5 class="modal-title" id="mdlDetailTripLabel">-----</h5>
+                                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+                            </div>
+                            <div class="modal-body">
+                            </div>
+                            <div class="modal-footer">
+                            </div>
+                        </div>
+                    </div> -->
     </div>
 @endsection
 
 @section('customjs')
     <script src="{{ asset('assets/js/load-image.all.min.js') }}"></script>
-	<!-- DataTables Buttons + JSZip (for Excel export) -->
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/dataTables.buttons.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.10.1/jszip.min.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.html5.min.js"></script>
-    <!-- <script src="https://cdnjs.cloudflare.com/ajax/libs/leaflet.draw/1.0.4/leaflet.draw.js" integrity="sha512-ozq8xQKq6urvuU6jNgkfqAmT7jKN2XumbrX1JiB3TnF7tI48DPI4Gy1GXKD/V3EExgAs1V+pRO7vwtS1LHg0Gw==" crossorigin="anonymous" referrerpolicy="no-referrer"></script> -->
-	<script src="https://unpkg.com/leaflet@1.9.4/dist/leaflet.js" integrity="sha256-20nQCchB9co0qIjJZRGuk2/Z9VM+kNiyxNV1lvTlZBo=" crossorigin=""></script>
+    <!-- DataTables Buttons + JSZip (for Excel export) -->
+    <script src="https://cdn.datatables.net/buttons/2.4.2/js/dataTables.buttons.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.10.1/jszip.min.js"></script>
+    <script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.html5.min.js"></script>
+    <!-- <script src="https://cdnjs.cloudflare.com/ajax/libs/leaflet.draw/1.0.4/leaflet.draw.js"
+        integrity="sha512-ozq8xQKq6urvuU6jNgkfqAmT7jKN2XumbrX1JiB3TnF7tI48DPI4Gy1GXKD/V3EExgAs1V+pRO7vwtS1LHg0Gw=="
+        crossorigin="anonymous" referrerpolicy="no-referrer"></script> -->
+    <script src="https://unpkg.com/leaflet@1.9.4/dist/leaflet.js"
+        integrity="sha256-20nQCchB9co0qIjJZRGuk2/Z9VM+kNiyxNV1lvTlZBo=" crossorigin=""></script>
     <script src="https://unpkg.com/leaflet-routing-machine@3.2.12/dist/leaflet-routing-machine.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/html2canvas/1.4.1/html2canvas.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/jspdf/2.5.1/jspdf.umd.min.js"></script>
-	<script src="https://cdn.jsdelivr.net/npm/axios/dist/axios.min.js"></script>
-	<script src="{{ asset('assets/vendor/printThis.js') }}"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/html2canvas/1.4.1/html2canvas.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/jspdf/2.5.1/jspdf.umd.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/axios/dist/axios.min.js"></script>
+    <script src="{{ asset('assets/vendor/printThis.js') }}"></script>
 
-	<script>
+    <script>
         'use strict';
         const State = {
             file_jimp_worker: "{{ asset('assets/js/worker/jimp.js') }}",
@@ -221,178 +236,207 @@
             activate: function() {
                 Wrapper.init();
                 Wrapper.event();
-				// DTable.table = $('#tVehicleTrips').DataTable()
+                // DTable.table = $('#tVehicleTrips').DataTable()
                 // DTable.activate();
-			},
-			init: ()=>{
-				$('#tgl0, #tgl1').datetimepicker({
-					format:'d-m-Y H:i',
-					defaultTime:'00:00',
-					closeOnDateSelect: true,
-					// mask:true
-				});
+            },
+            init: () => {
+                $('#tgl0, #tgl1').datetimepicker({
+                    format: 'd-m-Y H:i',
+                    defaultTime: '00:00',
+                    closeOnDateSelect: true,
+                    // mask:true
+                });
 
-			},
+            },
             event: function() {
                 $('#submitFilter').on('click', function() {
-					DTable.reload();
-				});
-				// Trigger export on external button click
-				$('#btnDownloadReport').on('click', function() {
-					DTable.table.button('.buttons-excel').trigger();
-				});
+                    DTable.reload();
+                });
+                // Trigger export on external button click
+                $('#btnDownloadReport').on('click', function() {
+                    DTable.table.button('.buttons-excel').trigger();
+                });
 
-				// detail trip
-				$('#tVehicleTrips').on('click', '.btnDetailTrip', function(e) {
-					e.preventDefault();
-					const vid = $(this).data('vid');
-					const tgl0 = $(this).data('tgl0');
-					const tgl1 = $(this).data('tgl1');
-					const nopol1 = $(this).data('nopol1');
+                // detail trip
+                $('#tVehicleTrips').on('click', '.btnDetailTrip', function(e) {
+                    e.preventDefault();
+                    const vid = $(this).data('vid');
+                    const tgl0 = $(this).data('tgl0');
+                    const tgl1 = $(this).data('tgl1');
+                    const nopol1 = $(this).data('nopol1');
 
-					// $("#mdlDetailTrip").load("{{ route('view_report_trip_detail') }}");
-					$('#mdlDetailTrip').empty().load("{{ route('view_report_trip_detail') }}", `vid=${vid}&tgl0=${tgl0}&tgl1=${tgl1}&nopol1=${nopol1}`, () => {
-						$('#mdlDetailTrip').modal('show')
-					})
-					
-				});
+                    // $("#mdlDetailTrip").load("{{ route('view_report_trip_detail') }}");
+                    $('#mdlDetailTrip').empty().load("{{ route('view_report_trip_detail') }}",
+                        `vid=${vid}&tgl0=${tgl0}&tgl1=${tgl1}&nopol1=${nopol1}`, () => {
+                            $('#mdlDetailTrip').modal('show')
+                        })
+
+                });
             },
         };
 
         const DTable = {
-			table: null,
-    		lastAjax: null, // keep track of the last ajax request
+            table: null,
+            lastAjax: null, // keep track of the last ajax request
             activate: function() {
                 DTable.reload();
             },
             reload: function() {
-				// Abort the last request if it's still running
-				if (DTable.lastAjax) {
-					DTable.lastAjax.abort();
-				}
-				if (DTable.table) {
-					// If table already exists → reload
-					DTable.table.ajax.reload();
-					return;
-				}
+                // Abort the last request if it's still running
+                if (DTable.lastAjax) {
+                    DTable.lastAjax.abort();
+                }
+                if (DTable.table) {
+                    // If table already exists → reload
+                    DTable.table.ajax.reload();
+                    return;
+                }
 
-				DTable.table = $('#tVehicleTrips').DataTable({
-					searching: false,   // 🔹 remove search box
-					ordering: false,    // 🔹 disable sorting for all columns
-					processing: true,
-					serverSide: false,
-					bLengthChange: true,
-					deferRender: true,
-					destroy: true,
-					ajax: function(data, callback, settings) {
-						// Abort previous
-						if (DTable.lastAjax) {
-							DTable.lastAjax.abort();
-						}
+                DTable.table = $('#tVehicleTrips').DataTable({
+                    searching: false, // 🔹 remove search box
+                    ordering: false, // 🔹 disable sorting for all columns
+                    processing: true,
+                    serverSide: false,
+                    bLengthChange: true,
+                    deferRender: true,
+                    destroy: true,
+                    ajax: function(data, callback, settings) {
+                        // Abort previous
+                        if (DTable.lastAjax) {
+                            DTable.lastAjax.abort();
+                        }
 
-						// Fire new request
-						DTable.lastAjax = $.ajax({
-							url: `{{ route('api_report_vehicle_trips_list') }}?
+                        // Fire new request
+                        DTable.lastAjax = $.ajax({
+                            url: `{{ route('api_report_vehicle_trips_list') }}?
 								cptid=${AppState.current_company}
 								&from_date=${moment($('#tgl0').val(), "DD-MM-YYYY HH:mm").unix()}
 								&to_date=${moment($('#tgl1').val(), "DD-MM-YYYY HH:mm").unix()}
 								&vid=${$('#filterNopol').val() || ''}
+                                &vt=${$('#vehicleType').val() || ''}
 							`,
-							type: 'GET',
-							success: function(json) {
-								callback(json);
-							},
-							error: function(xhr, status, error) {
-								if (status !== 'abort') {
-									console.error("AJAX error:", error);
-								}
-							},
-							complete: function() {
-								DTable.lastAjax = null;
-							}
-						});
-					},
+                            type: 'GET',
+                            success: function(json) {
+                                callback(json);
+                            },
+                            error: function(xhr, status, error) {
+                                if (status !== 'abort') {
+                                    console.error("AJAX error:", error);
+                                }
+                            },
+                            complete: function() {
+                                DTable.lastAjax = null;
+                            }
+                        });
+                    },
                     deferRender: true,
-					columns: [
-						{ data: 'id', visible: false }, // vhc_id
-						{
-							data: 'nopol1',
-							className: 'text-start',
-							visible: true,
-							orderable: true,
-							searchable: true,
-						},
-						{ data: "dc_code", className: 'text-start'},
-						{ data: "pool_code", className: 'text-start'},
-						{ data: "total_trip", className: 'text-end'},
-						{ data: "total_mileage", className: 'text-end', render: (data, type, row, meta) => parseFloat(data).toFixed(2)},
-						{ data: "trip_id", className: 'text-end'},
-						{ 
-							data: 'start', 
-							render: (data, type, row, meta) => {
-								// let addr = row
-								return `
+                    columns: [{
+                            data: 'id',
+                            visible: false
+                        }, // vhc_id
+                        {
+                            data: 'nopol1',
+                            className: 'text-start',
+                            visible: true,
+                            orderable: true,
+                            searchable: true,
+                        },
+                        {
+                            data: "dc_code",
+                            className: 'text-start'
+                        },
+                        {
+                            data: "pool_code",
+                            className: 'text-start'
+                        },
+                        {
+                            data: "total_trip",
+                            className: 'text-end'
+                        },
+                        {
+                            data: "total_mileage",
+                            className: 'text-end',
+                            render: (data, type, row, meta) => parseFloat(data).toFixed(2)
+                        },
+                        {
+                            data: "trip_id",
+                            className: 'text-end'
+                        },
+                        {
+                            data: 'start',
+                            render: (data, type, row, meta) => {
+                                // let addr = row
+                                return `
 									${moment.unix(data + AppState.TIMEFIX).format('DD MMM YYYY HH:mm:ss')}<br>
 									${Helper.shortenText(decodeURIComponent(row.startLoc || 'address'), 255) || "-"}
 								`;
-							} 
-						},
-						{ 
-							data: 'finish', 
-							render: (data, type, row, meta) => {
-								// let addr = row
-								return `
+                            }
+                        },
+                        {
+                            data: 'finish',
+                            render: (data, type, row, meta) => {
+                                // let addr = row
+                                return `
 									${moment.unix(data + AppState.TIMEFIX).format('DD MMM YYYY HH:mm:ss')}<br>
 									${Helper.shortenText(decodeURIComponent(row.finishLoc || 'address'), 255) || "-"}
 								`;
-							} 
-						},
-						{ 
-							className: 'text-start', render: function(data, type, row, meta) {
-								const start = moment.unix(row.start);
-								const finish = moment.unix(row.finish);
-		
-								// calculate duration
-								const diff = moment.duration(finish.diff(start));
-								const hours = Math.floor(diff.asHours());
-								const minutes = diff.minutes();
-
-								return `${hours}h ${minutes}m`;							
-							}
-						},
-						{ 
-							data: 'startMileage', 
-							className: 'text-end', render: function(data, type, row, meta) {
-								return (data === null) ? '0' : parseFloat(data).toFixed(0);
-							}
-						},
-						{ 
-							data: 'finishMileage', 
-							className: 'text-end', render: function(data, type, row, meta) {
-								return (data === null) ? '0' : parseFloat(data).toFixed(0);
-							}
-						},
-						{ 
-							data: 'mileage', 
-							className: 'text-end', render: function(data, type, row, meta) {
-								// const mileage = (row.finishMileage !== null && row.startMileage !== null) ? (row.finishMileage - row.startMileage) : row.mileage;
-								return (parseFloat(data).toFixed(2));
-							}
-						},
-						{ 
-							data: 'fuel_consume', 
-							className: 'text-end', render: function(data, type, row, meta) {
-								// const mileage = (row.finishMileage !== null && row.startMileage !== null) ? (row.finishMileage - row.startMileage) : row.mileage;
-								return (parseFloat(data/10).toFixed(1));
-							}
-						},
+                            }
+                        },
                         {
-							// visible: false,
+                            className: 'text-start',
+                            render: function(data, type, row, meta) {
+                                const start = moment.unix(row.start);
+                                const finish = moment.unix(row.finish);
+
+                                // calculate duration
+                                const diff = moment.duration(finish.diff(start));
+                                const hours = Math.floor(diff.asHours());
+                                const minutes = diff.minutes();
+
+                                return `${hours}h ${minutes}m`;
+                            }
+                        },
+                        {
+                            data: 'startMileage',
+                            className: 'text-end',
+                            render: function(data, type, row, meta) {
+                                return (data === null) ? '0' : parseFloat(data).toFixed(0);
+                            }
+                        },
+                        {
+                            data: 'finishMileage',
+                            className: 'text-end',
+                            render: function(data, type, row, meta) {
+                                return (data === null) ? '0' : parseFloat(data).toFixed(0);
+                            }
+                        },
+                        {
+                            data: 'mileage',
+                            className: 'text-end',
+                            render: function(data, type, row, meta) {
+                                // const mileage = (row.finishMileage !== null && row.startMileage !== null) ? (row.finishMileage - row.startMileage) : row.mileage;
+                                return (parseFloat(data).toFixed(2));
+                            }
+                        },
+                        {
+                            data: 'fuel_consume',
+                            className: 'text-end',
+                            render: function(data, type, row, meta) {
+                                // const mileage = (row.finishMileage !== null && row.startMileage !== null) ? (row.finishMileage - row.startMileage) : row.mileage;
+                                return (parseFloat(data / 10).toFixed(1));
+                            }
+                        },
+                        {
+                            data: "type_name",
+                            className: 'text-start'
+                        },
+                        {
+                            // visible: false,
                             data: 'vhc_id',
                             className: 'text-center',
                             render: function(data, type, row, meta) {
                                 let action = `
-									<a href="#" class="text-decoration-none me-1 btnDetailTrip" 
+									<a href="#" class="text-decoration-none me-1 btnDetailTrip"
 										data-vid="${data}" data-tgl0="${row.start}" data-tgl1="${row.finish}" data-nopol1="${row.nopol1}">
 										<span class="icon ion-eye fz-16"></span>
 									</a>
@@ -400,63 +444,67 @@
                                 return action;
                             }
                         },
-					],
-					paging: false,
-					drawCallback: function (settings) {
-						const api = this.api();
-						const rows = api.rows({ page: 'current' }).nodes();
-						let last = null;
+                    ],
+                    paging: false,
+                    drawCallback: function(settings) {
+                        const api = this.api();
+                        const rows = api.rows({
+                            page: 'current'
+                        }).nodes();
+                        let last = null;
 
-						api.column(0, { page: 'current' }) // vhc_id col
-							.data()
-							.each(function (group, i) {
-								if (last !== group) {
-									// count how many rows this vhc_id spans
-									const rowspanCount = api
-										.column(0, { page: 'current' })
-										.data()
-										.filter(function (d) {
-											return d === group;
-										}).length;
+                        api.column(0, {
+                                page: 'current'
+                            }) // vhc_id col
+                            .data()
+                            .each(function(group, i) {
+                                if (last !== group) {
+                                    // count how many rows this vhc_id spans
+                                    const rowspanCount = api
+                                        .column(0, {
+                                            page: 'current'
+                                        })
+                                        .data()
+                                        .filter(function(d) {
+                                            return d === group;
+                                        }).length;
 
-									// merge vhc_id
-									$(rows).eq(i).find('td:eq(0)').attr('rowspan', rowspanCount);
-									$(rows).eq(i).find('td:eq(1)').attr('rowspan', rowspanCount);
-									$(rows).eq(i).find('td:eq(2)').attr('rowspan', rowspanCount);
-									$(rows).eq(i).find('td:eq(3)').attr('rowspan', rowspanCount);
-									$(rows).eq(i).find('td:eq(4)').attr('rowspan', rowspanCount);
-									
-									// $(rows).eq(i).find('td:eq(3)').attr('rowspan', rowspanCount);
+                                    // merge vhc_id
+                                    $(rows).eq(i).find('td:eq(0)').attr('rowspan', rowspanCount);
+                                    $(rows).eq(i).find('td:eq(1)').attr('rowspan', rowspanCount);
+                                    $(rows).eq(i).find('td:eq(2)').attr('rowspan', rowspanCount);
+                                    $(rows).eq(i).find('td:eq(3)').attr('rowspan', rowspanCount);
+                                    $(rows).eq(i).find('td:eq(4)').attr('rowspan', rowspanCount);
 
-									last = group;
-								} else {
-									// remove duplicate cells
-									$(rows).eq(i).find('td:eq(0)').remove();
-									$(rows).eq(i).find('td:eq(0)').remove();
-									$(rows).eq(i).find('td:eq(0)').remove();
-									$(rows).eq(i).find('td:eq(0)').remove();
-									$(rows).eq(i).find('td:eq(0)').remove();
-									// $(rows).eq(i).find('td:eq(0)').remove();
-								}
-							});
-						},
-					buttons: [
-						{
-							extend: 'excelHtml5',
-							title: () => {
-								return `
-								Vehicle Trip Report - 
-								${moment($('#tgl0').val(), "DD-MM-YYYY HH:mm").format('DD MMM YYYY HH:mm')} 
-								to 
+                                    // $(rows).eq(i).find('td:eq(3)').attr('rowspan', rowspanCount);
+
+                                    last = group;
+                                } else {
+                                    // remove duplicate cells
+                                    $(rows).eq(i).find('td:eq(0)').remove();
+                                    $(rows).eq(i).find('td:eq(0)').remove();
+                                    $(rows).eq(i).find('td:eq(0)').remove();
+                                    $(rows).eq(i).find('td:eq(0)').remove();
+                                    $(rows).eq(i).find('td:eq(0)').remove();
+                                    // $(rows).eq(i).find('td:eq(0)').remove();
+                                }
+                            });
+                    },
+                    buttons: [{
+                        extend: 'excelHtml5',
+                        title: () => {
+                            return `
+								Vehicle Trip Report -
+								${moment($('#tgl0').val(), "DD-MM-YYYY HH:mm").format('DD MMM YYYY HH:mm')}
+								to
 								${moment($('#tgl1').val(), "DD-MM-YYYY HH:mm").format('DD MMM YYYY HH:mm')}`
-							},
-							className: 'd-none', // hide default button
-							exportOptions: {
-								columns: ':visible:not(:last-child)' // 
-							}
-						}
-					]
-				});
+                        },
+                        className: 'd-none', // hide default button
+                        exportOptions: {
+                            columns: ':visible:not(:last-child)' //
+                        }
+                    }]
+                });
             },
         };
 
diff --git a/routes/web.php b/routes/web.php
index 14373aa..c321824 100755
--- a/routes/web.php
+++ b/routes/web.php
@@ -158,7 +158,7 @@ Route::middleware(["auth", "auth.user"])->group(function () {
     );
     Route::get("/config/logbook_keys", "LogbookKeysController@view_lgb_keys")->name("view_config_lgb_keys");
 
-	// config distribution category
+    // config distribution category
     Route::get("/config/distribution_category", "ConfDistributionController@view_distribution_category")
         ->name("view_config_distribution_category")
         ->middleware("permission:config_distribution_category.view");
@@ -167,28 +167,27 @@ Route::middleware(["auth", "auth.user"])->group(function () {
     Route::get("/api/conf/distribution_category/{id}", "ConfDistributionController@api_show_distribution_category")->name("api_conf_show_distribution_category");
     Route::delete("/api/conf/distribution_category/{id}", "ConfDistributionController@api_del_distribution_category")->name("api_conf_del_distribution_category");
 
-	// config pool
+    // config pool
     Route::get("/config/pool", "ConfPoolController@view_pool")
-		->name("view_config_pool")
-		->middleware("permission:config_pool.view");
+        ->name("view_config_pool")
+        ->middleware("permission:config_pool.view");
     Route::post("/api/conf/pool", "ConfPoolController@api_add_pool")->name("api_conf_add_pool");
     Route::get("/api/conf/pool", "ConfPoolController@api_list_pool")->name("api_conf_list_pool");
     Route::get("/api/conf/pool/{id}", "ConfPoolController@api_show_pool")->name("api_conf_show_pool");
     Route::delete("/api/conf/pool/{id}", "ConfPoolController@api_del_pool")->name("api_conf_del_pool")->middleware("permission:config_pool.delete");
 
 
-	// reports
+    // reports
     Route::get("/reports/vehicle-trips", "ReportsController@view_report_vehicle_trips")->name("view_report_vehicle_trips");
     Route::get("/reports/vehicle-trips-list", "ReportsController@api_report_vehicle_trips_list")->name("api_report_vehicle_trips_list");
     Route::get("/reports/vehicle-trip-detail", "ReportsController@view_report_trip_detail")->name("view_report_trip_detail");
     Route::get("/reports/abnormalities", "ReportsController@view_report_abnormalities")->name("view_report_abnormalities");
     Route::get("/reports/abnormalities-list", "ReportsController@api_report_abnormalities_list")->name("api_report_abnormalities_list");
-
-	// media
+    // media
     Route::get("/media", "MediaController@view_media")
-		->name("view_media")
-		->middleware("permission:media.view");
-	Route::get("/api/media", "MediaController@api_get_media")->name("api_get_media");
+        ->name("view_media")
+        ->middleware("permission:media.view");
+    Route::get("/api/media", "MediaController@api_get_media")->name("api_get_media");
 
 
     Route::get("/user/vendor/transactions", "MenuController@view_user_vendor_transaction")->name(