fleetmap-reports 1.0.734 → 1.0.736

package/package.json

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

package/src/partnerReports/performance-report.js

@@ -1,25 +1,57 @@
-async function createPerformanceReport (from, to, userData, traccarInstance) {
+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 = []
-  userData.devices.forEach(d => {
-    const deviceData = {
-      device: d.name,
-      drivingTime: 850000,
-      idleTime: 200000,
-      drivingConsumption: 20,
-      idleConsumption: 10,
-      drivingDistance: 10000,
-      economicTime: 265000,
-      economicConsumption: 5,
-      economicDistance: 99000,
-      cruiseControlTime: 0,
-      cruiseControlConsumption: 0,
-      cruiseControlDistance: 0,
-      highMotorRPM: 66000,
-      hardBreaking: 10,
-      hardAcceleration: 5
-    }
-    reportData.push(deviceData)
-  })
+
+  const devices = userData.devices
+  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)
+
+    slice.forEach(d => {
+      const deviceRoute = allInOne.route.filter(t => t.deviceId === d.id)
+      const deviceTrips = allInOne.trips.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)
+        t.canDriverStyle = canDriverStyle && parseCanDriverStyleMessage(canDriverStyle.xpertString)
+      })
+
+      const deviceData = {
+        device: d.name,
+        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.totalDistanceInEcoRange : 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)
+    })
+
+    deviceCount = deviceCount + slice.length
+  }
   return reportData
 }
 

package/src/tests/performance.test.js

@@ -0,0 +1,17 @@
+const { getReports } = require('./index')
+const { createPerformanceReport } = require('../partnerReports/performance-report')
+// eslint-disable-next-line no-undef
+describe('performance', function () {
+  // 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/trip-report.js

@@ -10,7 +10,10 @@ const { headerFromUser, addTable } = require('./util/pdfDocument')
 const { getStyle } = require('./reportStyle')
 const traccarHelper = require('./util/traccar')
 const trips = require('./util/trips')
-const { isInsideTimetable, isPartialInsideTimetable, calculateTrip, getTripIdleTime, calculateStopDuration } = require('./util/trips')
+const {
+  isInsideTimetable, isPartialInsideTimetable, getTripIdleTime, calculateStopDuration,
+  getUncompletedTrip
+} = require('./util/trips')
 const { devicesToProcess, deviceName } = require('./util/device')
 const { getIdleEvents } = require('./util/route')
 const { reportByDriver, getDriverName, getDriverData } = require('./util/driver')
@@ -152,11 +155,9 @@ function processDevices (from, to, devices, data, userData, traccar) {
     const deviceRoute = data.route.filter(t => t.deviceId === d.id)
     const deviceTrips = data.trips.filter(t => t.deviceId === d.id)
 
-    if (deviceRoute.length && deviceTrips.length && deviceRoute[deviceRoute.length - 1].attributes.ignition) {
-      const uncompletedTripRoute = deviceRoute.filter(p => p.attributes.ignition && new Date(p.fixTime).getTime() > new Date(deviceTrips[deviceTrips.length - 1].endTime).getTime())
-      if (uncompletedTripRoute.length) {
-        deviceTrips.push(calculateTrip(d, uncompletedTripRoute))
-      }
+    const uncompletedTrip = getUncompletedTrip(d, deviceRoute, deviceTrips)
+    if (uncompletedTrip) {
+      deviceTrips.push(uncompletedTrip)
     }
 
     const trips = deviceTrips.filter(t => userData.allWeek || !userData.weekDays || isInsideTimetable(t, userData) || isPartialInsideTimetable(t, userData, deviceRoute))

package/src/util/trips.js

@@ -104,6 +104,15 @@ function updateTrip (t, route) {
   t.averageSpeed = distance > 0 ? ((route.reduce((a, b) => a + b.speed, 0)) / route.length) : 0
 }
 
+function getUncompletedTrip (device, deviceRoute, deviceTrips) {
+  if (deviceRoute.length && deviceTrips.length && deviceRoute[deviceRoute.length - 1].attributes.ignition) {
+    const uncompletedTripRoute = deviceRoute.filter(p => p.attributes.ignition && new Date(p.fixTime).getTime() > new Date(deviceTrips[deviceTrips.length - 1].endTime).getTime())
+    if (uncompletedTripRoute.length) {
+      return calculateTrip(device, uncompletedTripRoute)
+    }
+  }
+}
+
 function calculateTrip (device, route) {
   const startPos = route[0]
   const endPos = route[route.length - 1]
@@ -153,3 +162,4 @@ exports.isPartialInsideTimetable = isPartialInsideTimetable
 exports.calculateTrip = calculateTrip
 exports.getTripIdleTime = getTripIdleTime
 exports.calculateStopDuration = calculateStopDuration
+exports.getUncompletedTrip = getUncompletedTrip

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 &&
+        p.attributes.xpert.find(x => x.type === '3'))
+
+  return p && p.attributes.xpert.find(x => x.type === '3')
+}
+
+function getCanDriverStyleMessage (trip, route) {
+  const p = route.find(p => new Date(p.fixTime).getTime() > new Date(trip.endTime).getTime() &&
+      p.attributes.xpert &&
+      p.attributes.xpert.find(x => x.type === '4'))
+
+  return p && p.attributes.xpert.find(x => x.type === '4')
+}
+
+exports.parseEndTripMessage = parseEndTripMessage
+exports.getEndTripMessage = getEndTripMessage
+exports.parseCanDriverStyleMessage = parseCanDriverStyleMessage
+exports.getCanDriverStyleMessage = getCanDriverStyleMessage