fleetmap-reports 2.0.141 → 2.0.143

package/lang/frFR.json

@@ -288,7 +288,13 @@
     "highEngineRPM": "Moteur élevé",
     "hardAcceleration": "Accéleration brusque",
     "hardBraking": "Freinage brusque",
-    "hardCornering": "Virages brusque"
+    "hardCornering": "Virages brusque",
+    "avgFuelConsumption": "Avg. L/100",
+    "overspeedAlarm": "Exces Vitesse",
+    "geofenceAlarm": "Ceinture",
+    "continuesDrivingAlarm": "Cond. Continue",
+    "reverseAlarm": "Marche Arriere",
+    "otherAlarm": "Other"
   },
   "layout": {
     "deviceOnline": "Appareil en ligne",

package/package.json

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

package/src/partnerReports/driverranking-report.js

@@ -11,41 +11,22 @@ const { getOverspeedEvents } = require('../speeding-report')
 const { calculateConsumption } = require('../util/fuel')
 const { getCanAvgConsumption } = require('../fuel-consumption-report')
 
-const distanceTarget = 10000 // meters
 const distanceCoefficient = 0.5
-
-const consumptionTarget = 11.5 // minutes
 const consumptionCoefficient = 0.7
-
-const rpmTarget = 60 // minutes
 const rpmCoefficient = 0.8
-
-const hardBrakingTarget = 1
 const hardBrakingCoefficient = 0.10
-
-const hardAccelerationTarget = 1
 const hardAccelerationCoefficient = 0.10
-
-const hardCorneringTarget = 1
 const hardCorneringCoefficient = 0.10
-
-const overspeedTarget = 2
 const overspeedCoefficient = 0.15
-
-const geofenceTarget = 1
 const geofenceCoefficient = 0.15
-
-const continuesDrivingTarget = 1
 const continuesDrivingCoefficient = 0.1
-
-const reverseTarget = 1
 const reverseCoefficient = 0.1
-
-const otherTarget = 1
 const otherCoefficient = 0.1
 
 async function create (from, to, userData, traccar) {
-  const reportData = []
+  const reportData = {
+    drivers: []
+  }
 
   const drivers = userData.drivers
   const devices = userData.devices
@@ -131,38 +112,52 @@ async function create (from, to, userData, traccar) {
 
   const allDriversData = (Array.from(driversData.values())).filter(d => d.distance > 0)
   allDriversData.forEach(d => {
-    const distanceScore = (Math.abs(d.distance - distanceTarget) / distanceTarget) * distanceCoefficient
-    const rpmScore = ((d.highEngineRPM / 60000) / rpmTarget) * rpmCoefficient
-    const hardBrakingScore = (d.hardBraking / hardBrakingTarget) * hardBrakingCoefficient
-    const hardAccelerationScore = (d.hardAcceleration / hardAccelerationTarget) * hardAccelerationCoefficient
-    const hardCorneringScore = (d.hardCornering / hardCorneringTarget) * hardCorneringCoefficient
-    const overspeedScore = (d.overspeed / overspeedTarget) * overspeedCoefficient
-    const consumptionScore = (getCanAvgConsumption(d.distance, d.spentFuel).byKms / consumptionTarget) * consumptionCoefficient
-    const geofenceAlarmScore = (d.geofenceAlarm / geofenceTarget) * geofenceCoefficient
-    const continuesDrivingAlarmScore = (d.continuesDrivingAlarm / continuesDrivingTarget) * continuesDrivingCoefficient
-    const reverseAlarmScore = (d.reverseAlarm / reverseTarget) * reverseCoefficient
-    const otherAlarmScore = (d.otherAlarm / otherTarget) * otherCoefficient
-
-    d.avgConsumption = getCanAvgConsumption(d.distance, d.spentFuel).byKms
+    const distanceScore = (Math.abs(d.distance - userData.distanceTarget) / userData.distanceTarget) * distanceCoefficient
+    const rpmScore = ((d.highEngineRPM / 60000) / userData.rpmTarget) * rpmCoefficient
+    const hardBrakingScore = (d.hardBraking / userData.hardBrakingTarget) * hardBrakingCoefficient
+    const hardAccelerationScore = (d.hardAcceleration / userData.hardAccelerationTarget) * hardAccelerationCoefficient
+    const hardCorneringScore = (d.hardCornering / userData.hardCorneringTarget) * hardCorneringCoefficient
+    const overspeedScore = (d.overspeed / userData.overspeedTarget) * overspeedCoefficient
+    const consumptionScore = (getCanAvgConsumption(d.distance, d.spentFuel).byKms / userData.fuelConsumptionTarget) * consumptionCoefficient
+    const geofenceAlarmScore = (d.geofenceAlarm / userData.geofenceTarget) * geofenceCoefficient
+    const continuesDrivingAlarmScore = (d.continuesDrivingAlarm / userData.continuesDrivingTarget) * continuesDrivingCoefficient
+    const reverseAlarmScore = (d.reverseAlarm / userData.reverseTarget) * reverseCoefficient
+    const otherAlarmScore = (d.otherAlarm / userData.otherTarget) * otherCoefficient
+
+    d.avgFuelConsumption = getCanAvgConsumption(d.distance, d.spentFuel).byKms
     d.score = distanceScore + rpmScore + hardBrakingScore + hardAccelerationScore +
         hardCorneringScore + consumptionScore + overspeedScore + geofenceAlarmScore +
         continuesDrivingAlarmScore + reverseAlarmScore + otherAlarmScore
   })
   allDriversData.sort((a, b) => (a.score > b.score) ? 1 : -1)
 
-  reportData.push(...allDriversData)
-
-  reportData.targetValues = {
-    distanceTarget,
-    rpmTarget,
-    hardBrakingTarget,
-    hardAccelerationTarget,
-    hardCorneringTarget,
-    consumptionTarget,
-    overspeedTarget,
-    geofenceTarget,
-    continuesDrivingTarget,
-    reverseTarget,
+  reportData.drivers.push(...allDriversData)
+
+  reportData.target = {
+    distanceTarget: userData.distanceTarget,
+    rpmTarget: userData.rpmTarget,
+    hardBrakingTarget: userData.hardBrakingTarget,
+    hardAccelerationTarget: userData.hardAccelerationTarget,
+    hardCorneringTarget: userData.hardCorneringTarget,
+    fuelConsumptionTarget: userData.fuelConsumptionTarget,
+    overspeedTarget: userData.overspeedTarget,
+    geofenceTarget: userData.geofenceTarget,
+    continuesDrivingTarget: userData.continuesDrivingTarget,
+    reverseTarget: userData.reverseTarget,
+    otherTarget: userData.otherTarget
+  }
+
+  reportData.coefficient = {
+    distanceCoefficient,
+    rpmCoefficient,
+    hardBrakingCoefficient,
+    hardAccelerationCoefficient,
+    hardCorneringCoefficient,
+    consumptionCoefficient,
+    overspeedCoefficient,
+    geofenceCoefficient,
+    continuesDrivingCoefficient,
+    reverseCoefficient,
     otherCoefficient
   }
 
@@ -175,7 +170,7 @@ async function exportToExcel (userData, reportData) {
 
   const translations = getTranslations(userData)
 
-  const reportDataRows = reportData
+  const reportDataRows = reportData.drivers
 
   const settings = {
     sheetName: translations.report.titleDriverRankingReport, // The name of the sheet
@@ -185,10 +180,16 @@ async function exportToExcel (userData, reportData) {
   const headers = [
     { label: translations.report.driver, value: 'name' },
     { label: translations.report.distance, value: 'distance' },
+    { label: translations.report.avgFuelConsumption, value: 'avgFuelConsumption' },
     { label: translations.report.highEngineRPM, value: 'highEngineRPM' },
     { label: translations.report.hardBraking, value: 'hardBraking' },
     { label: translations.report.hardAcceleration, value: 'hardAcceleration' },
     { label: translations.report.hardCornering, value: 'hardCornering' },
+    { label: translations.report.overspeedAlarm, value: 'overspeed' },
+    { label: translations.report.geofenceAlarm, value: 'geofenceAlarm' },
+    { label: translations.report.continuesDrivingAlarm, value: 'continuesDrivingAlarm' },
+    { label: translations.report.reverseAlarm, value: 'reverseAlarm' },
+    { label: translations.report.otherAlarm, value: 'otherAlarm' },
     { label: translations.report.score, value: 'score' }
   ]
 
@@ -198,11 +199,17 @@ async function exportToExcel (userData, reportData) {
       data = data.concat({
         name: row.name,
         distance: Number(row.distance.toFixed(1)),
+        avgFuelConsumption: Number(row.avgFuelConsumption.toFixed(2)),
         highEngineRPM: row.highEngineRPM,
         hardBraking: row.hardBraking,
         hardAcceleration: row.hardAcceleration,
         hardCornering: row.hardCornering,
-        score: row.score
+        overspeed: row.overspeed,
+        geofenceAlarm: row.geofenceAlarm,
+        continuesDrivingAlarm: row.continuesDrivingAlarm,
+        reverseAlarm: row.reverseAlarm,
+        otherAlarm: row.otherAlarm,
+        score: Number(row.score.toFixed(2))
       })
     })
     console.log(data)
@@ -220,15 +227,21 @@ async function exportToPDF (userData, reportData) {
   const timezone = userData.user.attributes.timezone
   const translations = getTranslations(userData)
   const lang = userData.user.attributes.lang || (isClientSide() && navigator.language)
-  const reportDataRows = reportData.devices
+  const reportDataRows = reportData.drivers
 
   const headers = [
     translations.report.driver,
     translations.report.distance,
+    translations.report.avgFuelConsumption,
     translations.report.highEngineRPM,
     translations.report.hardBraking,
     translations.report.hardAcceleration,
     translations.report.hardCornering,
+    translations.report.overspeedAlarm,
+    translations.report.geofenceAlarm,
+    translations.report.continuesDrivingAlarm,
+    translations.report.reverseAlarm,
+    translations.report.otherAlarm,
     translations.report.score
   ]
 
@@ -245,10 +258,16 @@ async function exportToPDF (userData, reportData) {
       const temp = [
         row.name,
         row.distance,
+        row.avgFuelConsumption,
         row.highEngineRPM,
         row.hardBraking,
         row.hardAcceleration,
         row.hardCornering,
+        row.overspeed,
+        row.geofenceAlarm,
+        row.continuesDrivingAlarm,
+        row.reverseAlarm,
+        row.otherAlarm,
         row.score
       ]
       data.push(temp)