fleetmap-reports 1.0.636 → 1.0.638

package/package.json

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

package/src/partnerReports/afriquia.js

@@ -2,6 +2,14 @@ const traccar = require('../util/traccar')
 const { getIdleEvents } = require('../util/route')
 const { insideGeofence, getNearestPOIs } = require('../util/geofence')
 
+function calculateLastStopTime (stopTime, to, time) {
+  return stopTime + (to.getTime() - new Date(time).getTime())
+}
+
+function calculateFirstStopTime (stopTime, from, time) {
+  return stopTime + (new Date(time).getTime(), from.getTime())
+}
+
 async function createActivityReport (from, to, userData, traccarInstance) {
   const notAuthGroup = userData.groups.find(g => g.name === 'Zones Non Autorisées')
   const authGroup = userData.groups.find(g => g.name === 'Zones Autorisées')
@@ -38,13 +46,33 @@ async function createActivityReport (from, to, userData, traccarInstance) {
 
     const totalDistance = trips.reduce((a, b) => a + b.distance, 0)
     const drivingTime = trips.reduce((a, b) => a + b.duration, 0)
-    const stopTime = stops.reduce((a, b) => a + (b.duration > b.engineHours ? (b.duration - b.engineHours) : 0), 0)
+    let stopTime = stops.reduce((a, b) => a + (b.duration > b.engineHours ? (b.duration - b.engineHours) : 0), 0)
 
     const idleTimeArray = idleEvents.map(e => e.idleTime).filter(a => a > 0)
 
     const startTrip = trips.length ? trips[0] : undefined
     const endTrip = trips.length ? trips[trips.length - 1] : undefined
 
+    /* if (stops.length > 0 && startTrip) {
+      if (startTrip.startTime > stops[0].startTime) {
+
+      }
+    }
+    stopTime = stopTime + (new Date(startTrip).getTime() - from.getTime())
+    */
+
+    if (endTrip && stops.length > 0) {
+      if (endTrip.endTime > stops[stops.length - 1].endTime) {
+        stopTime = calculateLastStopTime(stopTime, to, endTrip.endTime)
+      } else {
+        stopTime = calculateLastStopTime(stopTime, to, stops[stops.length - 1].endTime)
+      }
+    } else if (!endTrip && stops.length > 0) {
+      stopTime = calculateLastStopTime(stopTime, to, stops[stops.length - 1].endTime)
+    } if (endTrip && stops.length === 0) {
+      stopTime = calculateLastStopTime(stopTime, to, endTrip.endTime)
+    }
+
     const startNearestPOIs = startTrip ? getNearestPOIs(startTrip.startLon, startTrip.startLat, userData.geofences) : []
     const endNearestPOIs = endTrip ? getNearestPOIs(endTrip.endLon, endTrip.endLat, userData.geofences) : []