fleetmap-reports 2.0.159 → 2.0.161

package/package.json

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

package/src/index.js

@@ -233,5 +233,9 @@ function Reports (config, axios) {
   this.driverRankingReportToExcel = (userData, reportData) => {
     return require('./partnerReports/driverranking-report').exportToExcel(userData, reportData)
   }
+
+  this.sensorReport = (from, to, userData) => {
+    return require('./sensor-report').create(from, to, userData, this.traccar)
+  }
 }
 module.exports = Reports

package/src/sensor-report.js

@@ -0,0 +1,65 @@
+const automaticReports = require('./automaticReports')
+const traccarHelper = require('./util/traccar')
+const { devicesToProcess } = require('./util/device')
+
+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 currentStatus = {}
+    positions.forEach(p => {
+      userData.sensors.forEach(s => {
+        if (currentStatus[s.sensor] !== undefined) {
+          if (currentStatus[s.sensor].value !== p.attributes[s.id]) {
+            rows.push({
+              startTime: currentStatus[s.sensor].startTime,
+              endTime: p.fixTime,
+              value: currentStatus[s.sensor].value,
+              valueDescription: currentStatus[s.sensor].value ? d.attributes[s.sensor + 'on'] : d.attributes[s.sensor + 'off'],
+              name: s.name,
+              duration: new Date(p.fixTime).getTime() - new Date(currentStatus[s.sensor].startTime).getTime()
+            })
+            currentStatus[s.sensor] = { value: p.attributes[s.id], startTime: p.fixTime }
+          }
+        } else {
+          currentStatus[s.sensor] = { value: p.attributes[s.id], startTime: p.fixTime }
+        }
+      })
+    })
+
+    rows.sort((a, b) => new Date(a.startTime).getTime() - new Date(b.startTime).getTime())
+
+    result.push({
+      device: d,
+      from,
+      to,
+      rows
+    })
+  }
+
+  return result
+}
+
+async function create (from, to, userData, traccar) {
+  const devices = devicesToProcess(userData)
+  const sliced = automaticReports.sliceArray(devices, 5)
+  const result = []
+
+  let deviceCount = 0
+  for (const slice of sliced) {
+    const allInOne = await traccarHelper.getAllInOne(traccar, from, to, slice, true, false, false, false, deviceCount, devices.length)
+    const routeData = allInOne.route
+
+    if (routeData.length > 0) {
+      result.push(...processDevices(from, to, slice, { route: routeData }, userData))
+    }
+    deviceCount = deviceCount + slice.length
+  }
+
+  return result
+}
+
+exports.create = create

package/src/util/fuel.js

@@ -35,6 +35,8 @@ function calculateConsumption (d, data) {
     fuelConsumption = calculateSpentFuel(spentFuel, d, withFuelUsed)
   } else if (data.route && data.route.length > 1 && data.route[0].attributes.fuelUsed) {
     fuelConsumption = data.route[data.route.length - 1].attributes.fuelUsed - data.route[0].attributes.fuelUsed
+  } else if (data.summary) {
+    fuelConsumption = data.summary.spentFuel
   }
   return fuelConsumption > 0 ? fuelConsumption : 0
 }