fleetmap-reports 1.0.775 → 1.0.777

package/package.json

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

package/src/partnerReports/performance-report.js

@@ -12,7 +12,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 +23,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,19 +125,20 @@ 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
 
     return {
-      drivingTime,
-      idleTime,
+      drivingTime: drivingTime / 1000,
+      idleTime: idleTime / 1000,
       cruiseControlTime: 0,
       economicTime: 0,
       highEngineRPM: 0,

package/src/tests/performance.test.js

@@ -1,10 +1,11 @@
 const { getReports } = require('./index')
 const { createPerformanceReport } = require('../partnerReports/performance-report')
 const assert = require('assert')
+const { convertMS } = require('../util/utils')
 // eslint-disable-next-line no-undef
 describe('performance', function () {
   // eslint-disable-next-line no-undef
-  it('performance report', async () => {
+  it('performance report teltonika', async () => {
     const report = await getReports()
     const userData = await report.getUserData()
     userData.devices = userData.devices.filter(d => d.id === 22326)
@@ -13,11 +14,13 @@ describe('performance', function () {
       new Date(Date.UTC(2023, 5, 20, 23, 59, 59, 0)),
       userData,
       report.traccar)
-    console.log(data)
-  }, 5000000)
+    assert.equal(data[0].consumption, 21.8)
+    assert.equal(data[0].distance, 381.29861000000005)
+    assert.equal(convertMS(data[1].time * 1000, false), '10:30')
+  }, 8000000)
 
   // eslint-disable-next-line no-undef
-  it('performance report 2', async () => {
+  it('performance report inofleet', async () => {
     const report = await getReports()
     const userData = await report.getUserData()
     userData.devices = userData.devices.filter(d => d.id === 69114)