fleetmap-reports 1.0.953 → 1.0.955

package/package.json

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

package/src/tests/zones.test.js

@@ -59,5 +59,6 @@ describe('zones', function () {
     const first = result[0].devices[0]
     console.log(first)
     assert.equal(first.days[0].distanceOut, 0)
+    assert.equal(first.days[2].distanceOut, 0)
   }, 4000000)
 })

package/src/trip-report.js

@@ -62,7 +62,7 @@ async function createTripReportByDevice (from, to, userData, traccar) {
 
     if (tripsData.length > 0) {
       trips.checkTripsKms(traccar, from, to, slice, { trips: tripsData, route: routeData })
-      allData.devices.push(...processDevices(from, to, slice, {
+      allData.devices.push(...await processDevices(from, to, slice, {
         trips: tripsData,
         stops: stopsData,
         route: routeData
@@ -99,7 +99,7 @@ async function createTripReportByGroup (from, to, userData, traccar) {
 
       if (tripsData.length > 0) {
         console.log('Trips:' + tripsData.length)
-        groupData.devices = processDevices(from, to, devices, { trips: tripsData, stops: stopsData, route: routeData }, userData)
+        groupData.devices = await processDevices(from, to, devices, { trips: tripsData, stops: stopsData, route: routeData }, userData)
 
         reportData.push(groupData)
       }
@@ -145,10 +145,10 @@ async function createTripReportByDriver (from, to, userData, traccar) {
   return report
 }
 
-function processDevices (from, to, devices, data, userData, traccar) {
+async function processDevices (from, to, devices, data, userData, traccar) {
   const devicesResult = []
 
-  devices.forEach(d => {
+  for (const d of devices) {
     const deviceRoute = data.route.filter(t => t.deviceId === d.id)
     const deviceTrips = data.trips.filter(t => t.deviceId === d.id)
 
@@ -157,7 +157,17 @@ function processDevices (from, to, devices, data, userData, traccar) {
       deviceTrips.push(uncompletedTrip)
     }
 
-    const trips = deviceTrips.filter(t => userData.allWeek || !userData.weekDays || isInsideTimetable(t, userData) || isPartialInsideTimetable(t, userData, deviceRoute))
+    const trips = []
+
+    for (const t of deviceTrips) {
+      if (userData.allWeek ||
+        !userData.weekDays ||
+        isInsideTimetable(t, userData) ||
+        await isPartialInsideTimetable(t, userData, deviceRoute)) {
+        trips.push(t)
+      }
+    }
+
     const stops = data.stops.filter(s => s.deviceId === d.id)
 
     trips.forEach(trip => {
@@ -224,7 +234,7 @@ function processDevices (from, to, devices, data, userData, traccar) {
 
       devicesResult.push(deviceData)
     }
-  })
+  }
 
   return devicesResult
 }

package/src/util/trips.js

@@ -148,8 +148,8 @@ function updateTrip (device, t, route) {
   t.duration = new Date(route[route.length - 1].fixTime).getTime() - new Date(route[0].fixTime).getTime()
   t.maxSpeed = route.reduce((a, b) => Math.max(a, b.speed), 0)
   t.averageSpeed = distance > 0 ? ((route.reduce((a, b) => a + b.speed, 0)) / route.length) : 0
-  t.startOdometer = !device.attributes['report.ignoreOdometer'] && route[0].attributes.odometer ? route[0].attributes.odometer : route[0].attributes.totalDistance
-  t.endOdometer = !device.attributes['report.ignoreOdometer'] && route[route.length - 1].attributes.odometer ? route[route.length - 1].attributes.odometer : route[route.length - 1].attributes.totalDistance
+  t.startOdometer = device && !device.attributes['report.ignoreOdometer'] && route[0].attributes.odometer ? route[0].attributes.odometer : route[0].attributes.totalDistance
+  t.endOdometer = device && !device.attributes['report.ignoreOdometer'] && route[route.length - 1].attributes.odometer ? route[route.length - 1].attributes.odometer : route[route.length - 1].attributes.totalDistance
 }
 
 function getUncompletedTrip (device, deviceRoute, deviceTrips) {