fleetmap-reports 1.0.444 → 1.0.447

package/package.json

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

package/src/events-report.js

@@ -56,14 +56,14 @@ async function getReportData (from, to, devices, types, traccar) {
   const arrayOfArrays = automaticReports.sliceArray(devices)
   const traccarTypes = new Set(types.map(t => t.startsWith('alarm') ? 'alarm' : t))
   const traccarSubTypes = types.map(t => t.startsWith('alarm') ? t.replace('alarm_', '') : '').filter(Boolean)
-  for (const a of arrayOfArrays) {
+  await Promise.all(arrayOfArrays.map(async a => {
     const response = await traccar.reports.reportsEventsGet(from, to, a.map(d => d.id), null, traccarTypes)
     if (types.length > 0) {
       data = data.concat(response.data.filter(e => e.type === 'alarm' ? traccarSubTypes.includes(e.attributes.alarm) : true))
     } else {
       data = data.concat(response.data)
     }
-  }
+  }))
   console.log('Alerts:' + data.length)
   return data
 }
@@ -71,9 +71,7 @@ async function getReportData (from, to, devices, types, traccar) {
 async function processDevices (from, to, devices, geofences, drivers, data, traccar) {
   const devicesResult = []
   let i = 0
-  for (const d of devices) {
-    console.log('LOADING_MESSAGE:' + d.name)
-    console.log(`PROGRESS_PERC:${++i / devices.length * 100}`)
+  await Promise.all(devices.map(async d => {
     const alerts = data.filter(t => t.deviceId === d.id)
 
     if (alerts.length > 0) {
@@ -100,6 +98,9 @@ async function processDevices (from, to, devices, geofences, drivers, data, trac
         }
       }
 
+      console.log('LOADING_MESSAGE:' + d.name)
+      console.log(`PROGRESS_PERC:${++i / devices.length * 100}`)
+
       devicesResult.push({
         device: d,
         from,
@@ -107,7 +108,7 @@ async function processDevices (from, to, devices, geofences, drivers, data, trac
         alerts
       })
     }
-  }
+  }))
 
   return devicesResult
 }
@@ -218,6 +219,7 @@ function exportSpeedingReportToExcel (userData, reportData) {
     { label: translations.report.eventType, value: 'eventType' },
     { label: translations.report.date, value: 'fixTime' },
     { label: translations.report.address, value: 'address' },
+    { label: translations.report.driver, value: 'driver' },
     { label: translations.report.info, value: 'info' }
   ]
   let data = []
@@ -229,7 +231,8 @@ function exportSpeedingReportToExcel (userData, reportData) {
           eventType: a.type === 'alarm' ? translations.report['event_' + a.attributes.alarm] : translations.report['event_' + a.type],
           fixTime: getAlertDate(userData.user, a),
           address: a.geofenceName || (a.position ? a.position.address : ''),
-          info: getAlertInfo(userData.drivers, a)
+          info: getAlertInfo(userData.drivers, a),
+          driver: a.driver
         }
       }))
     })
@@ -261,7 +264,7 @@ function getAlertInfo (drivers, alert) {
     const driver = drivers.find(d => d.uniqueId === alert.attributes.driverUniqueId)
     return driver ? driver.name : alert.attributes.driverUniqueId
   }
-  return alert.driver
+  return ''
 }
 
 function getAlertDate (user, alert) {