fleetmap-reports 1.0.606 → 1.0.607

package/package.json

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

package/src/speeding-report.js

@@ -135,7 +135,7 @@ async function getEvents (traccarInstance, from, to, devices, userData, deviceCo
 
     const events = []
     if (userData.roadSpeedLimits) {
-      const hereResults = await getHereEvents(devices, routes, userData.maxSpeedThreshold, userData.minimumIdleTime)
+      const hereResults = await getHereEvents(devices, routes, userData.maxSpeedThreshold, userData.minimumIdleMinutes)
       console.log('got', hereResults.length, 'from here')
       events.push(...hereResults)
     } else if (!userData.useVehicleSpeedLimit && userData.customSpeed) {

package/src/tests/speeding.test.js

@@ -23,7 +23,7 @@ describe('speeding tests', function () {
     assert.equal(device.alerts.length, 104) // Total Alerts
     console.log(device.alerts)
 
-    userData.minimumIdleTime = 1
+    userData.minimumIdleMinutes = 1
     const r = await getSpeedingReport(report, userData)
     r.device.alerts.forEach(a => assert.equal(true, a.eventTime >= 60000))
     assert.equal(r.device.alerts.length, 6) // Total Alerts

package/src/trip-report.js

@@ -487,7 +487,9 @@ function getTripEnd (user, trip) {
 function getDriverName (drivers, driverUniqueId) {
   if (driverUniqueId) {
     const driver = drivers.find(d => d.uniqueId === driverUniqueId)
-    return driver ? driver.name : driverUniqueId
+    return driver
+      ? driver.name + ' ' + ((driver.attributes && driver.attributes.notes) || '')
+      : driverUniqueId
   }
 
   return ''