TIMOR-TELECOM/gps-frontend
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
wayanrivan
2026-06-17 11:54:58 +07:00
parent ef6089d623
commit 2a2f3eac9a
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/ReportsController.php
View File

@ -23,7 +23,7 @@ class ReportsController extends Controller
public function view_report_vehicle_trips(Request $req) public function view_report_vehicle_trips(Request $req)
{ {
$q = "SELECT id, nopol1 from t_vehicles WHERE dlt is null order by nopol1"; $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(); $vehicletype = DB::table('t_vehicles_cats')->where('is_active', 1)->get();
$listNopol = DB::select($q); $listNopol = DB::select($q);
$data = [ $data = [
@ -156,7 +156,7 @@ class ReportsController extends Controller
FROM trips t FROM trips t
JOIN TotalMileage tm ON t.id = tm.id JOIN TotalMileage tm ON t.id = tm.id
LEFT JOIN t_vehicles tvt ON tvt.id = t.vhc_id LEFT JOIN t_vehicles tvt ON tvt.id = t.vhc_id
LEFT JOIN t_vehicles_types vt ON vt.id = tvt.type_id LEFT JOIN t_vehicles_cats vt ON vt.id = tvt.cat_id
WHERE WHERE
t.start BETWEEN ? AND ? t.start BETWEEN ? AND ?
and if(? , t.id = ? , 1=1) and if(? , t.id = ? , 1=1)

2
resources/views/menu_v1/reports/vehicle_trips.blade.php
View File

@ -107,7 +107,7 @@
<th class="">Finish (km)</th> <th class="">Finish (km)</th>
<th class="">Distance (km)</th> <th class="">Distance (km)</th>
<th class="">Fuel (L)</th> <th class="">Fuel (L)</th>
<th class="">Vehicle Type</th> <th class="">Vehicle Category</th>
<th class="">Detail</th> <th class="">Detail</th>
</tr> </tr>
</thead> </thead>