fleetmap-reports 2.0.138 → 2.0.139

package/package.json

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

package/src/partnerReports/driverranking-report.js

@@ -12,25 +12,37 @@ const { calculateConsumption } = require('../util/fuel')
 const { getCanAvgConsumption } = require('../fuel-consumption-report')
 
 const distanceTarget = 10000 // meters
-const distanceCoefficient = 0.9
+const distanceCoefficient = 0.5
 
 const consumptionTarget = 11.5 // minutes
-const consumptionCoefficient = 0.13
+const consumptionCoefficient = 0.7
 
 const rpmTarget = 60 // minutes
-const rpmCoefficient = 0.13
+const rpmCoefficient = 0.8
 
 const hardBrakingTarget = 1
-const hardBrakingCoefficient = 0.15
+const hardBrakingCoefficient = 0.10
 
 const hardAccelerationTarget = 1
-const hardAccelerationCoefficient = 0.15
+const hardAccelerationCoefficient = 0.10
 
 const hardCorneringTarget = 1
-const hardCorneringCoefficient = 0.15
+const hardCorneringCoefficient = 0.10
 
 const overspeedTarget = 2
-const overspeedCoefficient = 0.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 = []
@@ -44,11 +56,17 @@ async function create (from, to, userData, traccar) {
     const allInOne = await traccarHelper.getAllInOne(traccar, from, to, [device], true, true, false, false, deviceCount, devices.length)
     const hereResults = await getRoadSpeedLimits([device], allInOne.route, 5)
 
+    // getEvents
+    const geofenceAlarm = 0
+    const continuesDrivingAlarm = 0
+    const reverseAlarm = 0
+    const otherAlarm = 0
+
     for (const d of drivers) {
       const { trips, route } = await getDriverData(d, allInOne, userData)
       const positionIds = route.map(p => p.id)
       const driverOverSpeedEvents = hereResults.filter(e => positionIds.includes(e.positionId))
-      const spentFuel = calculateConsumption(d, { trips, route })
+      const spentFuel = calculateConsumption(device, { trips, route })
 
       let driverData = driversData.get(d.id)
       if (!driverData) {
@@ -60,7 +78,11 @@ async function create (from, to, userData, traccar) {
           hardAcceleration: 0,
           hardCornering: 0,
           overspeed: 0,
-          spentFuel: 0
+          spentFuel: 0,
+          geofenceAlarm: 0,
+          continuesDrivingAlarm: 0,
+          reverseAlarm: 0,
+          otherAlarm: 0
         }
         driversData.set(d.id, driverData)
       }
@@ -93,6 +115,10 @@ async function create (from, to, userData, traccar) {
       driverData.hardCornering = driverData.hardCornering + hardCornering
       driverData.overspeed = driverData.overspeed + driverOverSpeedEvents.length
       driverData.spentFuel = driverData.spentFuel + spentFuel
+      driverData.geofenceAlarm = driverData.geofenceAlarm + geofenceAlarm
+      driverData.continuesDrivingAlarm = driverData.continuesDrivingAlarm + continuesDrivingAlarm
+      driverData.reverseAlarm = driverData.reverseAlarm + reverseAlarm
+      driverData.otherAlarm = driverData.otherAlarm + otherAlarm
     }
 
     deviceCount++
@@ -107,14 +133,34 @@ async function create (from, to, userData, traccar) {
     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
-    d.score = distanceScore + rpmScore + hardBrakingScore + hardAccelerationScore + hardCorneringScore + consumptionScore + overspeedScore
+    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,
+    otherCoefficient
+  }
+
   return reportData
 }