fleetmap-reports 2.0.127 → 2.0.129

package/package.json

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

package/src/location-report.js

@@ -409,8 +409,8 @@ function exportLocationReportToExcel (userData, reportData) {
           driver: userData.byDriver ? d.driver.name : getDriverName(a.attributes.driverUniqueId, a.fixTime, userData),
           temperature: getTempValue(a, 'temp1'),
           temperature2: getTempValue(a, 'temp2'),
-          digitalport1: getDigitalPortValue(a, 1, translations, d.device.attributes),
-          digitalport2: getDigitalPortValue(a, 2, translations, d.device.attributes),
+          digitalport1: d.device && getDigitalPortValue(a, 1, translations, d.device.attributes),
+          digitalport2: d.device && getDigitalPortValue(a, 2, translations, d.device.attributes),
           latitude: a.latitude,
           longitude: a.longitude
         }

package/src/partnerReports/driverranking-report.js

@@ -0,0 +1,34 @@
+const traccarHelper = require('../util/traccar')
+const { getDriverData } = require('../util/driver')
+const { getCanDriverStyleMessages, parseCanDriverStyleMessage } = require('../util/xpert')
+
+async function createDriverRankingReport (from, to, userData, traccar) {
+  const reportData = []
+
+  const drivers = userData.drivers
+  const devices = userData.devices
+
+  const allInOne = await traccarHelper.getAllInOne(traccar, from, to, devices, true, true, false, false)
+
+  for (const d of drivers) {
+    const { trips, route } = await getDriverData(d, allInOne, userData)
+    const xpertMessages = route.map(p => p.attributes.rawXpert).filter(a => a)
+    const canDriverStyle = getCanDriverStyleMessages(xpertMessages).map(m => parseCanDriverStyleMessage(m.xpertString || m)).sort((a, b) => a.date.localeCompare(b.date))
+
+    const highEngineRPM = canDriverStyle.length > 1 ? canDriverStyle[canDriverStyle.length - 1].totalTimeWithHighRpmAndTorque - canDriverStyle[0].totalTimeWithHighRpmAndTorque : 0
+    const hardBraking = canDriverStyle.length > 1 ? canDriverStyle[canDriverStyle.length - 1].totalNumberOfHarshBrakes - canDriverStyle[0].totalNumberOfHarshBrakes : 0
+    const hardAcceleration = canDriverStyle.length > 1 ? canDriverStyle[canDriverStyle.length - 1].totalNumberOfHarshAccelerations - canDriverStyle[0].totalNumberOfHarshAccelerations : 0
+
+    reportData.drivers.push({
+      name: d.name,
+      distance: trips.filter(t => t.distance > 0).reduce((a, b) => a + b.distance, 0),
+      highEngineRPM,
+      hardBraking,
+      hardAcceleration
+    })
+  }
+
+  return reportData
+}
+
+exports.createDriverRankingReport = createDriverRankingReport