fleetmap-reports 1.0.429 → 1.0.430

package/package.json

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

package/src/idle-report.js

@@ -162,6 +162,11 @@ function processDevices (from, to, devices, routes, userData) {
     const filteredEvents = idleEvents.filter(e => userData.minimumIdleMinutes ? e.idleTime > userData.minimumIdleMinutes * 60 * 1000 : true)
 
     if (filteredEvents.length) {
+      filteredEvents.forEach(e => {
+        const driver = userData.drivers.find(d => d.id === e.position.attributes.driverUniqueId)
+        e.driver = driver ? driver.name : ''
+      })
+
       const deviceData = {
         device: d,
         idleEvents: filteredEvents

package/src/trip-report.js

@@ -358,7 +358,7 @@ function exportTripReportToExcel (userData, reportData) {
   }
   const headers = userData.byDriver
     ? [
-        { label: translations.report.driver, value: 'driver' },
+        { label: translations.report.driver, value: 'name' },
         { label: translations.report.date, value: 'date' },
         { label: translations.report.start, value: 'start' },
         { label: translations.report.end, value: 'end' },
@@ -369,7 +369,7 @@ function exportTripReportToExcel (userData, reportData) {
         { label: translations.report.distance, value: 'distance' },
         { label: translations.report.avgSpeed, value: 'averageSpeed' },
         { label: translations.report.maxSpeed, value: 'maxSpeed' },
-        { label: translations.report.vehicle, value: 'name' }
+        { label: translations.report.vehicle, value: 'subname' }
       ]
     : [
         { label: translations.report.vehicle, value: 'name' },
@@ -383,7 +383,7 @@ function exportTripReportToExcel (userData, reportData) {
         { label: translations.report.distance, value: 'distance' },
         { label: translations.report.avgSpeed, value: 'averageSpeed' },
         { label: translations.report.maxSpeed, value: 'maxSpeed' },
-        { label: translations.report.driver, value: 'driver' }
+        { label: translations.report.driver, value: 'subname' }
       ]
   let data = []
   if (tripsData) {
@@ -391,7 +391,7 @@ function exportTripReportToExcel (userData, reportData) {
       data = data.concat([{}])
       data = data.concat(d.trips.map(a => {
         return {
-          name: a.deviceName,
+          name: userData.byDriver ? getDriverName(userData.drivers, a.driverUniqueId) : a.deviceName,
           date: getTripDate(userData.user, a),
           start: getTripStart(userData.user, a),
           end: getTripEnd(userData.user, a),
@@ -402,17 +402,18 @@ function exportTripReportToExcel (userData, reportData) {
           distance: Number(a.totalKms.toFixed(2)),
           averageSpeed: Math.round(a.averageSpeed * 1.85200),
           maxSpeed: Math.round(a.maxSpeed * 1.85200),
-          driver: getDriverName(userData.drivers, a.driverUniqueId)
+          subname: userData.byDriver ? a.deviceName : getDriverName(userData.drivers, a.driverUniqueId)
         }
       }))
       // Totals
       data = data.concat([{
+        name: d.trips.length,
         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)
+        maxSpeed: getMaxSpeed(d.trips)
       }])
       data = data.concat([{}])
     })