fleetmap-reports 1.0.981 → 1.0.982

package/package.json

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

package/src/zone-report.js

@@ -94,7 +94,7 @@ async function processDevices (from, to, devices, userData, data) {
   for (const d of devices) {
     const alerts = data.alerts.filter(t => t.deviceId === d.id)
     const deviceRoute = data.route.filter(p => p.deviceId === d.id)
-    const zoneInOutData = analyseAlerts(alerts, deviceRoute, userData, from, to, d).filter(d => !userData.onlyWithStop || d.stopped)
+    let zoneInOutData = analyseAlerts(alerts, deviceRoute, userData, from, to, d).filter(d => !userData.onlyWithStop || d.stopped)
 
     if (userData.groupByDay || userData.zonesByColumn) {
       const dates = getDates(from, to, userData.user.attributes.timezone)
@@ -191,18 +191,35 @@ async function processDevices (from, to, devices, userData, data) {
       if (zoneInOutData.length > 0) {
         if (userData.tripsBetweenZones) {
           const tripsBetweenZones = []
-          zoneInOutData.forEach((a, index) => {
-            if (index + 1 < zoneInOutData.length && a.outTime && zoneInOutData[index + 1].inTime) {
+          zoneInOutData = zoneInOutData.sort((a, b) => a.inTime && b.inTime && new Date(a.inTime.fixTime).getTime() - new Date(b.inTime.fixTime).getTime())
+          let outGeofence
+          let inGeofence
+          for (let i = 0; i < zoneInOutData.length - 1; i++) {
+            if (!outGeofence) {
+              outGeofence = zoneInOutData[i]
+            }
+            inGeofence = zoneInOutData[i + 1]
+
+            if (outGeofence.outTime &&
+                inGeofence.inTime &&
+                new Date(outGeofence.outTime.fixTime).getTime() < new Date(inGeofence.inTime.fixTime).getTime()) {
               tripsBetweenZones.push({
-                outTime: a.outTime,
-                outGeofenceName: a.geofenceName,
-                inTime: zoneInOutData[index + 1].inTime,
-                inGeofenceName: zoneInOutData[index + 1].geofenceName,
-                distanceOut: a.distanceOutAny,
-                totalOutTime: new Date(zoneInOutData[index + 1].inTime.fixTime).getTime() - new Date(a.outTime.fixTime).getTime()
+                outTime: outGeofence.outTime,
+                outGeofenceName: outGeofence.geofenceName,
+                inTime: inGeofence.inTime,
+                inGeofenceName: inGeofence.geofenceName,
+                distanceOut: outGeofence.distanceOutAny,
+                totalOutTime: new Date(inGeofence.inTime.fixTime).getTime() - new Date(outGeofence.outTime.fixTime).getTime()
               })
+              outGeofence = undefined
+            } else {
+              if (outGeofence.outTime &&
+                  inGeofence.outTime &&
+                  new Date(outGeofence.outTime.fixTime).getTime() <= new Date(inGeofence.outTime.fixTime).getTime()) {
+                outGeofence = undefined
+              }
             }
-          })
+          }
           if (tripsBetweenZones.length > 0) {
             devicesResult.push({
               device: d,