fleetmap-reports 1.0.428 → 1.0.429

package/package.json

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

package/src/idle-report.js

@@ -291,11 +291,11 @@ function exportIdleReportToExcel (userData, reportData) {
     fileName // The name of the spreadsheet
   }
   const headers = [
-    userData.byDriver ? { label: translations.report.driver, value: 'driver' } : { label: translations.report.vehicle, value: 'name' },
+    userData.byDriver ? { label: translations.report.driver, value: 'name' } : { label: translations.report.vehicle, value: 'name' },
     { label: translations.report.date, value: 'fixTime' },
     { label: translations.report.address, value: 'address' },
     { label: translations.report.duration, value: 'duration' },
-    userData.byDriver ? { label: translations.report.vehicle, value: 'name' } : { label: translations.report.driver, value: 'driver' }
+    userData.byDriver ? { label: translations.report.vehicle, value: 'subname' } : { label: translations.report.driver, value: 'subname' }
   ]
 
   let data = []
@@ -304,13 +304,19 @@ function exportIdleReportToExcel (userData, reportData) {
       data = data.concat([{}])
       data = data.concat(d.idleEvents.map(a => {
         return {
-          driver: userData.byDriver ? d.driver.name : a.driver,
+          name: userData.byDriver ? d.driver.name : d.device.name,
           duration: convertMS(a.idleTime, true),
           fixTime: getIdleEventDate(a, userData.user),
-          name: userData.byDriver ? a.deviceName : d.device.name,
+          subname: userData.byDriver ? a.driver : a.deviceName,
           address: a.position.address + (a.geofenceName ? ' - ' + a.geofenceName : '')
         }
       }))
+      // Totals
+      data = data.concat([{
+        name: d.idleEvents.length,
+        duration: convertMS(d.idleEvents.reduce((a, b) => a + b.idleTime, 0), true)
+      }])
+      data = data.concat([{}])
     })
     console.log(data)
     return {

package/src/trip-report.js

@@ -405,6 +405,16 @@ function exportTripReportToExcel (userData, reportData) {
           driver: getDriverName(userData.drivers, a.driverUniqueId)
         }
       }))
+      // Totals
+      data = data.concat([{
+        tripTime: convertMS(d.trips.reduce((a, b) => a + b.duration, 0)),
+        idleTime: convertMS(d.trips.reduce((a, b) => a + b.stopEngineHours, 0)),
+        stopTime: convertMS(d.trips.reduce((a, b) => a + b.stopDuration, 0)),
+        distance: getSumTotalKms(userData.user, d.trips),
+        averageSpeed: getSumAvgSpeed(d.trips),
+        maxSpeed: getMaxSpeed(data)
+      }])
+      data = data.concat([{}])
     })
     console.log(data)
     return {