fleetmap-reports 1.0.955 → 1.0.956

package/package.json

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

package/src/trip-report.js

@@ -259,11 +259,18 @@ async function processDrivers (from, to, userData, data) {
     }
   }
 
-  userData.drivers.forEach(d => {
+  for (const d of userData.drivers) {
     const { route, trips } = getDriverData(d, data)
-    const filteredTrips = trips.filter(t => (userData.allWeek || !userData.weekDays || isInsideTimetable(t, userData) || isPartialInsideTimetable(t, userData, route)))
+    const filteredTrips = []
+    for (const t of trips) {
+      if (userData.allWeek ||
+        !userData.weekDays ||
+        isInsideTimetable(t, userData) ||
+        await isPartialInsideTimetable(t, userData, route)) {
+        filteredTrips.push(t)
+      }
+    }
     filteredTrips.sort((a, b) => new Date(a.startTime).getTime() - new Date(b.startTime).getTime())
-
     filteredTrips.forEach(function (trip, i) {
       trip.totalKms = trip.distance / 1000
 
@@ -287,7 +294,7 @@ async function processDrivers (from, to, userData, data) {
       }
       driversResult.push(driverData)
     }
-  })
+  }
 
   return driversResult
 }