fleetmap-reports 2.0.344 → 2.0.346

package/package.json

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

package/src/util/fuel.js

@@ -15,8 +15,7 @@ function calculateConsumption (d, data) {
   if (data.summary && withFuelUsed) {
     fuelConsumption = calculateSpentFuel(data.summary.spentFuel, d, withFuelUsed)
   } else if (data.trips && data.stops) {
-    const spentFuel = data.trips.reduce((a, b) => a + (b.spentFuel > 0 ? b.spentFuel : 0), 0) + data.stops.reduce((a, b) => a + (b.spentFuel > 0 ? b.spentFuel : 0), 0)
-    fuelConsumption = calculateSpentFuel(spentFuel, d, withFuelUsed)
+    fuelConsumption = data.trips.reduce((a, b) => a + calculateSpentFuel(b.spentFuel, d, withFuelUsed), 0) + data.stops.reduce((a, b) => a + calculateSpentFuel(b.spentFuel, d, withFuelUsed), 0)
   } else if (data.route && data.route.length > 1 && data.route[0].attributes.fuelUsed) {
     fuelConsumption = data.route[data.route.length - 1].attributes.fuelUsed - data.route[0].attributes.fuelUsed
   } else if (data.summary) {
@@ -32,7 +31,16 @@ function calculateSpentFuel (value, device, withFuelUsed) {
     return withFuelUsed ? value : (value * device.attributes.fuel_tank_capacity) / 100
   }
 
-  return value
+  const { fuel_low_threshold, fuel_high_threshold, fuel_tank_capacity } = device.attributes
+  if (fuel_low_threshold != null && fuel_high_threshold != null && fuel_tank_capacity) {
+    const sensorRange = Math.abs(fuel_high_threshold - fuel_low_threshold)
+    const rawFuel = fuel_low_threshold > fuel_high_threshold
+        ? (value < 0 ? Math.abs(value) : 0)
+        : value
+    return rawFuel > 0 ? (rawFuel / sensorRange) * fuel_tank_capacity : 0
+  }
+
+  return value > 0 ? value : 0
 }
 
 function useOdooFuelData (d, route) {