fleetmap-reports 1.0.773 → 1.0.775

package/package.json

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

package/src/partnerReports/performance-report.js

@@ -36,8 +36,8 @@ async function createPerformanceReport (from, to, userData, traccar) {
     const totalTime = drivingTime + idleTime
     const totalConsumption = drivingConsumption + idleConsumption
 
-    const totalIndicator = (drivingDistance > 0 ? (totalConsumption * 0.1) * 100 / drivingDistance : 0).toFixed(1) + ' L/100'
-    const drivingIndicator = (drivingDistance > 0 ? (drivingConsumption * 0.1) * 100 / drivingDistance : 0).toFixed(1) + ' L/100'
+    const totalIndicator = (drivingDistance > 0 ? totalConsumption * 100 / drivingDistance : 0).toFixed(1) + ' L/100'
+    const drivingIndicator = (drivingDistance > 0 ? drivingConsumption * 100 / drivingDistance : 0).toFixed(1) + ' L/100'
     const idleIndicator = (totalConsumption > 0 ? idleConsumption * 100 / totalConsumption : 0).toFixed(1) + ' %'
     const economicIndicator = (totalTime > 0 ? economicTime * 100 / totalTime : 0).toFixed(1) + ' %'
     const cruiseControlIndicator = (totalTime > 0 ? cruiseControlTime * 100 / totalTime : 0).toFixed(1) + ' %'
@@ -98,10 +98,10 @@ function getDeviceData (allInOne, d) {
     const hardBreaking = 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
 
-    const drivingConsumption = endTripData.length > 1 ? endTripData[endTripData.length - 1].totalFuelConsumptionDriving - endTripData[0].totalFuelConsumptionDriving : 0
-    const idleConsumption = endTripData.length > 1 ? endTripData[endTripData.length - 1].totalFuelConsumptionInIdle - endTripData[0].totalFuelConsumptionInIdle : 0
-    const cruiseControlConsumption = endTripData.length > 1 ? endTripData[endTripData.length - 1].totalFuelConsumptionWithCruiseControl - endTripData[0].totalFuelConsumptionWithCruiseControl : 0
-    const economicConsumption = canDriverStyle.length > 1 ? canDriverStyle[canDriverStyle.length - 1].totalFuelConsumptionInEcoRange - canDriverStyle[0].totalFuelConsumptionInEcoRange : 0
+    const drivingConsumption = endTripData.length > 1 ? (endTripData[endTripData.length - 1].totalFuelConsumptionDriving - endTripData[0].totalFuelConsumptionDriving) * 0.1 : 0
+    const idleConsumption = endTripData.length > 1 ? (endTripData[endTripData.length - 1].totalFuelConsumptionInIdle - endTripData[0].totalFuelConsumptionInIdle) * 0.1 : 0
+    const cruiseControlConsumption = endTripData.length > 1 ? (endTripData[endTripData.length - 1].totalFuelConsumptionWithCruiseControl - endTripData[0].totalFuelConsumptionWithCruiseControl) * 0.1 : 0
+    const economicConsumption = canDriverStyle.length > 1 ? (canDriverStyle[canDriverStyle.length - 1].totalFuelConsumptionInEcoRange - canDriverStyle[0].totalFuelConsumptionInEcoRange) * 0.1 : 0
 
     const drivingDistance = endTripData.length > 1 ? endTripData[endTripData.length - 1].totalDistanceTravelled - endTripData[0].totalDistanceTravelled : 0
     const cruiseControlDistance = endTripData.length > 1 ? endTripData[endTripData.length - 1].totalDistanceTravelledWithCruiseControl - endTripData[0].totalDistanceTravelledWithCruiseControl : 0
@@ -124,13 +124,13 @@ function getDeviceData (allInOne, d) {
       economicDistance
     }
   } else {
-    const deviceSummary = allInOne.summary.filter(t => t.deviceId === d.id)
+    const deviceSummary = allInOne.summary.filter(t => t.deviceId === d.id)[0]
 
     const drivingTime = deviceTrips.reduce((a, b) => a + b.duration, 0)
     const drivingConsumption = deviceTrips.reduce((a, b) => a + b.spentFuel, 0)
-    const drivingDistance = deviceSummary.distance
-    const idleTime = deviceSummary.engineHours - drivingTime
-    const idleConsumption = deviceSummary.spentFuel - drivingConsumption
+    const drivingDistance = deviceSummary ? deviceSummary.distance / 1000 : 0
+    const idleTime = deviceSummary && deviceSummary.engineHours > drivingTime ? deviceSummary.engineHours - drivingTime : 0
+    const idleConsumption = deviceSummary && deviceSummary.spentFuel > drivingConsumption ? deviceSummary.spentFuel - drivingConsumption : 0
 
     const hardBreaking = deviceRoute.filter(p => p.attributes.io253 === 2).length
     const hardAcceleration = deviceRoute.filter(p => p.attributes.io253 === 1).length

package/src/tests/performance.test.js

@@ -27,6 +27,6 @@ describe('performance', function () {
       userData,
       report.traccar)
     console.log(data)
-    assert.equal(data[0].consumption, 1685.1989999999996)
+    assert.equal(data[0].consumption, 168.51989999999998)
   }, 8000000)
 })