fleetmap-reports 1.0.623 → 1.0.625

package/package.json

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

package/src/partnerReports/afriquia.js

@@ -1,7 +1,16 @@
 const traccar = require('../util/traccar')
 const { getIdleEvents } = require('../util/route')
+const { insideGeofence } = require('../util/geofence')
 
 async function createActivityReport (from, to, userData, traccarInstance) {
+  const group = userData.groups.find(g => g.name === 'Zones Non Autorisées')
+
+  const unauthorizedGeofences = []
+  if (group) {
+    const geofenceIds = (await traccarInstance.geofences.geofencesGet(undefined, undefined, undefined, group.id, undefined, undefined).then(r => r.data)).map(g => g.id)
+    unauthorizedGeofences.push(...(userData.geofences.filter(g => geofenceIds.includes(g.id))))
+  }
+
   const allInOne = await traccar.getAllInOne(traccarInstance, from, to, userData.devices, true, true, true, false)
 
   const reportData = []
@@ -11,14 +20,17 @@ async function createActivityReport (from, to, userData, traccarInstance) {
     const stops = allInOne.stops.filter(s => s.deviceId === d.id)
     const group = userData.groups.find(g => g.id === d.groupId)
 
+    const unauthorizedStops = stops.filter(s =>
+      unauthorizedGeofences.find(g => insideGeofence({ latitude: s.latitude, longitude: s.longitude }, g))
+    )
+
     const idleEvents = getIdleEvents(route)
 
     const totalDistance = trips.reduce((a, b) => a + b.distance, 0)
-    const idleTime = stops.reduce((a, b) => a + b.engineHours, 0)
     const drivingTime = trips.reduce((a, b) => a + b.duration, 0)
-    const stopTime = stops.reduce((a, b) => a + b.duration, 0) - idleTime
+    const stopTime = stops.reduce((a, b) => a + (b.duration > b.engineHours ? (b.duration - b.engineHours) : 0), 0)
 
-    const idleTimeArray = idleEvents.map(e => e.idleTime)
+    const idleTimeArray = idleEvents.map(e => e.idleTime).filter(a => a > 0)
 
     const deviceData = {
       device: d.name,
@@ -32,11 +44,11 @@ async function createActivityReport (from, to, userData, traccarInstance) {
       idleTime: idleEvents.reduce((a, b) => a + b.idleTime, 0),
       distance: totalDistance,
       totalIdleEvents: idleEvents.length,
-      minIdleEvent: Math.max(...idleTimeArray),
-      maxIdleEvent: Math.min(...idleTimeArray),
-      authorizedStops: 0,
-      unauthorizedStops: 0,
-      authorizedStopsTime: 0,
+      minIdleEvent: idleTimeArray.length > 0 ? Math.min(...idleTimeArray) : 0,
+      maxIdleEvent: idleTimeArray.length > 0 ? Math.max(...idleTimeArray) : 0,
+      authorizedStops: stops.length - unauthorizedStops.length,
+      unauthorizedStops: unauthorizedStops.length,
+      authorizedStopsTime: unauthorizedStops.reduce((a, b) => a + (b.duration > b.engineHours ? (b.duration - b.engineHours) : 0), 0),
       averageSpeed: totalDistance > 0 ? ((trips.reduce((a, b) => a + (b.averageSpeed * b.distance), 0)) / totalDistance) : 0,
       maxSpeed: trips.reduce((a, b) => {
         return a > b.maxSpeed ? a : b.maxSpeed