fleetmap-reports 2.0.378 → 2.0.379

package/package.json

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

package/src/fuel-consumption-report.js

@@ -174,7 +174,7 @@ async function createFuelConsumptionReport (from, to, userData, traccar) {
           const days = daysByDevice.get(d.id) || []
           for (const date of dates) {
             const [dayStart, dayEnd] = getDayWindow(date, timezone)
-            const { tripsByDay, stopsByDay, routeByDay, refuelingPositionsByDay } = await getReportDataByDay(d, dayStart, dayEnd, { trips, stops, route, refuelingPositions })
+            const { tripsByDay, stopsByDay, refuelingPositionsByDay } = await getReportDataByDay(d, dayStart, dayEnd, { trips, stops, route, refuelingPositions })
             const summaryByDay = summary.find(a => a.date === date).summary
             const summaryByDevice = summaryByDay.find(a => a.deviceId === d.id)
 
@@ -185,9 +185,13 @@ async function createFuelConsumptionReport (from, to, userData, traccar) {
                 'fuel_high_threshold' in d.attributes &&
                 d.attributes.fuel_tank_capacity
 
+            // For CAN vehicles calculateConsumption reads the "fuelUsed" counter directly from
+            // the full chunk route between dayStart/dayEnd, so the day value matches the
+            // Manager's "Fuel Used" even when routeByDay itself has too few (or no) fuelUsed
+            // readings - e.g. on a day with a refuel or sparse CAN reporting.
             const spentFuel = hasFuelSensor
               ? tripsByDay.length > 0 ? calculateTotalFuelFromSensor(tripsByDay, stopsByDay, route, d, firstStopIndex) : 0
-              : calculateConsumption(d, { trips: tripsByDay, stops: stopsByDay, route: routeByDay, summary: summaryByDevice })
+              : calculateConsumption(d, { trips: tripsByDay, stops: stopsByDay, route, summary: summaryByDevice, from: dayStart, to: dayEnd })
 
             const dataRow = {
               date,