fleetmap-reports 2.0.382 → 2.0.384

package/lang/enGB.js

@@ -195,6 +195,8 @@ module.exports = {
     titleStopReport: 'Stop Report',
     titleDriverRankingReport: 'Driver Ranking Report',
     titleSensorReport: 'Sensor Report',
+    sensor: 'Sensor',
+    status: 'Status',
     rank: 'Rank',
     grade: 'Grade',
     safetyScore: 'Safety',

package/lang/esCL.js

@@ -185,6 +185,8 @@ module.exports = {
     titleStopReport: 'Informe de Paradas',
     titleDriverRankingReport: 'Informe de Ranking de Conductores',
     titleSensorReport: 'Informe de Sensores',
+    sensor: 'Sensor',
+    status: 'Estado',
     rank: 'Posición',
     grade: 'Calificación',
     safetyScore: 'Seguridad',

package/lang/frFR.json

@@ -195,7 +195,9 @@
     "titleStopReport": "Arrêter le rapport",
     "titleDelayedStartReport": "Rapport de Departs Tardifs",
     "titleDriverRankingReport": "Rapport d'conducteur",
-    "titleSensorReport": "Sensor Report",
+    "titleSensorReport": "Rapport de capteurs",
+    "sensor": "Capteur",
+    "status": "État",
     "from": "Dans",
     "to": "Le",
     "headerStartAddress": "lieu de départ",

package/lang/ptBR.js

@@ -187,6 +187,8 @@ module.exports = {
     titleStopReport: 'Relatório de Paragens',
     titleDriverRankingReport: 'Relatório de Ranking de Motoristas',
     titleSensorReport: 'Relatório de Sensores',
+    sensor: 'Sensor',
+    status: 'Estado',
     rank: 'Posição',
     grade: 'Nota',
     safetyScore: 'Segurança',

package/lang/ptPT.js

@@ -193,6 +193,8 @@ module.exports = {
     titleStopReport: 'Relatório de Paragens',
     titleDriverRankingReport: 'Relatório de Ranking de Condutores',
     titleSensorReport: 'Relatório de Sensores',
+    sensor: 'Sensor',
+    status: 'Estado',
     rank: 'Posição',
     grade: 'Nota',
     safetyScore: 'Segurança',

package/package.json

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

package/src/fuel-consumption-report.js

@@ -12,6 +12,8 @@ const { calculateConsumption, calculateTotalFuelFromSensor, shouldUseFuelSensor
 const { getSummary } = require('./util/traccar')
 const { calculatePartialTrip } = require('./util/trips')
 
+const CHUNK_BOUNDARY_BUFFER_MS = 24 * 60 * 60 * 1000
+
 function getReportTimezone (userData) {
   const tz = userData.user.attributes.timezone || getUserPartner(userData.user).timezone
   try {
@@ -151,8 +153,20 @@ async function createFuelConsumptionReport (from, to, userData, traccar) {
 
   for (let chunkIndex = 0; chunkIndex < dateGroups.length; chunkIndex++) {
     const dates = dateGroups[chunkIndex]
-    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 chunkFromBase = chunkIndex === 0 ? from : getDayWindow(dates[0], timezone)[0]
+    const chunkToBase = chunkIndex === dateGroups.length - 1 ? to : getDayWindow(dates[dates.length - 1], timezone)[1]
+
+    // A trip in progress across a chunk boundary would otherwise come back from Traccar
+    // truncated to the request window, bypassing the day-boundary proration below (which
+    // only triggers when the trip's real end/start still extends past dayStart/dayEnd) -
+    // making a day's consumption depend on which chunk it happened to land in. Widening
+    // only the internal boundaries (never the report's actual from/to) by a day-long
+    // buffer ensures such a trip is always fetched whole here, so it goes through the same
+    // getReportDataByDay/calculatePartialTrip proration as any other cross-midnight trip.
+    // The date-by-date loop below still only processes this chunk's own `dates`, so no day
+    // is ever double-counted.
+    const chunkFrom = chunkIndex === 0 ? chunkFromBase : new Date(chunkFromBase.getTime() - CHUNK_BOUNDARY_BUFFER_MS)
+    const chunkTo = chunkIndex === dateGroups.length - 1 ? chunkToBase : new Date(chunkToBase.getTime() + CHUNK_BOUNDARY_BUFFER_MS)
 
     const allInOne = await traccarHelper.getAllInOne(traccar, chunkFrom, chunkTo, devices, true, true, true, false)
     const summary = await getReportSummaryByDay(dates, userData, traccar, devices, timezone, from, to, firstDate, lastDate)

package/src/sensor-report.js

@@ -343,16 +343,16 @@ async function exportToPDF (userData, reportData) {
     : (userData.groupByDay
         ? [
             translations.report.date,
-            'Sensor',
+            translations.report.sensor,
             translations.report.start,
             translations.report.end,
             translations.report.duration
           ]
         : [
-            'Sensor',
+            translations.report.sensor,
             translations.report.start,
             translations.report.end,
-            'Estado',
+            translations.report.status,
             translations.report.duration,
             translations.report.endAddress
           ])
@@ -360,7 +360,7 @@ async function exportToPDF (userData, reportData) {
   if (reportDataRows) {
     // eslint-disable-next-line new-cap
     const doc = new jsPDF.jsPDF('l')
-    await headerFromUser(doc, 'Relatório de Sensores', userData.user)
+    await headerFromUser(doc, translations.report.titleSensorReport, userData.user)
 
     let index = 0
     reportDataRows.forEach(function (d) {