fleetmap-reports 1.0.776 → 1.0.778

package/package.json

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

package/src/partnerReports/performance-report.js

@@ -2,6 +2,7 @@ const automaticReports = require('../automaticReports')
 const traccarHelper = require('../util/traccar')
 const { getUncompletedTrip } = require('../util/trips')
 const { getEndTripMessages, getCanDriverStyleMessages, parseEndTripMessage, parseCanDriverStyleMessage } = require('../util/xpert')
+const { calculateDistance } = require('../util/utils')
 
 async function createPerformanceReport (from, to, userData, traccar) {
   const reportData = []
@@ -12,7 +13,7 @@ async function createPerformanceReport (from, to, userData, traccar) {
     const sliced = automaticReports.sliceArray(devices, 5)
     let deviceCount = 0
     for (const slice of sliced) {
-      const allInOne = await traccarHelper.getAllInOne(traccar, from, to, slice, true, true, false, false, deviceCount, devices.length)
+      const allInOne = await traccarHelper.getAllInOne(traccar, from, to, slice, true, true, true, true, deviceCount, devices.length)
 
       slice.forEach(d => {
         const deviceData = getDeviceData(allInOne, d)
@@ -23,7 +24,7 @@ async function createPerformanceReport (from, to, userData, traccar) {
       deviceCount = deviceCount + slice.length
     }
   } else {
-    const allInOne = await traccarHelper.getAllInOne(traccar, from, to, userData.devices, true, true, false, true)
+    const allInOne = await traccarHelper.getAllInOne(traccar, from, to, userData.devices, true, true, true, true)
 
     const device = userData.devices[0]
 
@@ -125,31 +126,48 @@ function getDeviceData (allInOne, d) {
     }
   } else {
     const deviceSummary = allInOne.summary.filter(t => t.deviceId === d.id)[0]
+    const deviceStops = allInOne.stops.filter(t => t.deviceId === d.id)
 
     const drivingTime = deviceTrips.reduce((a, b) => a + b.duration, 0)
     const drivingConsumption = deviceTrips.reduce((a, b) => a + b.spentFuel, 0)
     const drivingDistance = deviceSummary ? deviceSummary.distance / 1000 : 0
-    const idleTime = deviceSummary && deviceSummary.engineHours > drivingTime ? deviceSummary.engineHours - drivingTime : 0
+    const idleTime = deviceTrips.reduce((a, b) => a + b.idleTime, 0) + deviceStops.reduce((a, b) => a + b.engineHours, 0)
     const idleConsumption = deviceSummary && deviceSummary.spentFuel > drivingConsumption ? deviceSummary.spentFuel - drivingConsumption : 0
 
-    const hardBreaking = deviceRoute.filter(p => p.attributes.io253 === 2).length
-    const hardAcceleration = deviceRoute.filter(p => p.attributes.io253 === 1).length
+    const highEngineRPMSections = calculateRPMSections(deviceRoute, d.attributes.highRPM || 1300)
+    const highEngineRPM = highEngineRPMSections.map(a => a.length > 1
+      ? a.map((p, index) => index === 0 ? 0 : new Date(p.fixTime).getTime() - new Date(a[index - 1].fixTime).getTime()).reduce((a, b) => a + b)
+      : 0).reduce((a, b) => a + b, 0)
+
+    const economicRPMSections = calculateRPMSections(deviceRoute, d.attributes.minEconomicRPM || 1000, d.attributes.maxEconomicRPM || 1250)
+    const economicTime = economicRPMSections.map(a => a.length > 1
+      ? a.map((p, index) => index === 0 ? 0 : new Date(p.fixTime).getTime() - new Date(a[index - 1].fixTime).getTime()).reduce((a, b) => a + b)
+      : 0).reduce((a, b) => a + b, 0)
+    const economicDistance = economicRPMSections.map(a => a.length > 1
+      ? calculateDistance(a)
+      : 0).reduce((a, b) => a + b, 0)
+    const economicConsumption = economicRPMSections.map(a => a.length > 1
+      ? a[a.length - 1].attributes.fuelUsed - a[0].attributes.fuelUsed
+      : 0).reduce((a, b) => a + (b || 0), 0)
+
+    const hardBreaking = deviceRoute.filter(p => p.attributes.alarm === 'hardBreaking').length
+    const hardAcceleration = deviceRoute.filter(p => p.attributes.alarm === 'hardAcceleration').length
 
     return {
       drivingTime: drivingTime / 1000,
       idleTime: idleTime / 1000,
       cruiseControlTime: 0,
-      economicTime: 0,
-      highEngineRPM: 0,
+      economicTime: economicTime / 1000,
+      highEngineRPM: highEngineRPM / 1000,
       hardBreaking,
       hardAcceleration,
       drivingConsumption,
       idleConsumption,
       cruiseControlConsumption: 0,
-      economicConsumption: 0,
+      economicConsumption,
       drivingDistance,
       cruiseControlDistance: 0,
-      economicDistance: 0
+      economicDistance
     }
   }
 }
@@ -169,4 +187,24 @@ function getRowData (index, device, description, time, consumption, distance, in
   }
 }
 
+function calculateRPMSections (route, min, max) {
+  const sections = []
+  let newSection = true
+  route.forEach(p => {
+    const rpm = p.attributes.rpm
+    if ((!min || rpm > min) && (!max || rpm < max)) {
+      if (newSection) {
+        sections.push([p])
+      } else {
+        sections[sections.length - 1].push(p)
+      }
+      newSection = false
+    } else {
+      newSection = true
+    }
+  })
+
+  return sections
+}
+
 exports.createPerformanceReport = createPerformanceReport

package/src/tests/performance.test.js

@@ -10,13 +10,14 @@ describe('performance', function () {
     const userData = await report.getUserData()
     userData.devices = userData.devices.filter(d => d.id === 22326)
     const data = await createPerformanceReport(
-      new Date(Date.UTC(2023, 5, 10, 0, 0, 0, 0)),
-      new Date(Date.UTC(2023, 5, 20, 23, 59, 59, 0)),
+      new Date(Date.UTC(2023, 6, 1, 0, 0, 0, 0)),
+      new Date(Date.UTC(2023, 6, 17, 23, 59, 59, 0)),
       userData,
       report.traccar)
-    assert.equal(data[0].consumption, 21.8)
-    assert.equal(data[0].distance, 381.29861000000005)
-    assert.equal(convertMS(data[1].time * 1000, false), '10:30')
+    console.log(data)
+    assert.equal(data[0].consumption, 19.799999999999997)
+    assert.equal(data[0].distance, 326.7657)
+    assert.equal(convertMS(data[1].time * 1000, false), '08:19')
   }, 8000000)
 
   // eslint-disable-next-line no-undef