fleetmap-reports 2.0.302 → 2.0.304

package/package.json

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

package/src/sensor-report.js

@@ -16,15 +16,18 @@ function processDevices (from, to, devices, data, userData) {
   for (const d of devices) {
     const positions = data.route.filter(t => t.deviceId === d.id)
 
-    const rows = []
+    const rowsBySensor = {}
     const currentStatus = {}
     positions.forEach((p, index) => {
       userData.sensors.forEach(s => {
+        if (!rowsBySensor[s.sensor]) {
+          rowsBySensor[s.sensor] = []
+        }
         if (currentStatus[s.sensor] !== undefined) {
           if (currentStatus[s.sensor].value !== p.attributes[s.id]) {
-            const duration = new Date(p.fixTime).getTime() - new Date(currentStatus[s.sensor].startTime).getTime()
-            if (duration >= (userData.minimumMinutes * 60 * 1000) || rows.length === 0) {
-              rows.push({
+            const duration = new Date(positions[index - 1].fixTime).getTime() - new Date(currentStatus[s.sensor].startTime).getTime()
+            if ((duration >= (userData.minimumMinutes * 60 * 1000)) || rowsBySensor[s.sensor].length === 0) {
+              rowsBySensor[s.sensor].push({
                 startTime: currentStatus[s.sensor].startTime,
                 endTime: positions[index - 1].fixTime,
                 endAddress: positions[index - 1].address,
@@ -35,7 +38,7 @@ function processDevices (from, to, devices, data, userData) {
               })
               currentStatus[s.sensor] = { value: p.attributes[s.id], startTime: p.fixTime }
             } else {
-              const element = rows.pop()
+              const element = rowsBySensor[s.sensor].pop()
               currentStatus[s.sensor] = { value: p.attributes[s.id], startTime: element.startTime }
             }
           } else {
@@ -50,6 +53,7 @@ function processDevices (from, to, devices, data, userData) {
       })
     })
 
+    const rows = Object.values(rowsBySensor).flat()
     rows.sort((a, b) => new Date(a.startTime).getTime() - new Date(b.startTime).getTime())
 
     if (userData.groupByDay) {

package/src/trip-report.js

@@ -222,7 +222,7 @@ async function processDevices (from, to, devices, data, userData, traccar) {
 
       if (stop && !trip.endTimeIsOut) {
         trip.stopDuration = calculateStopDuration(stop)
-        trip.stopEngineHours = trip.idleTime + stop.engineHours
+        trip.stopEngineHours = trip.idleTime + stop.idleTime
       } else {
         trip.stopDuration = 0
         trip.stopEngineHours = 0
@@ -292,7 +292,7 @@ async function processDrivers (from, to, userData, data) {
           trip.endPOIName = nearestPOIs[0].p.name
         }
 
-        trip.stopEngineHours = getTripIdleTime(trip, idleEvents) + (stop ? stop.engineHours : 0)
+        trip.stopEngineHours = getTripIdleTime(trip, idleEvents) + (stop ? stop.idleTime : 0)
       })
 
       if (trips.length > 0) {

package/src/util/trips.js

@@ -192,8 +192,8 @@ function getTripIdleTime (trip, idleEvents) {
 
 function calculateStopDuration (stop) {
   const totalStopTime = new Date(stop.endTime) - new Date(stop.startTime)
-  if (totalStopTime < stop.engineHours) return 0
-  return totalStopTime - (stop.engineHours > 0 ? stop.engineHours : 0)
+  if (totalStopTime < stop.idleTime) return 0
+  return totalStopTime - (stop.idleTime > 0 ? stop.idleTime : 0)
 }
 
 const maxDistanceDiff = 10000