fleetmap-reports 1.0.635 → 1.0.637

package/package.json

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

package/src/idle-report.js

@@ -209,7 +209,7 @@ function findGeofenceData (event, userData) {
   if (geofence) {
     const group = userData.groups.find(g => g.geofenceIds && g.geofenceIds.includes(geofence.id))
     event.geofenceName = geofence.name
-    event.geofenceGroup = group.name || ''
+    event.geofenceGroup = (group && group.name) || ''
   }
 }
 

package/src/partnerReports/afriquia.js

@@ -38,13 +38,23 @@ 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())
+    */
+
+    stopTime = endTrip ? stopTime + (to.getTime() - new Date(endTrip.endTime).getTime()) : stopTime
+
     const startNearestPOIs = startTrip ? getNearestPOIs(startTrip.startLon, startTrip.startLat, userData.geofences) : []
     const endNearestPOIs = endTrip ? getNearestPOIs(endTrip.endLon, endTrip.endLat, userData.geofences) : []