fleetmap-reports 1.0.664 → 1.0.666

package/package.json

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

package/src/zone-report.js

@@ -136,6 +136,13 @@ async function processDevices (from, to, devices, userData, data) {
               const routeDayBefore = deviceRoute.filter(p => (!zoneInOutDayData[0].inTime || new Date(p.fixTime) > new Date(zoneInOutDayData[0].inTime.fixTime)) &&
                   new Date(p.fixTime) < fromByDay)
               distanceIn = distanceIn - calculateDistance(routeDayBefore)
+            } else {
+              // Add distanceOut before the first entry
+              const routeOut = deviceRoute.filter(p =>
+                new Date(p.fixTime).getTime() < new Date(zoneInOutDayData[0].inTime.fixTime).getTime() &&
+                  new Date(p.fixTime).getTime() >= fromByDay.getTime()
+              )
+              distanceOut = distanceOut + calculateDistance(routeOut)
             }
 
             // Check if the last entry ends only on the next day
@@ -145,7 +152,9 @@ async function processDevices (from, to, devices, userData, data) {
               const routeDayAfter = deviceRoute.filter(p => new Date(p.fixTime) < outTime && new Date(p.fixTime) > toByDay)
               distanceIn = distanceIn - calculateDistance(routeDayAfter)
             } else {
-              const routeOut = deviceRoute.filter(p => (!zoneInOutDayData[zoneInOutDayData.length - 1].outTime || new Date(p.fixTime) > zoneInOutDayData[zoneInOutDayData.length - 1].outTime.fixTime) && new Date(p.fixTime) < toByDay)
+              const routeOut = deviceRoute.filter(p =>
+                new Date(p.fixTime) > new Date(zoneInOutDayData[zoneInOutDayData.length - 1].outTime.fixTime).getTime() &&
+                  new Date(p.fixTime) < toByDay.getTime())
               distanceOut = distanceOut + calculateDistance(routeOut)
             }
           }
@@ -262,6 +271,7 @@ function analyseAlertsGroupGeofences (alerts, deviceRoute, from, to) {
       totalTime: totalInTime
     })
   }
+
   return zoneInOutData
 }