fleetmap-reports 2.0.373 → 2.0.375

package/package.json

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

package/src/fuel-consumption-report.js

@@ -3,14 +3,131 @@ const traccarHelper = require('./util/traccar')
 const odoo = require('./util/odoo')
 const automaticReports = require('./automaticReports')
 const { devicesToProcess } = require('./util/device')
-const { getTranslations, convertToLocaleString, getLanguage, convertMS, formatNumber, getDates, isClientSide, executeServerSide } = require('./util/utils')
+const { getTranslations, convertToLocaleString, getLanguage, convertMS, formatNumber, isClientSide, executeServerSide } = require('./util/utils')
 const { getStyle } = require('./reportStyle')
 const { getUserPartner } = require('fleetmap-partners')
 const { addTable, headerFromUser } = require('./util/pdfDocument')
 const jsPDF = require('jspdf')
-const { calculateConsumption, calculateTotalFuelFromSensor} = require('./util/fuel')
-const { getSummaryByDay } = require('./util/traccar')
-const { getDataByDay } = require('./util/trips')
+const { calculateConsumption, calculateTotalFuelFromSensor } = require('./util/fuel')
+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 {
+    Intl.DateTimeFormat(undefined, { timeZone: tz })
+    return tz
+  } catch (e) {
+    return undefined
+  }
+}
+
+// Wall-clock parts of `instant` as seen in `tz` (UTC parts when tz is unusable).
+function zonedParts (instant, tz) {
+  const d = new Date(instant)
+  if (!tz) {
+    return { year: d.getUTCFullYear(), month: d.getUTCMonth(), day: d.getUTCDate(), hour: d.getUTCHours(), minute: d.getUTCMinutes(), second: d.getUTCSeconds() }
+  }
+  const p = {}
+  for (const part of new Intl.DateTimeFormat('en-US', {
+    timeZone: tz, year: 'numeric', month: '2-digit', day: '2-digit', hour: '2-digit', minute: '2-digit', second: '2-digit', hour12: false
+  }).formatToParts(d)) {
+    if (part.type !== 'literal') p[part.type] = part.value
+  }
+  return { year: Number(p.year), month: Number(p.month) - 1, day: Number(p.day), hour: Number(p.hour) % 24, minute: Number(p.minute), second: Number(p.second) }
+}
+
+// UTC Date for a given wall-clock time in `tz`. Single correction step - exact
+// except inside the ~1h DST fall-back overlap, and identical on client & server.
+function zonedToUTC (year, month, day, hour, minute, second, tz) {
+  const guess = Date.UTC(year, month, day, hour || 0, minute || 0, second || 0)
+  if (!tz) return new Date(guess)
+  const seen = zonedParts(guess, tz)
+  const seenUTC = Date.UTC(seen.year, seen.month, seen.day, seen.hour, seen.minute, seen.second)
+  return new Date(guess - (seenUTC - guess))
+}
+
+// One noon-UTC marker per calendar day in [from, to], days counted in `tz`.
+// Mirrors the server behaviour of getDates(from, to, tz).
+function getReportDates (from, to, tz) {
+  const start = zonedParts(from, tz)
+  const end = zonedParts(to, tz)
+  const dates = []
+  let cursor = Date.UTC(start.year, start.month, start.day, 12, 0, 0, 0)
+  const last = Date.UTC(end.year, end.month, end.day, 12, 0, 0, 0)
+  while (cursor <= last) {
+    dates.push(new Date(cursor))
+    cursor += 24 * 60 * 60 * 1000
+  }
+  return dates
+}
+
+function parseHMS (value) {
+  const [h, m, s] = String(value).split(':').map(Number)
+  return [h || 0, m || 0, s || 0]
+}
+
+// Midnight-to-23:59:59 window for `date`'s calendar day, in `tz`. Mirrors the
+// server branch of getDataByDay.
+function getDayWindow (date, tz) {
+  const { year, month, day } = zonedParts(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) {
+  const days = []
+  for (const [index, date] of dates.entries()) {
+    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
+    }
+
+    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
+    }
+
+    const summary = await getSummary(traccar, startDate, endDate, devices)
+    days.push({ date, summary })
+  }
+  return days
+}
+
+// Local, timezone-consistent equivalent of getDataByDay for this report.
+async function getReportDataByDay (device, startDate, endDate, data) {
+  const tripsByDay = (data.trips || [])
+    .filter(t => new Date(t.endTime) > startDate && new Date(t.startTime) < endDate)
+    .map(t => ({ ...t }))
+  for (const t of tripsByDay) {
+    await calculatePartialTrip(device, startDate, endDate, data.route, t)
+  }
+
+  const stopsByDay = (data.stops || [])
+    .filter(t => new Date(t.endTime) > startDate && new Date(t.startTime) < endDate)
+    .map(t => ({ ...t }))
+
+  const routeByDay = data.route ? data.route.filter(p => new Date(p.fixTime) > startDate && new Date(p.fixTime) < endDate) : []
+  const refuelingPositionsByDay = data.refuelingPositions ? data.refuelingPositions.filter(p => new Date(p.date) > startDate && new Date(p.date) < endDate) : []
+
+  return { tripsByDay, stopsByDay, routeByDay, refuelingPositionsByDay }
+}
 
 async function createFuelConsumptionReport (from, to, userData, traccar) {
   console.log('Create FuelConsumption Report')
@@ -41,8 +158,9 @@ async function createFuelConsumptionReport (from, to, userData, traccar) {
   // 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 getDates' timezone rounding.
-  const allDates = getDates(from, to, userData.user.attributes.timezone || getUserPartner(userData.user).timezone)
+  // 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)
 
   for (let chunkIndex = 0; chunkIndex < dateGroups.length; chunkIndex++) {
@@ -51,7 +169,7 @@ async function createFuelConsumptionReport (from, to, userData, traccar) {
     const chunkTo = chunkIndex === dateGroups.length - 1 ? to : dateGroups[chunkIndex + 1][0]
 
     const allInOne = await traccarHelper.getAllInOne(traccar, chunkFrom, chunkTo, devices, true, true, true, false)
-    const summary = await getSummaryByDay(dates, userData, traccar, devices, true, chunkFrom, chunkTo)
+    const summary = await getReportSummaryByDay(dates, userData, traccar, devices, timezone, chunkFrom, chunkTo)
 
     const fuelServicesData = []
     if (devices.some(d => d.attributes.odooId)) {
@@ -69,7 +187,8 @@ async function createFuelConsumptionReport (from, to, userData, traccar) {
           const refuelingPositions = await refuelingReport.calculateRefuelingPositions(userData, d, { route, trips, fuelServices: deviceFuelServices })
           const days = daysByDevice.get(d.id) || []
           for (const date of dates) {
-            const { tripsByDay, stopsByDay, routeByDay, refuelingPositionsByDay } = await getDataByDay(d, date, { trips, stops, route, refuelingPositions }, userData, traccar)
+            const [dayStart, dayEnd] = getDayWindow(date, timezone)
+            const { tripsByDay, stopsByDay, routeByDay, 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)
 
@@ -80,9 +199,9 @@ async function createFuelConsumptionReport (from, to, userData, traccar) {
                 'fuel_high_threshold' in d.attributes &&
                 d.attributes.fuel_tank_capacity
 
-            const spentFuel = hasFuelSensor ?
-                tripsByDay.length > 0 ? calculateTotalFuelFromSensor(tripsByDay, stopsByDay, route, d, firstStopIndex) : 0
-                : calculateConsumption(d, { trips: tripsByDay, stops: stopsByDay, route: routeByDay, summary: summaryByDevice })
+            const spentFuel = hasFuelSensor
+              ? tripsByDay.length > 0 ? calculateTotalFuelFromSensor(tripsByDay, stopsByDay, route, d, firstStopIndex) : 0
+              : calculateConsumption(d, { trips: tripsByDay, stops: stopsByDay, route: routeByDay, summary: summaryByDevice })
 
             const dataRow = {
               date,

package/src/stop-report.js

@@ -77,7 +77,7 @@ function processDevices (from, to, devices, data, userData) {
       }
 
       routeInsideGeofence.every(p => {
-        const geofence = userData.geofences.filter(g => g && g.area.startsWith('POLYGON')).find(g =>
+        const geofence = userData.geofences.filter(g => g && g.area && g.area.startsWith('POLYGON')).find(g =>
           insideGeofence({ latitude: p.latitude, longitude: p.longitude }, g)
         )
         if (geofence) {