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

fuel

Browse Source
This commit is contained in:
Pringgosutono
2025-10-30 10:32:01 +07:00
parent 8b833e7295
commit 8fb9731a90
4 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -248,7 +248,7 @@ class ReportsController extends Controller
$list = DB::select("SELECT
t.crt_d , t.latitude, t.longitude, t.speed,
tgta.fulladdress,
t.pre_milleage, t.vhc_milleage
t.pre_milleage, t.vhc_milleage, fuel_count
FROM
t_gps_tracks t
left join t_gps_tracks_address tgta on tgta.master_id = t.id
@ -280,6 +280,7 @@ class ReportsController extends Controller
$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;
$data = [
'nopol1' => $nopol1,
@ -291,6 +292,7 @@ class ReportsController extends Controller
'finish' => $finish,
'duration' => $duration,
'distance' => $distance,
'fuel_consumed' => $fuel_consumed,
];
// dd($list);
return view('menu_v1.reports._trip_detail', $data);

2
app/Models/Tracks.php
View File

@ -324,7 +324,7 @@ class Tracks extends Model
tr_addr.state_text AS lst_state_text, tr_addr.city_text AS lst_city_text,
tr_addr.district_text AS lst_district_text, tr_addr.village_text AS lst_village_text,
tr_addr.postcode AS lst_postcode, tr_addr.streets AS lst_streets,
tr_addr.fulladdress AS lst_fulladdress";
tr_addr.fulladdress AS lst_fulladdress, tr.fuel_curr";
if (isset($filter["active_rates"])) {
$query .= ",

5
resources/views/menu_v1/dashboard.blade.php
View File

@ -272,6 +272,10 @@
<p class="text-bold mb-0">Engine Status</p>
<p id="infoVehicles-engineStatus" class="text-muted mb-0">Idling</p>
</li>
<li class="list-group-item p-1 px-2">
<p class="text-bold mb-0">Fuel</p>
<p id="infoVehicles-fuel" class="text-muted mb-0">0</p>
</li>
{{-- <li class="list-group-item p-1 px-2">
<p class="text-bold mb-0">Durasi Berhenti (<span id="infoVehicles-idlingUnit">min</span>)</p>
@ -2569,6 +2573,7 @@
$('#infoVehicles-trackSch').text(truck?.track_schedule);
$('#infoVehicles-company').text(truck?.client_group_name);
$('#infoVehicles-serviceStart').text(moment.unix(truck?.vhc_crt).format('DD MMM YYYY HH:mm:ss'));
$('#infoVehicles-fuel').text((truck?.fuel_curr/10) + " L");
// driver
$('#infoDrv-updt').text((truck?.ord_crt) ? moment.unix(truck?.ord_crt).format('DD MMM YYYY HH:mm:ss') : '-');
$('#infoDrv-name').text(truck?.ord_drv_name ?? 'Off Duty');

14
resources/views/menu_v1/reports/_trip_detail.blade.php
View File

@ -44,27 +44,31 @@
<div class="col-12">
<h4>{{$nopol1}}</h4>
</div>
<div class="col-4">
<div class="col-6">
<p class="text-bold mb-0">Start</p>
<p class="mb-0 time">{{ $start['time'] }}</p>
<p class="mb-0">Vehicle Mileage: {{number_format($start['mileage'], 2)}} km</p>
<p>{{$start['fulladdress']}}</p>
</div>
<div class="col-4">
<div class="col-6">
<p class="text-bold mb-0">Finish</p>
<p class="mb-0 time">{{ $finish['time'] }}</p>
<p class="mb-0">Vehicle Mileage: {{number_format($finish['mileage'], 2)}} km</p>
<p>{{$finish['fulladdress']}}</p>
</div>
<div class="col-2">
<div class="col-4">
<p class="text-bold mb-0">Distance</p>
<p class="mb-0">{{number_format($distance, 2)}} km</p>
</div>
<div class="col-2">
<div class="col-4">
<p class="text-bold mb-0">Duration</p>
<p class="mb-0">{{$duration}}</p>
</div>
<div class="col-12">
<div class="col-4">
<p class="text-bold mb-0">Fuel consumed</p>
<p class="mb-0">{{$fuel_consumed/10}} L</p>
</div>
<div class="col-12 mt-2">
<div id="leafMap" style="height: 400px;"></div>
</div>
<div class="col-12">