fleetmap-reports 1.0.437 → 1.0.438

package/package.json

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

package/src/idle-report.js

@@ -11,6 +11,14 @@ const { reportByDriver } = require('./util/driver')
 
 const fileName = 'IdleReport'
 
+function getDriver (idleEvent, drivers) {
+  if (idleEvent && idleEvent.position && idleEvent.position.attributes.driverUniqueId) {
+    const driver = drivers.find(d => d.uniqueId === idleEvent.position.attributes.driverUniqueId)
+    return driver ? driver.name : idleEvent.position.attributes.driverUniqueId
+  }
+  return ''
+}
+
 async function createIdleReport (from, to, userData, traccarInstance) {
   console.log('Create IdleReport')
   const reportData = []
@@ -312,7 +320,7 @@ function exportIdleReportToExcel (userData, reportData) {
           name: userData.byDriver ? d.driver.name : d.device.name,
           duration: convertMS(a.idleTime, true),
           fixTime: getIdleEventDate(a, userData.user),
-          subname: userData.byDriver ? a.deviceName : a.driver,
+          subname: userData.byDriver ? a.deviceName : getDriver(a, userData.drivers),
           address: a.position.address + (a.geofenceName ? ' - ' + a.geofenceName : '')
         }
       }))