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-07-14 10:55:42 +07:00
parent 583ea3b9a0
commit 32229a1b52
2 changed files with 133 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -25,8 +25,8 @@
@if ($user_role == \App\Models\Users::ROLE_VENDOR || $user_role == \App\Models\Users::ROLE_ADMIN) @if ($user_role == \App\Models\Users::ROLE_VENDOR || $user_role == \App\Models\Users::ROLE_ADMIN)
@can('vehicle.create') @can('vehicle.create')
<!-- <div class="col text-end"> <!-- <div class="col text-end">
<button id="btnMdlNewVhc" class="btn btn-sm btn-danger">Add New Vehicle</button> <button id="btnMdlNewVhc" class="btn btn-sm btn-danger">Add New Vehicle</button>
</div> --> </div> -->
@endcan @endcan
{{-- <div class="col-auto text-end ps-0"> {{-- <div class="col-auto text-end ps-0">
@ -129,73 +129,73 @@
</tr> </tr>
</thead> </thead>
<!-- <tbody> <!-- <tbody>
<tr> <tr>
<td>24-679</td> <td>24-679</td>
<td>24-679</td> <td>24-679</td>
<td>26</td> <td>26</td>
<td>442.3</td> <td>442.3</td>
</tr> </tr>
<tr> <tr>
<td>24-682</td> <td>24-682</td>
<td>24-682</td> <td>24-682</td>
<td>28</td> <td>28</td>
<td>312.7</td> <td>312.7</td>
</tr> </tr>
<tr> <tr>
<td>24-877</td> <td>24-877</td>
<td>24-877</td> <td>24-877</td>
<td>15</td> <td>15</td>
<td>276.4</td> <td>276.4</td>
</tr> </tr>
<tr> <tr>
<td>A.16-347</td> <td>A.16-347</td>
<td>A.16-347</td> <td>A.16-347</td>
<td>37</td> <td>37</td>
<td>543.2</td> <td>543.2</td>
</tr> </tr>
<tr> <tr>
<td>AL2025-B21</td> <td>AL2025-B21</td>
<td>AL2025-B21</td> <td>AL2025-B21</td>
<td>18</td> <td>18</td>
<td>295.4</td> <td>295.4</td>
</tr> </tr>
<tr> <tr>
<td>B.16-542</td> <td>B.16-542</td>
<td>B.16-542</td> <td>B.16-542</td>
<td>32</td> <td>32</td>
<td>478.2</td> <td>478.2</td>
</tr> </tr>
<tr> <tr>
<td>B.24-264</td> <td>B.24-264</td>
<td>B.24-264</td> <td>B.24-264</td>
<td>24</td> <td>24</td>
<td>188.4</td> <td>188.4</td>
</tr> </tr>
<tr> <tr>
<td>B.24-274</td> <td>B.24-274</td>
<td>B.24-274</td> <td>B.24-274</td>
<td>33</td> <td>33</td>
<td>440.1</td> <td>440.1</td>
</tr> </tr>
<tr> <tr>
<td>Ford Ranger</td> <td>Ford Ranger</td>
<td>26-199</td> <td>26-199</td>
<td>30</td> <td>30</td>
<td>631.4</td> <td>631.4</td>
</tr> </tr>
<tr> <tr>
<td>Nissan AD</td> <td>Nissan AD</td>
<td>B.10-517</td> <td>B.10-517</td>
<td>27</td> <td>27</td>
<td>375.9</td> <td>375.9</td>
</tr> </tr>
<tr> <tr>
<td>Triton</td> <td>Triton</td>
<td>A.29-127</td> <td>A.29-127</td>
<td>26</td> <td>26</td>
<td>508.2</td> <td>508.2</td>
</tr> </tr>
</tbody> --> </tbody> -->
</table> </table>
</div> </div>
</div> </div>
@ -207,17 +207,17 @@
<div class="modal fade" data-bs-backdrop="static" data-bs-keyboard="false" id="mdlDetailTrip" <div class="modal fade" data-bs-backdrop="static" data-bs-keyboard="false" id="mdlDetailTrip"
aria-labelledby="mdlDetailTripLabel" aria-hidden="true"> aria-labelledby="mdlDetailTripLabel" aria-hidden="true">
<!-- <div class="modal-dialog modal-dialog modal-dialog-centered modal-dialog-scrollable modal-xl"> <!-- <div class="modal-dialog modal-dialog modal-dialog-centered modal-dialog-scrollable modal-xl">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h5 class="modal-title" id="mdlDetailTripLabel">-----</h5> <h5 class="modal-title" id="mdlDetailTripLabel">-----</h5>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button> <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div> </div>
<div class="modal-body"> <div class="modal-body">
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
</div> </div>
</div> </div>
</div> --> </div> -->
</div> </div>
@endsection @endsection
@ -321,6 +321,30 @@
// Radius toleransi "berdekatan" dalam meter — sesuaikan sesuai kebutuhan // Radius toleransi "berdekatan" dalam meter — sesuaikan sesuai kebutuhan
const SITE_PROXIMITY_RADIUS_METERS = 500; const SITE_PROXIMITY_RADIUS_METERS = 500;
// Helper untuk parse string "lat, long" menjadi { lat, lng }
function parseLatLong(latLongStr) {
if (!latLongStr || typeof latLongStr !== 'string') {
return {
lat: null,
lng: null
};
}
const parts = latLongStr.split(',').map(part => parseFloat(part.trim()));
if (parts.length !== 2 || isNaN(parts[0]) || isNaN(parts[1])) {
return {
lat: null,
lng: null
};
}
return {
lat: parts[0],
lng: parts[1]
};
}
// Hitung jarak antara 2 koordinat (formula Haversine), hasil dalam meter // Hitung jarak antara 2 koordinat (formula Haversine), hasil dalam meter
function getDistanceMeters(lat1, lon1, lat2, lon2) { function getDistanceMeters(lat1, lon1, lat2, lon2) {
const R = 6371000; // radius bumi (meter) const R = 6371000; // radius bumi (meter)
@ -470,12 +494,15 @@
{ {
data: 'start', data: 'start',
render: (data, type, row, meta) => { render: (data, type, row, meta) => {
// Parse start_lat_long -> { lat, lng }
const {
lat: startLat,
lng: startLng
} = parseLatLong(row.start_lat_long);
// saat export, hanya tampilkan lokasi tanpa tanggal/jam // saat export, hanya tampilkan lokasi tanpa tanggal/jam
if (type === 'export') { if (type === 'export') {
const nearestSite = findNearestSite( const nearestSite = findNearestSite(startLat, startLng);
row.start_latitude,
row.start_longitude
);
if (nearestSite) { if (nearestSite) {
return formatSiteLabel(nearestSite); return formatSiteLabel(nearestSite);
@ -483,50 +510,30 @@
return Helper.shortenText(decodeURIComponent(row.startLoc || return Helper.shortenText(decodeURIComponent(row.startLoc ||
'address'), 255) || "-"; 'address'), 255) || "-";
} }
const nearestSite = findNearestSite(
row.start_latitude, const nearestSite = findNearestSite(startLat, startLng);
row.start_longitude
);
if (nearestSite) { if (nearestSite) {
return formatSiteLabel(nearestSite); return formatSiteLabel(nearestSite);
} }
return ` return `
${moment.unix(data + AppState.TIMEFIX).format('DD MMM YYYY HH:mm:ss')}<br> ${moment.unix(data + AppState.TIMEFIX).format('DD MMM YYYY HH:mm:ss')}<br>
${Helper.shortenText(decodeURIComponent(row.startLoc || 'address'), 255) || "-"} ${Helper.shortenText(decodeURIComponent(row.startLoc || 'address'), 255) || "-"}
`; `;
} }
}, },
// {
// data: 'finish',
// render: (data, type, row, meta) => {
// console.log(row)
// // saat export, hanya tampilkan lokasi tanpa tanggal/jam
// if (type === 'export') {
// return Helper.shortenText(decodeURIComponent(row.finishLoc ||
// 'address'), 255) || "-";
// }
// return `
// ${moment.unix(data + AppState.TIMEFIX).format('DD MMM YYYY HH:mm:ss')}<br>
// ${Helper.shortenText(decodeURIComponent(row.finishLoc || 'address'), 255) || "-"}
// `;
// }
// },
{ {
data: 'finish', data: 'finish',
render: (data, type, row) => { render: (data, type, row) => {
// console.log(row.fulladdress); // Parse finish_lat_long -> { lat, lng }
// console.log(row.latitude); const {
// console.log(row.longitude); lat: finishLat,
// console.log("End Loc : ",row.endLoc) lng: finishLng
} = parseLatLong(row.finish_lat_long);
// Saat export Excel // Saat export Excel
if (type === 'export') { if (type === 'export') {
const nearestSite = findNearestSite(finishLat, finishLng);
const nearestSite = findNearestSite(
row.finish_latitude,
row.finish_longitude
);
if (nearestSite) { if (nearestSite) {
return formatSiteLabel(nearestSite); return formatSiteLabel(nearestSite);
@ -538,10 +545,7 @@
) || '-'; ) || '-';
} }
const nearestSite = findNearestSite( const nearestSite = findNearestSite(finishLat, finishLng);
row.finish_latitude,
row.finish_longitude
);
if (nearestSite) { if (nearestSite) {
return formatSiteLabel(nearestSite); return formatSiteLabel(nearestSite);
@ -549,16 +553,16 @@
// Tampilan di tabel // Tampilan di tabel
return ` return `
${moment.unix(data + AppState.TIMEFIX) ${moment.unix(data + AppState.TIMEFIX)
.format('DD MMM YYYY HH:mm:ss')} .format('DD MMM YYYY HH:mm:ss')}
<br> <br>
${ ${
Helper.shortenText( Helper.shortenText(
decodeURIComponent(row.finishLoc || 'address'), decodeURIComponent(row.finishLoc || 'address'),
255 255
) || '-' ) || '-'
} }
`; `;
} }
}, },
{ {