fleetmap-reports 1.0.770 → 1.0.772

package/package.json

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

package/src/partnerReports/performance-report.js

@@ -15,36 +15,15 @@ async function createPerformanceReport (from, to, userData, traccar) {
       const allInOne = await traccarHelper.getAllInOne(traccar, from, to, slice, true, true, false, false, deviceCount, devices.length)
 
       slice.forEach(d => {
-        const {
-          drivingTime, idleTime, cruiseControlTime, economicTime, highEngineRPM, hardBreaking, hardAcceleration,
-          drivingConsumption, idleConsumption, cruiseControlConsumption, economicConsumption, drivingDistance, cruiseControlDistance,
-          economicDistance
-        } = getDeviceData(allInOne, d)
-
-        const deviceData = {
-          device: d.name,
-          drivingTime,
-          idleTime,
-          drivingConsumption,
-          idleConsumption,
-          drivingDistance,
-          cruiseControlTime,
-          cruiseControlConsumption,
-          cruiseControlDistance,
-          economicTime,
-          economicConsumption,
-          economicDistance,
-          highEngineRPM,
-          hardBreaking,
-          hardAcceleration
-        }
+        const deviceData = getDeviceData(allInOne, d)
+        deviceData.device = d.name
         reportData.push(deviceData)
       })
 
       deviceCount = deviceCount + slice.length
     }
   } else {
-    const allInOne = await traccarHelper.getAllInOne(traccar, from, to, userData.devices, true, true, false, false)
+    const allInOne = await traccarHelper.getAllInOne(traccar, from, to, userData.devices, true, true, false, true)
 
     const device = userData.devices[0]
 
@@ -145,22 +124,30 @@ function getDeviceData (allInOne, d) {
       economicDistance
     }
   } else {
+    const deviceSummary = allInOne.summary.filter(t => t.deviceId === d.id)
+
     const drivingTime = deviceTrips.reduce((a, b) => a + b.duration, 0)
-    const drivingDistance = deviceTrips.reduce((a, b) => a + b.distance, 0)
+    const drivingConsumption = deviceTrips.reverse((a, b) => a + b.spentFuel, 0)
+    const drivingDistance = deviceSummary.distanceIn
+    const idleTime = deviceSummary.engineHours - drivingTime
+    const idleConsumption = deviceSummary.spentFuel - drivingConsumption
+
+    const hardBreaking = deviceRoute.filter(p => p.attributes.io253 === 2).length
+    const hardAcceleration = deviceRoute.filter(p => p.attributes.io253 === 1).length
 
     return {
-      drivingTime: drivingTime,
-      idleTime: 0,
+      drivingTime,
+      idleTime,
       cruiseControlTime: 0,
       economicTime: 0,
       highEngineRPM: 0,
-      hardBreaking: 0,
-      hardAcceleration: 0,
-      drivingConsumption: 0,
-      idleConsumption: 0,
+      hardBreaking,
+      hardAcceleration,
+      drivingConsumption,
+      idleConsumption,
       cruiseControlConsumption: 0,
       economicConsumption: 0,
-      drivingDistance: drivingDistance,
+      drivingDistance,
       cruiseControlDistance: 0,
       economicDistance: 0
     }

package/src/tests/performance.test.js

@@ -7,14 +7,14 @@ describe('performance', function () {
   it('performance report', async () => {
     const report = await getReports()
     const userData = await report.getUserData()
-    userData.devices = userData.devices.filter(d => d.attributes.xpert)
+    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)),
       userData,
       report.traccar)
     console.log(data)
-  })
+  }, 5000000)
 
   // eslint-disable-next-line no-undef
   it('performance report 2', async () => {

package/src/tests/trips.test.js

@@ -135,6 +135,6 @@ describe('trips', function () {
 
     assert.equal(data.length, 1)
     const device = data[0].devices.find(d => d.device.id === 69114)
-    assert.equal(device.trips.reduce((a, b) => a + b.spentFuel, 0), 153.6999999999998) // Total Trips
+    assert.equal(device.trips.reduce((a, b) => a + b.fuelConsumption, 0), 167.69999999999987) // Total Trips
   }, 30000)
 })

package/src/trip-report.js

@@ -167,14 +167,14 @@ function processDevices (from, to, devices, data, userData, traccar) {
         trip.endPOIName = nearestPOIs[0].p.name
       }
 
+      const stop = getStop(new Date(trip.startTime), stops)
+
       if ((deviceRoute[0].protocol === 'teltonika' && deviceRoute.some(r => r.attributes.fuel)) ||
           automaticReports.deviceWithFuelInfo(d)) {
-        trip.fuelConsumption = trip.spentFuel
+        trip.fuelConsumption = trip.spentFuel + (stop ? stop.spentFuel : 0)
         trip.avgFuelConsumption = trip.totalKms > 0 ? trip.fuelConsumption * 100 / trip.totalKms : 0
       }
 
-      const stop = getStop(new Date(trip.startTime), stops)
-
       if (stop && !trip.endTimeIsOut) {
         trip.stopDuration = calculateStopDuration(stop)
         trip.stopEngineHours = trip.idleTime + stop.engineHours