fleetmap-reports 1.0.443 → 1.0.446

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fleetmap-reports",
-  "version": "1.0.443",
+  "version": "1.0.446",
   "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
 }
@@ -261,7 +262,7 @@ function getAlertInfo (drivers, alert) {
     const driver = drivers.find(d => d.uniqueId === alert.attributes.driverUniqueId)
     return driver ? driver.name : alert.attributes.driverUniqueId
   }
-  return ''
+  return alert.driver
 }
 
 function getAlertDate (user, alert) {

package/src/index.test.js

@@ -15,12 +15,10 @@ async function getSpeedingReport (report, userData) {
 
 // eslint-disable-next-line no-undef
 describe('Test_Reports', function () {
-  this.timeout(500000)
   // eslint-disable-next-line no-undef
   it('Speeding by device', async () => {
     const report = await getReports()
     const userData = await report.getUserData()
-    userData.roadSpeedLimit = true
     const { device, totalDistance, totalEventTime } = await getSpeedingReport(report, userData)
     assert.equal(device.alerts.length, 15) // Total Alerts
     assert.equal(totalDistance, 19.59984677533689) // Total Kms

package/src/util/odoo.js

@@ -1,16 +1,14 @@
 
-async function getOdooFuelServices (traccar, from, to) {
-  const url = `/odoo/reports/refuelingServices?startDate=${from.toDateString()}&endDate=${to.toDateString()}`
+async function getOdooFuelServices(traccar, from, to) {
+    const url = `/odoo/reports/refuelingServices?startDate=${from.toDateString()}&endDate=${to.toDateString()}`
 
-  console.log('LOADING_MESSAGE:' + url)
-  const { data } = await traccar.axios.get(url, {
-    jar: traccar.cookieJar,
-    withCredentials: true
-  })
+    const {data} = await traccar.axios.get(url,{
+        jar: traccar.cookieJar,
+        withCredentials: true })
 
-  console.log(data)
+    console.log(data)
 
-  return data
+    return data
 }
 
 exports.getOdooFuelServices = getOdooFuelServices