fleetmap-reports 1.0.735 → 1.0.737

package/package.json

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

package/src/partnerReports/performance-report.js

@@ -1,6 +1,7 @@
 const automaticReports = require('../automaticReports')
 const traccarHelper = require('../util/traccar')
 const { getUncompletedTrip } = require('../util/trips')
+const { getEndTripMessage, getCanDriverStyleMessage, parseEndTripMessage, parseCanDriverStyleMessage } = require('../util/xpert')
 
 async function createPerformanceReport (from, to, userData, traccar) {
   const reportData = []
@@ -10,35 +11,41 @@ async function createPerformanceReport (from, to, userData, traccar) {
 
   let deviceCount = 0
   for (const slice of sliced) {
-    const allInOne = await traccarHelper.getAllInOne(traccar, from, to, slice, true, true, true, false, deviceCount, devices.length)
+    const allInOne = await traccarHelper.getAllInOne(traccar, from, to, slice, true, true, false, false, deviceCount, devices.length)
 
     slice.forEach(d => {
       const deviceRoute = allInOne.route.filter(t => t.deviceId === d.id)
       const deviceTrips = allInOne.trips.filter(t => t.deviceId === d.id)
-      const deviceStops = allInOne.stops.filter(t => t.deviceId === d.id)
 
       const uncompletedTrip = getUncompletedTrip(d, deviceRoute, deviceTrips)
       if (uncompletedTrip) {
         deviceTrips.push(uncompletedTrip)
       }
 
+      deviceTrips.forEach(t => {
+        const endTripData = getEndTripMessage(t, deviceRoute)
+        const canDriverStyle = getCanDriverStyleMessage(t, deviceRoute)
+
+        t.endTripData = endTripData && parseEndTripMessage(endTripData.xpertString || endTripData)
+        t.canDriverStyle = canDriverStyle && parseCanDriverStyleMessage(canDriverStyle.xpertString || canDriverStyle)
+      })
+
       const deviceData = {
         device: d.name,
-        drivingTime: deviceTrips.reduce((a, b) => a + b.duration, 0),
-        idleTime: deviceTrips.reduce((a, b) => a + b.idleTime, 0) +
-            deviceStops.reduce((a, b) => a + b.engineHours, 0),
-        drivingConsumption: 20,
-        idleConsumption: 10,
-        drivingDistance: deviceTrips.reduce((a, b) => a + b.distance, 0),
-        economicTime: 265000,
-        economicConsumption: 5,
-        economicDistance: 99000,
-        cruiseControlTime: 0,
-        cruiseControlConsumption: 0,
-        cruiseControlDistance: 0,
-        highEngineRPM: 66000,
-        hardBreaking: 10,
-        hardAcceleration: 5
+        drivingTime: deviceTrips.reduce((a, b) => a + (b.endTripData ? b.endTripData.totalTimeDriving : 0), 0),
+        idleTime: deviceTrips.reduce((a, b) => a + (b.endTripData ? b.endTripData.totalTimeInIdle : 0), 0),
+        drivingConsumption: deviceTrips.reduce((a, b) => a + (b.endTripData ? b.endTripData.totalFuelConsumptionDriving : 0), 0),
+        idleConsumption: deviceTrips.reduce((a, b) => a + (b.endTripData ? b.endTripData.totalFuelConsumptionInIdle : 0), 0),
+        drivingDistance: deviceTrips.reduce((a, b) => a + (b.endTripData ? b.endTripData.totalDistanceTravelled : 0), 0),
+        cruiseControlTime: deviceTrips.reduce((a, b) => a + (b.endTripData ? b.endTripData.totalTimeWithCruiseControl : 0), 0),
+        cruiseControlConsumption: deviceTrips.reduce((a, b) => a + (b.endTripData ? b.endTripData.totalFuelConsumptionWithCruiseControl : 0), 0),
+        cruiseControlDistance: deviceTrips.reduce((a, b) => a + (b.endTripData ? b.endTripData.totalDistanceTravelledWithCruiseControl : 0), 0),
+        economicTime: deviceTrips.reduce((a, b) => a + (b.canDriverStyle ? b.canDriverStyle.totalTimeInEcoRange : 0), 0),
+        economicConsumption: deviceTrips.reduce((a, b) => a + (b.canDriverStyle ? b.canDriverStyle.totalFuelConsumptionInEcoRange : 0), 0),
+        economicDistance: deviceTrips.reduce((a, b) => a + (b.canDriverStyle ? b.canDriverStyle.totalDistanceInEcoRange : 0), 0),
+        highEngineRPM: deviceTrips.reduce((a, b) => a + (b.canDriverStyle ? b.canDriverStyle.totalTimeWithHighRpmAndTorque : 0), 0),
+        hardBreaking: deviceTrips.reduce((a, b) => a + (b.canDriverStyle ? b.canDriverStyle.totalNumberOfHarshBrakes : 0), 0),
+        hardAcceleration: deviceTrips.reduce((a, b) => a + (b.canDriverStyle ? b.canDriverStyle.totalNumberOfHarshAccelerations : 0), 0)
       }
       reportData.push(deviceData)
     })

package/src/tests/performance.test.js

@@ -0,0 +1,18 @@
+const { getReports } = require('./index')
+const { createPerformanceReport } = require('../partnerReports/performance-report')
+// eslint-disable-next-line no-undef
+describe('performance', function () {
+  this.timeout(500000)
+  // eslint-disable-next-line no-undef
+  it('performance report', async () => {
+    const report = await getReports()
+    const userData = await report.getUserData()
+    userData.devices = userData.devices.filter(d => d.attributes.xpert)
+    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)
+  })
+})

package/src/util/xpert.js

@@ -0,0 +1,64 @@
+function parseEndTripMessage (xpertMessage) {
+  const data = xpertMessage.split(',')
+
+  return {
+    totalDistanceTravelled: Number(data[2]),
+    totalDistanceTravelledWithCruiseControl: Number(data[3]),
+    totalFuelConsumption: Number(data[4]),
+    totalFuelConsumptionInPTO: Number(data[5]),
+    totalFuelConsumptionInIdle: Number(data[6]),
+    totalFuelConsumptionDriving: Number(data[7]),
+    totalFuelConsumptionWithCruiseControl: Number(data[8]),
+    totalTimeWithCruiseControl: Number(data[9]),
+    totalTimeInPTO: Number(data[10]),
+    totalTimeInIdle: Number(data[11]),
+    totalTimeDriving: Number(data[12]),
+    totalTimeWithIgnitionKeyOnly: Number(data[13]),
+    totalEngineHours: Number(data[14])
+  }
+}
+
+function parseCanDriverStyleMessage (xpertMessage) {
+  const data = xpertMessage.split(',')
+
+  return {
+    totalFuelConsumptionInEcoRange: Number(data[2]),
+    totalTimeInEcoRange: Number(data[3]),
+    totalDistanceInEcoRange: Number(data[4]),
+    totalFuelConsumptionWithClutchPressed2: Number(data[5]),
+    totalTimeWithClutchPressed2: Number(data[6]),
+    totalDistanceWithClutchPressed2: Number(data[7]),
+    totalFuelConsumptionWithCruiseControlAndAccelerator2: Number(data[8]),
+    totalTimeWithCruiseControlAndAccelerator2: Number(data[9]),
+    totalDistanceWithCruiseControlAndAccelerator2: Number(data[10]),
+    totalNumberOfBrakes: Number(data[11]),
+    totalNumberOfHarshBrakes: Number(data[12]),
+    totalNumberOfHarshAccelerations: Number(data[13]),
+    totalTimeWithHighRpmAndTorque: Number(data[14]),
+    totalTimeWithHighTorque: Number(data[15]),
+    totalTimeWithHighEngineTemperature: Number(data[16]),
+    totalFuelConsumptionWithHighRpmAndTorque: Number(data[17]),
+    totalDistanceWithHighRpmAndTorque: Number(data[18])
+  }
+}
+
+function getEndTripMessage (trip, route) {
+  const p = route.find(p => new Date(p.fixTime).getTime() > new Date(trip.endTime).getTime() &&
+        p.attributes.xpert &&
+        (Array.isArray(p.attributes.xpert) ? p.attributes.xpert.find(x => x.type === '3') : p.attributes.xpert.split(';').find(m => m.startsWith('3'))))
+
+  return p && (Array.isArray(p.attributes.xpert) ? p.attributes.xpert.find(x => x.type === '3') : p.attributes.xpert.split(';').find(m => m.startsWith('3')))
+}
+
+function getCanDriverStyleMessage (trip, route) {
+  const p = route.find(p => new Date(p.fixTime).getTime() > new Date(trip.endTime).getTime() &&
+      p.attributes.xpert &&
+      (Array.isArray(p.attributes.xpert) ? p.attributes.xpert.find(x => x.type === '4') : p.attributes.xpert.split(';').find(m => m.startsWith('4'))))
+
+  return p && (Array.isArray(p.attributes.xpert) ? p.attributes.xpert.find(x => x.type === '4') : p.attributes.xpert.split(';').find(m => m.startsWith('4')))
+}
+
+exports.parseEndTripMessage = parseEndTripMessage
+exports.getEndTripMessage = getEndTripMessage
+exports.parseCanDriverStyleMessage = parseCanDriverStyleMessage
+exports.getCanDriverStyleMessage = getCanDriverStyleMessage