fleetmap-reports 1.0.994 → 1.0.997

package/package.json

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

package/src/trip-report.js

@@ -268,29 +268,31 @@ async function processDrivers (from, to, userData, data) {
   }
 
   for (const d of userData.drivers) {
-    const { trips } = getDriverData(d, data)
+    const { trips } = await getDriverData(d, data, userData)
 
-    trips.forEach(trip => {
-      trip.totalKms = trip.distance / 1000
+    if (trips) {
+      trips.forEach(trip => {
+        trip.totalKms = trip.distance / 1000
 
-      const nearestPOIs = getNearestPOIs(trip.endLon, trip.endLat, userData.geofences)
-      if (nearestPOIs.length > 0) {
-        trip.endPOIName = nearestPOIs[0].p.name
-      }
+        const nearestPOIs = getNearestPOIs(trip.endLon, trip.endLat, userData.geofences)
+        if (nearestPOIs.length > 0) {
+          trip.endPOIName = nearestPOIs[0].p.name
+        }
 
-      const stop = data.stops.find(s => s.deviceId === trip.deviceId && (new Date(s.startTime).getTime() === new Date(trip.endTime).getTime()))
+        const stop = data.stops.find(s => s.deviceId === trip.deviceId && (new Date(s.startTime).getTime() === new Date(trip.endTime).getTime()))
 
-      trip.stopEngineHours = getTripIdleTime(trip, idleEvents) + (stop ? stop.engineHours : 0)
-    })
+        trip.stopEngineHours = getTripIdleTime(trip, idleEvents) + (stop ? stop.engineHours : 0)
+      })
 
-    if (trips.length > 0) {
-      const driverData = {
-        driver: d,
-        from,
-        to,
-        trips
+      if (trips.length > 0) {
+        const driverData = {
+          driver: d,
+          from,
+          to,
+          trips
+        }
+        driversResult.push(driverData)
       }
-      driversResult.push(driverData)
     }
   }