time fix 1

This commit is contained in:
Pringgosutono
2025-09-18 14:48:15 +07:00
parent 0fe1cac8bf
commit e1153c375d
4 changed files with 10 additions and 9 deletions

View File

@ -34,6 +34,7 @@ class ReportsController extends Controller
} }
public function api_report_vehicle_trips_list(Request $req) public function api_report_vehicle_trips_list(Request $req)
{ {
// $TIMEFIX = Helper::TIMEFIX;
// Validate input // Validate input
// date in unix datetime format // date in unix datetime format
// dd($req->type); // dd($req->type);
@ -51,8 +52,8 @@ class ReportsController extends Controller
// $from_date = $req->input('from_date'); // $from_date = $req->input('from_date');
// $to_date = $req->input('to_date'); // $to_date = $req->input('to_date');
$from_date = $req->input('from_date'); $from_date = $req->input('from_date') - Helper::TIMEFIX;
$to_date = $req->input('to_date'); $to_date = $req->input('to_date') - Helper::TIMEFIX;
$vid = $req->input('vid'); $vid = $req->input('vid');
// $from_date = 1756054800; // $from_date = 1756054800;
// $to_date = 1756745940; // $to_date = 1756745940;
@ -280,8 +281,8 @@ class ReportsController extends Controller
return new Response($apiResp, $apiResp["meta"]["code"]); return new Response($apiResp, $apiResp["meta"]["code"]);
} }
$from_date = $req->input('from_date'); $from_date = $req->input('from_date') - Helper::TIMEFIX;
$to_date = $req->input('to_date'); $to_date = $req->input('to_date') - Helper::TIMEFIX;
$vid = $req->input('vid'); $vid = $req->input('vid');
try { try {

View File

@ -108,7 +108,7 @@
<script> <script>
$(document).ready(function(){ $(document).ready(function(){
$('.time').each(function () { $('.time').each(function () {
const unix = parseInt($(this).text().trim()); const unix = parseInt($(this).text().trim()) + AppState.TIMEFIX;
$(this).text(moment.unix(unix).format('DD MMM YYYY HH:mm:ss')); $(this).text(moment.unix(unix).format('DD MMM YYYY HH:mm:ss'));
}); });

View File

@ -211,10 +211,10 @@
className: 'text-start', className: 'text-start',
}, },
{ {
data: "crt_s", data: "crt_d",
className: 'text-nowrap', className: 'text-nowrap',
render: (data, type, row, meta) => { render: (data, type, row, meta) => {
return moment.unix(data).format('DD MMM YYYY HH:mm:ss'); return moment.unix(data + AppState.TIMEFIX).format('DD MMM YYYY HH:mm:ss');
} }
}, },
{ data: "speed", className: 'text-end'}, { data: "speed", className: 'text-end'},

View File

@ -331,7 +331,7 @@
render: (data, type, row, meta) => { render: (data, type, row, meta) => {
// let addr = row // let addr = row
return ` return `
${moment.unix(data).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) || "-"}
`; `;
} }
@ -341,7 +341,7 @@
render: (data, type, row, meta) => { render: (data, type, row, meta) => {
// let addr = row // let addr = row
return ` return `
${moment.unix(data).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.finishLoc || 'address'), 255) || "-"} ${Helper.shortenText(decodeURIComponent(row.finishLoc || 'address'), 255) || "-"}
`; `;
} }