fleetmap-reports 2.0.343 → 2.0.345

package/package.json

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

package/src/trip-report.js

@@ -535,7 +535,9 @@ function exportTripReportToExcel (userData, reportData) {
     }
 
     tripsData.forEach(d => {
-      const group = userData.groups.find(g => g.id === d.device.groupId)
+      const group = userData.byDriver
+        ? userData.groups.find(g => g.drivers && g.drivers.includes(d.id))
+        : userData.groups.find(g => g.id === d.device.groupId)
       data = data.concat([{}])
       data = data.concat(d.trips.map(a => {
         return {
@@ -556,7 +558,7 @@ function exportTripReportToExcel (userData, reportData) {
           maxTemp: a.maxTemp,
           minTemp: a.minTemp,
           avgTemp: a.avgTemp && Number(a.avgTemp.toFixed(1)),
-          model: d.device.model,
+          model: d.device && d.device.model,
           group: group && group.name
         }
       }))

package/src/util/fuel.js

@@ -32,6 +32,15 @@ function calculateSpentFuel (value, device, withFuelUsed) {
     return withFuelUsed ? value : (value * device.attributes.fuel_tank_capacity) / 100
   }
 
+  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
 }