fleetmap-reports 1.0.622 → 1.0.623

package/package.json

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

package/src/partnerReports/afriquia.js

@@ -1,16 +1,24 @@
 const traccar = require('../util/traccar')
+const { getIdleEvents } = require('../util/route')
 
 async function createActivityReport (from, to, userData, traccarInstance) {
-  const allInOne = await traccar.getAllInOne(traccarInstance, from, to, userData.devices, false, true, true, false)
+  const allInOne = await traccar.getAllInOne(traccarInstance, from, to, userData.devices, true, true, true, false)
 
   const reportData = []
   userData.devices.forEach(d => {
     const trips = allInOne.trips.filter(t => t.deviceId === d.id)
+    const route = allInOne.route.filter(p => p.deviceId === d.id)
     const stops = allInOne.stops.filter(s => s.deviceId === d.id)
     const group = userData.groups.find(g => g.id === d.groupId)
 
+    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 idleTimeArray = idleEvents.map(e => e.idleTime)
 
     const deviceData = {
       device: d.name,
@@ -19,10 +27,16 @@ async function createActivityReport (from, to, userData, traccarInstance) {
       startTime: trips.length ? trips[0].startTime : '',
       endAddress: trips.length ? trips[trips.length - 1].endAddress : '',
       endTime: trips.length ? trips[trips.length - 1].endTime : '',
-      drivingTime: trips.reduce((a, b) => a + b.duration, 0),
-      stopTime: stops.reduce((a, b) => a + b.duration, 0) - idleTime,
-      idleTime,
+      drivingTime,
+      stopTime,
+      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,
       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