fleetmap-reports 2.0.375 → 2.0.377

package/package.json

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

package/src/fuel-consumption-report.js

@@ -12,16 +12,6 @@ const { calculateConsumption, calculateTotalFuelFromSensor } = require('./util/f
 const { getSummary } = require('./util/traccar')
 const { calculatePartialTrip } = require('./util/trips')
 
-// --- Timezone-consistent day bucketing (fuel-consumption report only) --------
-// The shared getDates / getSummaryByDay / getDataByDay helpers resolve calendar
-// day boundaries from the JS engine's timezone when they run in the browser, but
-// from the user's configured timezone when they run on the server. So the same
-// report computed client-side and server-side attributes midnight-straddling
-// trips (and their distance / fuel / duration) to different days. The helpers
-// below always key off the user's timezone, matching the server, so both
-// execution paths produce identical daily figures. They are local on purpose -
-// changing the shared helpers would move every other report's numbers.
-
 function getReportTimezone (userData) {
   const tz = userData.user.attributes.timezone || getUserPartner(userData.user).timezone
   try {
@@ -84,24 +74,23 @@ function getDayWindow (date, tz) {
   return [zonedToUTC(year, month, day, 0, 0, 0, tz), zonedToUTC(year, month, day, 23, 59, 59, tz)]
 }
 
-// Local, timezone-consistent equivalent of getSummaryByDay for this report.
-async function getReportSummaryByDay (dates, userData, traccar, devices, tz, from, to) {
+async function getReportSummaryByDay (dates, userData, traccar, devices, tz, reportFrom, reportTo, firstDate, lastDate) {
   const days = []
-  for (const [index, date] of dates.entries()) {
+  for (const date of dates) {
     const { year, month, day } = zonedParts(date, tz)
 
     let startDate = zonedToUTC(year, month, day, ...parseHMS(userData.dayHours.startTime), tz)
-    if (index === 0) {
-      const fromParts = zonedParts(from, tz)
-      const fromClamp = zonedToUTC(year, month, day, fromParts.hour, fromParts.minute, fromParts.second, tz)
-      startDate = startDate.getTime() > fromClamp.getTime() ? startDate : fromClamp
+    if (date.getTime() === firstDate.getTime()) {
+      const p = zonedParts(reportFrom, tz)
+      const clamp = zonedToUTC(year, month, day, p.hour, p.minute, p.second, tz)
+      if (clamp.getTime() > startDate.getTime()) startDate = clamp
     }
 
     let endDate = zonedToUTC(year, month, day, ...parseHMS(userData.dayHours.endTime), tz)
-    if (index === dates.length - 1) {
-      const toParts = zonedParts(to, tz)
-      const toClamp = zonedToUTC(year, month, day, toParts.hour, toParts.minute, toParts.second, tz)
-      endDate = endDate.getTime() < toClamp.getTime() ? endDate : toClamp
+    if (date.getTime() === lastDate.getTime()) {
+      const p = zonedParts(reportTo, tz)
+      const clamp = zonedToUTC(year, month, day, p.hour, p.minute, p.second, tz)
+      if (clamp.getTime() < endDate.getTime()) endDate = clamp
     }
 
     const summary = await getSummary(traccar, startDate, endDate, devices)
@@ -154,22 +143,19 @@ async function createFuelConsumptionReport (from, to, userData, traccar) {
 
   const daysByDevice = new Map()
 
-  // Process the period in chunks of whole calendar days (computed once up front, then grouped) so
-  // we never hold more than ~a week of raw GPS positions for the whole device set in memory at
-  // once - a single busy device can have tens of thousands of positions over a month. Chunking the
-  // already-computed dates list, rather than re-deriving dates per raw millisecond sub-range, avoids
-  // any risk of a boundary day being counted twice (or dropped) due to timezone rounding.
   const timezone = getReportTimezone(userData)
   const allDates = getReportDates(from, to, timezone)
   const dateGroups = automaticReports.sliceArray(allDates, 7)
+  const firstDate = allDates[0]
+  const lastDate = allDates[allDates.length - 1]
 
   for (let chunkIndex = 0; chunkIndex < dateGroups.length; chunkIndex++) {
     const dates = dateGroups[chunkIndex]
-    const chunkFrom = chunkIndex === 0 ? from : dates[0]
-    const chunkTo = chunkIndex === dateGroups.length - 1 ? to : dateGroups[chunkIndex + 1][0]
+    const chunkFrom = chunkIndex === 0 ? from : getDayWindow(dates[0], timezone)[0]
+    const chunkTo = chunkIndex === dateGroups.length - 1 ? to : getDayWindow(dates[dates.length - 1], timezone)[1]
 
     const allInOne = await traccarHelper.getAllInOne(traccar, chunkFrom, chunkTo, devices, true, true, true, false)
-    const summary = await getReportSummaryByDay(dates, userData, traccar, devices, timezone, chunkFrom, chunkTo)
+    const summary = await getReportSummaryByDay(dates, userData, traccar, devices, timezone, from, to, firstDate, lastDate)
 
     const fuelServicesData = []
     if (devices.some(d => d.attributes.odooId)) {

package/src/util/trips.js

@@ -133,6 +133,9 @@ function isInsideTimetable (t, userData) {
 function updateTrip (device, t, route) {
   route = route.filter(p => p && p.attributes.ignition)
   if (!route.length) { return }
+  const originalDistance = t.distance
+  const originalDuration = t.duration
+  const originalSpentFuel = t.spentFuel
   const distance = calculateDistance(route, device ? device.attributes['report.ignoreOdometer'] : true) * 1000
   t.distance = distance
   t.duration = new Date(route[route.length - 1].fixTime).getTime() - new Date(route[0].fixTime).getTime()
@@ -140,6 +143,13 @@ function updateTrip (device, t, route) {
   t.averageSpeed = distance > 0 ? ((route.reduce((a, b) => a + b.speed, 0)) / route.length) : 0
   t.startOdometer = device && !device.attributes['report.ignoreOdometer'] && route[0].attributes.odometer ? route[0].attributes.odometer : route[0].attributes.totalDistance
   t.endOdometer = device && !device.attributes['report.ignoreOdometer'] && route[route.length - 1].attributes.odometer ? route[route.length - 1].attributes.odometer : route[route.length - 1].attributes.totalDistance
+  if (originalSpentFuel > 0) {
+    // A trip clipped at a report day boundary keeps only part of its route, so its
+    // share of the trip's total fuel must be prorated too, otherwise the full trip's
+    // fuel gets counted on both days it was split across.
+    const ratio = originalDistance > 0 ? distance / originalDistance : (originalDuration > 0 ? t.duration / originalDuration : 1)
+    t.spentFuel = originalSpentFuel * Math.min(Math.max(ratio, 0), 1)
+  }
 }
 
 function getUncompletedTrip (device, deviceRoute, deviceTrips) {