fleetmap-reports 2.0.385 → 2.0.387

package/package.json

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

package/src/activity-report.js

@@ -207,7 +207,8 @@ async function processDevices (from, to, devices, data, userData, traccarInstanc
               endTime: tripsByDay.length && tripsByDay[tripsByDay.length - 1].endTime,
               endAddress: tripsByDay.length && tripsByDay[tripsByDay.length - 1].endAddress,
               startTimeIsOut: tripsByDay.some(t => t.startTimeIsOut),
-              endTimeIsOut: tripsByDay.some(t => t.endTimeIsOut)
+              endTimeIsOut: tripsByDay.some(t => t.endTimeIsOut),
+              activity: getDayActivity(tripsByDay, fromDay, toDay)
             })
           }
         } else {
@@ -232,6 +233,7 @@ async function processDevices (from, to, devices, data, userData, traccarInstanc
           summaryCurrentDay.endOdometer = summaryByDevice.endOdometer
           summaryCurrentDay.startTimeIsOut = tripsByDay.some(t => t.startTimeIsOut)
           summaryCurrentDay.endTimeIsOut = tripsByDay.some(t => t.endTimeIsOut)
+          summaryCurrentDay.activity = getDayActivity(tripsByDay, fromDay, toDay)
           summary.push(summaryCurrentDay)
         }
       }
@@ -285,6 +287,17 @@ async function processDevices (from, to, devices, data, userData, traccarInstanc
   return devicesResult
 }
 
+// Trips of one day as [{ start, end }] in hours since the start of that day (0-24),
+// used to draw the daily activity timeline on screen and in the PDF.
+function getDayActivity (tripsByDay, fromDay, toDay) {
+  const dayStart = new Date(fromDay).getTime()
+  const dayEnd = new Date(toDay).getTime()
+  const toHours = time => (Math.min(Math.max(new Date(time).getTime(), dayStart), dayEnd) - dayStart) / 3600000
+  return tripsByDay
+    .map(t => ({ start: toHours(t.startTime), end: toHours(t.endTime) }))
+    .filter(a => a.end > a.start)
+}
+
 function processDrivers (from, to, drivers, driversData, userData) {
   const driversResult = []
   drivers.forEach(d => {
@@ -508,6 +521,63 @@ function exportActivityReportToPDFVehicleGroupByDay (doc, translations, reportDa
 
     const style = getStyle(getUserPartner(userData.user))
     addTable(doc, headers, data, footValues, style, 40)
+    addActivityTimeline(doc, translations, d.summary, weekDays)
+  })
+}
+
+// Draws one bar per day (00h-24h) below the table: grey when stopped, green while driving.
+function addActivityTimeline (doc, translations, summary, weekDays) {
+  if (!summary.some(s => s.activity)) {
+    return
+  }
+  const pageWidth = doc.internal.pageSize.getWidth()
+  const pageHeight = doc.internal.pageSize.getHeight()
+  const labelX = 14
+  const left = 50
+  const width = pageWidth - 14 - left
+  const rowHeight = 4
+  const rowGap = 2
+  const bottom = pageHeight - 15
+
+  const drawAxis = (y) => {
+    doc.setFontSize(7)
+    doc.setTextColor(80, 80, 80)
+    for (let h = 0; h <= 24; h += 2) {
+      doc.text(String(h).padStart(2, '0') + 'h', left + h / 24 * width, y, { align: 'center' })
+    }
+    return y + 2
+  }
+
+  let y = doc.lastAutoTable.finalY + 10
+  if (y + 20 > bottom) {
+    doc.addPage()
+    y = 20
+  }
+  doc.setFillColor(103, 194, 58)
+  doc.rect(labelX, y - 2.5, 3, 3, 'F')
+  doc.setFontSize(8)
+  doc.setTextColor(0, 0, 0)
+  doc.text(translations.vehicleTable.moving_vehicles, labelX + 4, y)
+  doc.setFillColor(220, 220, 220)
+  doc.rect(labelX + 30, y - 2.5, 3, 3, 'F')
+  doc.text(translations.vehicleTable.stopped_vehicles, labelX + 34, y)
+  y = drawAxis(y + 6)
+
+  summary.forEach(s => {
+    if (y + rowHeight > bottom) {
+      doc.addPage()
+      y = drawAxis(20)
+    }
+    doc.setFontSize(7)
+    doc.setTextColor(0, 0, 0)
+    doc.text(new Date(s.date).toLocaleDateString() + ' - ' + weekDays[new Date(s.date).getDay()], labelX, y + rowHeight - 0.8)
+    doc.setFillColor(220, 220, 220)
+    doc.rect(left, y, width, rowHeight, 'F')
+    doc.setFillColor(103, 194, 58)
+    for (const a of (s.activity || [])) {
+      doc.rect(left + a.start / 24 * width, y, Math.max((a.end - a.start) / 24 * width, 0.3), rowHeight, 'F')
+    }
+    y += rowHeight + rowGap
   })
 }
 

package/src/partnerReports/performance-report.js

@@ -209,7 +209,7 @@ function calculateRPMSections (route, min, max) {
   let newSection = true
   route.forEach(p => {
     const rpm = p.attributes.rpm
-    if ((!min || rpm > min) && (!max || rpm < max)) {
+    if ((min === undefined || rpm > min) && (!max || rpm < max)) {
       if (newSection) {
         sections.push([p])
       } else {

package/src/rpm-report.js

@@ -10,7 +10,7 @@ const automaticReports = require('./automaticReports')
 const { calculateRPMSections } = require('./partnerReports/performance-report')
 
 const fileName = 'RPMReport'
-const defaultThreshold = 2500
+const defaultThreshold = 0
 
 async function createRPMReport (from, to, userData, traccarInstance) {
   console.log('Create RPMReport', from, to)
@@ -23,6 +23,7 @@ async function createRPMReport (from, to, userData, traccarInstance) {
   }
 
   const dates = getDates(from, to, userData.user.attributes.timezone || getUserPartner(userData.user).timezone)
+  const threshold = getThreshold(userData)
 
   let deviceCount = 0
   const sliced = automaticReports.sliceArray(allDevices, 20)
@@ -31,7 +32,7 @@ async function createRPMReport (from, to, userData, traccarInstance) {
     for (const d of devices) {
       const deviceRoute = route.filter(p => p.deviceId === d.id && p.attributes.rpm !== undefined)
       if (deviceRoute.length) {
-        allData.devices.push(processDevice(d, deviceRoute, dates))
+        allData.devices.push(processDevice(d, deviceRoute, dates, threshold))
       }
     }
     deviceCount += devices.length
@@ -40,8 +41,10 @@ async function createRPMReport (from, to, userData, traccarInstance) {
   return [allData]
 }
 
-function getThreshold (device) {
-  return Number(device.attributes.highRPM) || defaultThreshold
+// the report's own threshold (userData.rpmThreshold), independent of the device highRPM attribute used by other reports
+function getThreshold (userData) {
+  const threshold = Number(userData.rpmThreshold)
+  return userData.rpmThreshold !== undefined && userData.rpmThreshold !== '' && Number.isFinite(threshold) ? threshold : defaultThreshold
 }
 
 function dayKey (date) {
@@ -49,8 +52,7 @@ function dayKey (date) {
 }
 
 // time between consecutive positions that are both above the threshold, attributed to the day of the first one
-function processDevice (device, deviceRoute, dates) {
-  const threshold = getThreshold(device)
+function processDevice (device, deviceRoute, dates, threshold = defaultThreshold) {
   const days = dates.map(date => ({ date, time: 0 }))
   calculateRPMSections(deviceRoute, threshold).forEach(section => {
     for (let i = 1; i < section.length; i++) {

package/src/tests/rpm.test.js

@@ -17,17 +17,28 @@ describe('RPM_Report', function () {
     position(new Date(2026, 9, 2, 9, 0), 2600),
     position(new Date(2026, 9, 2, 9, 0, 30), 2600)
   ]
-  it('sums time above the default threshold per day', () => {
-    const result = processDevice({ id: 1, attributes: {} }, route, dates)
+  it('sums time above the threshold per day', () => {
+    const result = processDevice({ id: 1, attributes: {} }, route, dates, 2500)
     assert.equal(result.threshold, 2500)
     assert.equal(result.days[0].time, 3 * 60 * 1000)
     assert.equal(result.days[1].time, 30 * 1000)
     assert.equal(result.time, 3 * 60 * 1000 + 30 * 1000)
   })
-  it('uses the device highRPM attribute as threshold', () => {
-    const result = processDevice({ id: 1, attributes: { highRPM: 2650 } }, route, dates)
-    assert.equal(result.threshold, 2650)
-    assert.equal(result.days[0].time, 2 * 60 * 1000)
-    assert.equal(result.days[1].time, 0)
+  it('ignores the device highRPM attribute', () => {
+    const result = processDevice({ id: 1, attributes: { highRPM: 2650 } }, route, dates, 2500)
+    assert.equal(result.threshold, 2500)
+    assert.equal(result.days[0].time, 3 * 60 * 1000)
+  })
+  it('defaults to rpm > 0 (engine running time)', () => {
+    const idleRoute = [
+      position(new Date(2026, 9, 1, 8, 0), 0),
+      position(new Date(2026, 9, 1, 8, 10), 800),
+      position(new Date(2026, 9, 1, 8, 20), 2000),
+      position(new Date(2026, 9, 1, 8, 30), 0),
+      position(new Date(2026, 9, 1, 8, 40), 0)
+    ]
+    const result = processDevice({ id: 1, attributes: {} }, idleRoute, dates)
+    assert.equal(result.threshold, 0)
+    assert.equal(result.days[0].time, 10 * 60 * 1000)
   })
 })