fleetmap-reports 1.0.599 → 1.0.601

package/package.json

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

package/src/stop-report.js

@@ -98,7 +98,7 @@ async function exportStopReportToPDF (userData, reportData) {
     translations.report.end,
     translations.report.address,
     translations.report.idleTime,
-    translations.report.stopTime
+    translations.report.event_ignitionOff
   ]
 
   if (stopsData) {
@@ -128,16 +128,16 @@ async function exportStopReportToPDF (userData, reportData) {
           getStopStart(userData.user, a),
           getStopEnd(userData.user, a),
           a.endPOIName || a.address,
-          convertMS(a.engineHours),
-          convertMS(a.stopDuration)
+          convertMS(a.engineHours, true),
+          convertMS(a.stopDuration, true)
         ])
       })
 
       const footValues = [
         'Total:' + d.stops.length,
         '', '', '',
-        convertMS(d.stops.reduce((a, b) => a + b.engineHours, 0)),
-        convertMS(d.stops.reduce((a, b) => a + b.stopDuration, 0))]
+        convertMS(d.stops.reduce((a, b) => a + b.engineHours, 0), true),
+        convertMS(d.stops.reduce((a, b) => a + b.stopDuration, 0), true)]
 
       const style = getStyle(getUserPartner(userData.user))
       addTable(doc,
@@ -168,7 +168,7 @@ function exportStopReportToExcel (userData, reportData) {
     { label: translations.report.end, value: 'end' },
     { label: translations.report.address, value: 'address' },
     { label: translations.report.idleTime, value: 'idleTime' },
-    { label: translations.report.stopTime, value: 'stopTime' }
+    { label: translations.report.event_ignitionOff, value: 'stopTime' }
   ]
 
   let data = []
@@ -182,15 +182,15 @@ function exportStopReportToExcel (userData, reportData) {
           start: getStopStart(userData.user, a),
           end: getStopEnd(userData.user, a),
           address: a.endPOIName || a.address,
-          idleTime: convertMS(a.engineHours),
-          stopTime: convertMS(a.stopDuration)
+          idleTime: convertMS(a.engineHours, true),
+          stopTime: convertMS(a.stopDuration, true)
         }
       }))
       // Totals
       data = data.concat([{
         name: d.stops.length,
-        idleTime: convertMS(d.stops.reduce((a, b) => a + b.engineHours, 0)),
-        stopTime: convertMS(d.stops.reduce((a, b) => a + b.stopDuration, 0))
+        idleTime: convertMS(d.stops.reduce((a, b) => a + b.engineHours, 0), true),
+        stopTime: convertMS(d.stops.reduce((a, b) => a + b.stopDuration, 0), true)
       }])
       data = data.concat([{}])
     })

package/src/util/utils.js

@@ -18,7 +18,7 @@ exports.getLanguage = (userData) => {
 
 function convertMS (duration, withSeconds) {
   if (!duration || duration < 0) {
-    return '00:00'
+    return withSeconds ? '00:00:00' : '00:00'
   }
 
   const ms = duration % 1000