diff --git a/resources/views/menu_v1/dashboard.blade.php b/resources/views/menu_v1/dashboard.blade.php index a1163af..70d376b 100755 --- a/resources/views/menu_v1/dashboard.blade.php +++ b/resources/views/menu_v1/dashboard.blade.php @@ -1321,11 +1321,23 @@ // // `); let arrIdx = Helper.getIndexReversedSequence(obj.key_index - 1, Trucks.last_move.length - 1); + // +7 + // $('#infoMove-plots').append(` + // + //
  • + //

    ${arrIdx + 1}

    + //

    Time: ${moment.unix(obj?.lst_loc_crt_d).format('DD MMM YYYY HH:mm:ss')}

    + //

    ${Number(obj.latitude).toFixed(5)} - ${Number(obj.longitude).toFixed(6)}

    + //

    ${Helper.shortenText(decodeURIComponent(obj?.fulladdress || 'address'), 255)}

    + //

    Current speed: ${Number(obj.speed)}km/h

    + //
  • + //
    + // `); $('#infoMove-plots').append(`
  • ${arrIdx + 1}

    -

    Time: ${moment.unix(obj?.lst_loc_crt_d).format('DD MMM YYYY HH:mm:ss')}

    +

    Time: ${moment.unix(obj?.lst_loc_crt_d).utcOffset(9 * 60).format('DD MMM YYYY HH:mm:ss')}

    ${Number(obj.latitude).toFixed(5)} - ${Number(obj.longitude).toFixed(6)}

    ${Helper.shortenText(decodeURIComponent(obj?.fulladdress || 'address'), 255)}

    Current speed: ${Number(obj.speed)}km/h

    @@ -1347,7 +1359,8 @@ lat: tr.latitude, lng: tr.longitude, // label: `${tr.key_index}
    ${tr.nopol1} ${tr.nopol2} ${tr.nopol3}
    ${moment.unix(tr?.lst_loc_crt).format('DD MMM YYYY HH:mm')}
    Speed: ${(typeof tr.lst_speed != 'undefined') ? tr.lst_speed : '0'}
    ${tr.latitude},${tr.longitude}
    ${decodeURIComponent(tr?.fulladdress || 'address')}`, - label: `${tr.nopol1} ${tr.nopol2} ${tr.nopol3}
    ${moment.unix(tr?.lst_loc_crt).format('DD MMM YYYY HH:mm')}
    ${decodeURIComponent(tr?.fulladdress || 'address')}.

    Current speed: ${tr?.speed}km/h`, + // label: `${tr.nopol1} ${tr.nopol2} ${tr.nopol3}
    ${moment.unix(tr?.lst_loc_crt).format('DD MMM YYYY HH:mm')}
    ${decodeURIComponent(tr?.fulladdress || 'address')}.

    Current speed: ${tr?.speed}km/h`, + label: `${tr.nopol1} ${tr.nopol2} ${tr.nopol3}
    ${moment.unix(tr?.lst_loc_crt_d).utcOffset(9 * 60).format('DD MMM YYYY HH:mm:ss')}
    ${decodeURIComponent(tr?.fulladdress || 'address')}.

    Current speed: ${tr?.speed}km/h`, options: { // icon: Icon.destination() } @@ -2372,8 +2385,8 @@ `${State.storage_lara}${truck?.fvhc_img}`); $('#infoVehicles-platno').text(`${truck?.nopol1} ${truck?.nopol2} ${truck?.nopol3}`); // vehicles - $('#infoVehicles-crt').text(moment.unix(truck?.lst_loc_crt).format( - 'DD MMM YYYY HH:mm')); + // $('#infoVehicles-crt').text(moment.unix(truck?.lst_loc_crt).format('DD MMM YYYY HH:mm')); + $('#infoVehicles-crt').text(moment.unix(truck?.lst_loc_crt_d).utcOffset(9 * 60).format('DD MMM YYYY HH:mm:ss')); // ${(truck?.city_text || truck?.state_text || 'address')} - ${(truck?.postcode || 'postcode')} if (truck?.ignition == State.stts_ignition.high) { $('#infoVehicles-ignition').text('ON'); @@ -2412,11 +2425,9 @@ $('#infoVehicles-isTrackHoliday').text(truck?.is_track_holiday_text); $('#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')); - + $('#infoVehicles-serviceStart').text(moment.unix(truck?.vhc_crt).utcOffset(9 * 60).format('DD MMM YYYY HH:mm:ss')); // driver - $('#infoDrv-updt').text((truck?.ord_crt) ? moment.unix(truck?.ord_crt).format('DD MMM YYYY HH:mm') : '-'); + $('#infoDrv-updt').text((truck?.ord_crt) ? moment.unix(truck?.ord_crt).utcOffset(9 * 60).format('DD MMM YYYY HH:mm:ss') : '-'); $('#infoDrv-name').text(truck?.ord_drv_name ?? 'Off Duty'); $('.infoDrv-phone1-text').text((truck?.ord_drv_phone_val) ? Helper.splitEvery4Char('0' + truck?.ord_drv_phone_val) : '-'); $('#infoDrv-phone1-tel').attr('tel:0' + (truck?.ord_drv_phone_val ?? '')); @@ -2573,7 +2584,8 @@ }, // circle // label: `${obj.key_index}
    ${obj.nopol1} ${obj.nopol2} ${obj.nopol3}
    ${moment.unix(obj?.lst_loc_crt).format('DD MMM YYYY HH:mm')}
    Speed: ${(typeof obj.speed != 'undefined') ? obj.speed : '0'}
    ${Number(obj.latitude).toFixed(5)} - ${Number(obj.longitude).toFixed(6)}
    ${decodeURIComponent(obj?.fulladdress || 'address')}`, - label: `${obj.nopol1} ${obj.nopol2} ${obj.nopol3}
    ${moment.unix(obj?.lst_loc_crt).format('DD MMM YYYY HH:mm')}
    ${decodeURIComponent(obj?.fulladdress || 'address')}`, + // label: `${obj.nopol1} ${obj.nopol2} ${obj.nopol3}
    ${moment.unix(obj?.lst_loc_crt).format('DD MMM YYYY HH:mm')}
    ${decodeURIComponent(obj?.fulladdress || 'address')}`, + label: `${obj.nopol1} ${obj.nopol2} ${obj.nopol3}
    ${moment.unix(obj?.lst_loc_crt_d).utcOffset(9 * 60).format('DD MMM YYYY HH:mm:ss')}
    ${decodeURIComponent(obj?.fulladdress || 'address')}`, } }); @@ -2597,7 +2609,8 @@ let startMarker = Leaflet.addMarkers({ lat: start.latitude, lng: start.longitude, - label: `Start Poin
    ${start.nopol1} ${start.nopol2} ${start.nopol3}
    ${moment.unix(start?.lst_loc_crt).format('DD MMM YYYY HH:mm')}
    Speed: ${(typeof start.lst_speed != 'undefined') ? start.lst_speed : '0'}
    ${Number(start.latitude).toFixed(5)},${Number(start.longitude).toFixed(6)}
    ${decodeURIComponent(start.fulladdress || 'address')}`, + // label: `Start Poin
    ${start.nopol1} ${start.nopol2} ${start.nopol3}
    ${moment.unix(start?.lst_loc_crt).format('DD MMM YYYY HH:mm')}
    Speed: ${(typeof start.lst_speed != 'undefined') ? start.lst_speed : '0'}
    ${Number(start.latitude).toFixed(5)},${Number(start.longitude).toFixed(6)}
    ${decodeURIComponent(start.fulladdress || 'address')}`, + label: `Start Poin
    ${start.nopol1} ${start.nopol2} ${start.nopol3}
    ${moment.unix(start?.lst_loc_crt_d).utcOffset(9 * 60).format('DD MMM YYYY HH:mm:ss')}
    Speed: ${(typeof start.lst_speed != 'undefined') ? start.lst_speed : '0'}
    ${Number(start.latitude).toFixed(5)},${Number(start.longitude).toFixed(6)}
    ${decodeURIComponent(start.fulladdress || 'address')}`, options: { icon: Icon.titikAwal(), // rotationAngle: 290 @@ -2606,7 +2619,8 @@ let finishMarker = Leaflet.addMarkers({ lat: finish.latitude, lng: finish.longitude, - label: `End Poin
    ${finish.nopol1} ${finish.nopol2} ${finish.nopol3}
    ${moment.unix(finish?.lst_loc_crt).format('DD MMM YYYY HH:mm')}
    Speed: ${(typeof finish.lst_speed != 'undefined') ? finish.lst_speed : '0'}
    ${Number(finish.latitude).toFixed(5)},${Number(finish.longitude).toFixed(6)}
    ${decodeURIComponent(finish.fulladdress || 'address')}`, + // label: `End Poin
    ${finish.nopol1} ${finish.nopol2} ${finish.nopol3}
    ${moment.unix(finish?.lst_loc_crt).format('DD MMM YYYY HH:mm')}
    Speed: ${(typeof finish.lst_speed != 'undefined') ? finish.lst_speed : '0'}
    ${Number(finish.latitude).toFixed(5)},${Number(finish.longitude).toFixed(6)}
    ${decodeURIComponent(finish.fulladdress || 'address')}`, + label: `End Poin
    ${finish.nopol1} ${finish.nopol2} ${finish.nopol3}
    ${moment.unix(finish?.lst_loc_crt_d).utcOffset(9 * 60).format('DD MMM YYYY HH:mm:ss')}
    Speed: ${(typeof finish.lst_speed != 'undefined') ? finish.lst_speed : '0'}
    ${Number(finish.latitude).toFixed(5)},${Number(finish.longitude).toFixed(6)}
    ${decodeURIComponent(finish.fulladdress || 'address')}`, options: { icon: Icon.titikAkhir() }