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

Merge branch 'main' of https://git.shiblysolution.id/TIMOR-TELECOM/gps-frontend

Browse Source
This commit is contained in:
wayanrivan
2026-06-17 11:34:08 +07:00
parent 37c0c1ea25 e0f7bc2280
commit ef6089d623
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Controllers/VehiclesController.php
View File

@ -74,7 +74,7 @@ class VehiclesController extends Controller
$list = DB::select("SELECT $list = DB::select("SELECT
v.id, v.name, v.device_id, nopol1, nopol2, nopol3, v.sum_milleage, v.id, v.name, v.device_id, nopol1, nopol2, nopol3, v.sum_milleage,
fvhc_img, vyear, t.`desc` type_name, c_name company_name, rltm.crt_d, rltm.crt crt_rltm, fvhc_img, vyear, t.`desc` type_name, c_name company_name, rltm.crt_d, rltm.crt crt_rltm,
dvc.crt, dvc.simcard, fuel_curr, dvc.protocol dvc.crt, dvc.simcard, fuel_curr, dvc.protocol, v.cat_id, vc.name cat_name
FROM t_vehicles as v FROM t_vehicles as v
INNER JOIN t_vehicles_detail AS vd ON v.id = vd.vid INNER JOIN t_vehicles_detail AS vd ON v.id = vd.vid
LEFT JOIN t_vehicles_types AS t ON v.type_id = t.id LEFT JOIN t_vehicles_types AS t ON v.type_id = t.id
@ -82,6 +82,7 @@ class VehiclesController extends Controller
LEFT JOIN t_clients AS client ON vdr.client_group_id = client.id LEFT JOIN t_clients AS client ON vdr.client_group_id = client.id
LEFT JOIN t_devices AS dvc ON v.device_id = dvc.device_id LEFT JOIN t_devices AS dvc ON v.device_id = dvc.device_id
left join t_gps_tracks_rltm rltm on rltm.vhc_id = v.id left join t_gps_tracks_rltm rltm on rltm.vhc_id = v.id
LEFT JOIN t_vehicles_cats AS vc ON v.cat_id = vc.id
WHERE v.dlt is null WHERE v.dlt is null
ORDER BY v.id ASC ORDER BY v.id ASC
"); ");

8
resources/views/menu_v1/vehicles.blade.php
View File

@ -46,7 +46,7 @@
<th class="">Vehicle</th> <th class="">Vehicle</th>
<th class="">Name</th> <th class="">Name</th>
<th class="">Manufacture Year</th> <th class="">Manufacture Year</th>
<th class="">Type</th> <th class="">Category/<br>Type</th>
<th class="">Service Start</th> <th class="">Service Start</th>
@if ($user_role != \App\Models\Users::ROLE_VENDOR) @if ($user_role != \App\Models\Users::ROLE_VENDOR)
<th class="">Device</th> <th class="">Device</th>
@ -854,7 +854,11 @@
searchable: true, searchable: true,
render: function (data, type, row, meta) { render: function (data, type, row, meta) {
// return (`${row.brand_name}<br>-<br>${data}`); // return (`${row.brand_name}<br>-<br>${data}`);
return data; const a = `
${row.cat_name}<br>
${row.cat_name != row.type_name ? row.type_name : ''}
`;
return a;
}, },
}, },
{ {