fleetmap-reports 2.0.303 → 2.0.305

package/package.json

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

package/src/sensor-report.js

@@ -10,37 +10,52 @@ const { headerFromUser, addTable } = require('./util/pdfDocument')
 const { getStyle } = require('./reportStyle')
 const { getUserPartner } = require('fleetmap-partners')
 
+function minimumDuration (status, userData) {
+  if (status) {
+    return (userData.minimumMinutesOn * 60 * 1000)
+  }
+
+  return (userData.minimumMinutesOff * 60 * 1000)
+}
+
+function addSensorPeriod (statusPeriodBySensor, s, currentStatus, d, duration, currentPosition, previousPosition) {
+  statusPeriodBySensor[s.sensor].push({
+    startTime: currentStatus[s.sensor].startTime,
+    endTime: previousPosition.fixTime,
+    endAddress: previousPosition.address,
+    value: currentStatus[s.sensor].value,
+    valueDescription: currentStatus[s.sensor].value ? d.attributes[s.sensor + 'on'] : d.attributes[s.sensor + 'off'],
+    name: s.name,
+    duration
+  })
+  currentStatus[s.sensor] = { value: currentPosition.attributes[s.id], startTime: currentPosition.fixTime }
+}
+
 function processDevices (from, to, devices, data, userData) {
   const result = []
 
   for (const d of devices) {
     const positions = data.route.filter(t => t.deviceId === d.id)
 
-    const rows = []
+    const statusPeriodBySensor = {}
     const currentStatus = {}
     positions.forEach((p, index) => {
       userData.sensors.forEach(s => {
+        if (!statusPeriodBySensor[s.sensor]) {
+          statusPeriodBySensor[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({
-                startTime: currentStatus[s.sensor].startTime,
-                endTime: positions[index - 1].fixTime,
-                endAddress: positions[index - 1].address,
-                value: currentStatus[s.sensor].value,
-                valueDescription: currentStatus[s.sensor].value ? d.attributes[s.sensor + 'on'] : d.attributes[s.sensor + 'off'],
-                name: s.name,
-                duration
-              })
-              currentStatus[s.sensor] = { value: p.attributes[s.id], startTime: p.fixTime }
+            const duration = new Date(positions[index - 1].fixTime).getTime() - new Date(currentStatus[s.sensor].startTime).getTime()
+            if ((duration >= minimumDuration(currentStatus[s.sensor].value, userData)) || statusPeriodBySensor[s.sensor].length === 0) {
+              addSensorPeriod(statusPeriodBySensor, s, currentStatus, d, duration, p, positions[index - 1])
             } else {
-              const element = rows.pop()
+              const element = statusPeriodBySensor[s.sensor].pop()
               currentStatus[s.sensor] = { value: p.attributes[s.id], startTime: element.startTime }
             }
           } else {
-            const duration = new Date(p.fixTime).getTime() - new Date(positions[index - 1].fixTime).getTime()
-            if (duration > 30 * 60 * 1000 && currentStatus[s.sensor].value === true) {
+            const distanceBetweenPositions = new Date(p.fixTime).getTime() - new Date(positions[index - 1].fixTime).getTime()
+            if (distanceBetweenPositions > 30 * 60 * 1000 && currentStatus[s.sensor].value === true) {
               currentStatus[s.sensor] = { value: p.attributes[s.id], startTime: p.fixTime }
             }
           }
@@ -50,6 +65,7 @@ function processDevices (from, to, devices, data, userData) {
       })
     })
 
+    const rows = Object.values(statusPeriodBySensor).flat()
     rows.sort((a, b) => new Date(a.startTime).getTime() - new Date(b.startTime).getTime())
 
     if (userData.groupByDay) {