fleetmap-reports 1.0.627 → 1.0.629

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fleetmap-reports",
-  "version": "1.0.627",
+  "version": "1.0.629",
   "description": "",
   "main": "src/index.js",
   "scripts": {

package/src/idle-report.js

@@ -1,6 +1,6 @@
 const jsPDF = require('jspdf')
 const { headerFromUser, AmiriRegular } = require('./util/pdfDocument')
-const { convertToLocaleString, convertMS, getTranslations, getLanguage } = require('./util/utils')
+const { convertToLocaleString, convertMS, getTranslations, getLanguage, convertToLocaleDateString, convertToLocaleTimeString } = require('./util/utils')
 const { getStyle } = require('./reportStyle')
 const { getUserPartner } = require('fleetmap-partners')
 const { devicesToProcess } = require('./util/device')
@@ -196,6 +196,8 @@ async function exportIdleReportToPDF (userData, reportData) {
 
   const headers = [
     translations.report.date,
+    translations.report.start,
+    translations.report.end,
     translations.report.address,
     translations.report.duration
   ]
@@ -234,7 +236,9 @@ async function exportIdleReportToPDF (userData, reportData) {
 
         d.idleEvents.forEach(a => {
           const temp = [
-            getIdleEventDate(a, userData.user),
+            getIdleEventDate(a.position, userData.user),
+            getIdleEventTime(a.position, userData.user),
+            getIdleEventTime(a.lastPosition, userData.user),
             a.position.address,
             convertMS(a.idleTime, true),
             userData.byDriver ? a.deviceName : getDriver(a, userData.drivers)
@@ -304,7 +308,9 @@ function exportIdleReportToExcel (userData, reportData) {
   }
   const headers = [
     { label: userData.byDriver ? translations.report.driver : translations.report.vehicle, value: 'name' },
-    { label: translations.report.date, value: 'fixTime' },
+    { label: translations.report.date, value: 'date' },
+    { label: translations.report.start, value: 'start' },
+    { label: translations.report.end, value: 'end' },
     { label: translations.report.address, value: 'address' },
     { label: translations.report.duration, value: 'duration' },
     { label: userData.byDriver ? translations.report.vehicle : translations.report.driver, value: 'subname' }
@@ -318,7 +324,9 @@ function exportIdleReportToExcel (userData, reportData) {
         return {
           name: userData.byDriver ? d.driver.name : d.device.name,
           duration: convertMS(a.idleTime, true),
-          fixTime: getIdleEventDate(a, userData.user),
+          date: getIdleEventDate(a.position, userData.user),
+          start: getIdleEventTime(a.position, userData.user),
+          end: getIdleEventTime(a.lastPosition, userData.user),
           subname: userData.byDriver ? a.deviceName : getDriver(a, userData.drivers),
           address: a.position.address + (a.geofenceName ? ' - ' + a.geofenceName : '')
         }
@@ -343,8 +351,12 @@ function deviceName (device) {
   return device.name + (device.attributes.license_plate ? ', ' + device.attributes.license_plate : '') + (device.model ? ', ' + device.model : '')
 }
 
-function getIdleEventDate (row, user) {
-  return convertToLocaleString(row.position.fixTime, user.attributes.lang, user.attributes.timezone)
+function getIdleEventDate (user, position) {
+  return convertToLocaleDateString(position.fixTime, user.attributes.lang, user.attributes.timezone)
+}
+
+function getIdleEventTime (user, position) {
+  return convertToLocaleTimeString(position.fixTime, user.attributes.lang, user.attributes.timezone)
 }
 
 exports.createIdleReport = createIdleReport

package/src/util/route.js

@@ -29,6 +29,7 @@ function getIdleEvents (route, driver) {
       } else if (inIdle) {
         const currentIdleEvent = idleEvents[idleEvents.length - 1]
         currentIdleEvent.idleTime = new Date(last.fixTime) - new Date(currentIdleEvent.position.fixTime)
+        currentIdleEvent.lastPosition = last
         inIdle = false
       }
     })