fleetmap-reports 2.0.384 → 2.0.386

package/lang/enGB.js

@@ -195,6 +195,9 @@ module.exports = {
     titleStopReport: 'Stop Report',
     titleDriverRankingReport: 'Driver Ranking Report',
     titleSensorReport: 'Sensor Report',
+    titleRPMReport: 'RPM Report',
+    rpmThreshold: 'RPM Threshold',
+    timeAboveRPM: 'Time above threshold',
     sensor: 'Sensor',
     status: 'Status',
     rank: 'Rank',

package/lang/esCL.js

@@ -185,6 +185,9 @@ module.exports = {
     titleStopReport: 'Informe de Paradas',
     titleDriverRankingReport: 'Informe de Ranking de Conductores',
     titleSensorReport: 'Informe de Sensores',
+    titleRPMReport: 'Informe de RPM',
+    rpmThreshold: 'Umbral de RPM',
+    timeAboveRPM: 'Tiempo sobre el umbral',
     sensor: 'Sensor',
     status: 'Estado',
     rank: 'Posición',

package/lang/frFR.json

@@ -196,6 +196,9 @@
     "titleDelayedStartReport": "Rapport de Departs Tardifs",
     "titleDriverRankingReport": "Rapport d'conducteur",
     "titleSensorReport": "Rapport de capteurs",
+    "titleRPMReport": "Rapport de RPM",
+    "rpmThreshold": "Seuil de RPM",
+    "timeAboveRPM": "Temps au-dessus du seuil",
     "sensor": "Capteur",
     "status": "État",
     "from": "Dans",

package/lang/ptBR.js

@@ -187,6 +187,9 @@ module.exports = {
     titleStopReport: 'Relatório de Paragens',
     titleDriverRankingReport: 'Relatório de Ranking de Motoristas',
     titleSensorReport: 'Relatório de Sensores',
+    titleRPMReport: 'Relatório de RPM',
+    rpmThreshold: 'Limite de RPM',
+    timeAboveRPM: 'Tempo acima do limite',
     sensor: 'Sensor',
     status: 'Estado',
     rank: 'Posição',

package/lang/ptPT.js

@@ -193,6 +193,9 @@ module.exports = {
     titleStopReport: 'Relatório de Paragens',
     titleDriverRankingReport: 'Relatório de Ranking de Condutores',
     titleSensorReport: 'Relatório de Sensores',
+    titleRPMReport: 'Relatório de RPM',
+    rpmThreshold: 'Limite de RPM',
+    timeAboveRPM: 'Tempo acima do limite',
     sensor: 'Sensor',
     status: 'Estado',
     rank: 'Posição',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fleetmap-reports",
-  "version": "2.0.384",
+  "version": "2.0.386",
   "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/index.js

@@ -240,5 +240,15 @@ function Reports (config, axios) {
   this.sensorReportToPDF = (userData, reportData) => {
     return require('./sensor-report').exportToPDF(userData, reportData)
   }
+
+  this.rpmReport = (from, to, userData) => {
+    return require('./rpm-report').createRPMReport(from, to, userData, this.traccar)
+  }
+  this.rpmReportToPDF = (userData, reportData) => {
+    return require('./rpm-report').exportRPMReportToPDF(userData, reportData)
+  }
+  this.rpmReportToExcel = (userData, reportData) => {
+    return require('./rpm-report').exportRPMReportToExcel(userData, reportData)
+  }
 }
 module.exports = Reports

package/src/rpm-report.js

@@ -0,0 +1,194 @@
+const jsPDF = require('jspdf')
+require('jspdf-autotable')
+const { getStyle } = require('./reportStyle')
+const { headerFromUser, addTable, pdfPageByDay } = require('./util/pdfDocument')
+const { getUserPartner } = require('fleetmap-partners')
+const traccar = require('./util/traccar')
+const { getDates, getTranslations, convertMS } = require('./util/utils')
+const { devicesToProcess } = require('./util/device')
+const automaticReports = require('./automaticReports')
+const { calculateRPMSections } = require('./partnerReports/performance-report')
+
+const fileName = 'RPMReport'
+const defaultThreshold = 2500
+
+async function createRPMReport (from, to, userData, traccarInstance) {
+  console.log('Create RPMReport', from, to)
+  const allDevices = devicesToProcess(userData)
+
+  const allData = {
+    devices: [],
+    from,
+    to
+  }
+
+  const dates = getDates(from, to, userData.user.attributes.timezone || getUserPartner(userData.user).timezone)
+
+  let deviceCount = 0
+  const sliced = automaticReports.sliceArray(allDevices, 20)
+  for (const devices of sliced) {
+    const { route } = await traccar.getAllInOne(traccarInstance, from, to, devices, true, false, false, false, deviceCount, allDevices.length, 10, 1)
+    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))
+      }
+    }
+    deviceCount += devices.length
+  }
+
+  return [allData]
+}
+
+function getThreshold (device) {
+  return Number(device.attributes.highRPM) || defaultThreshold
+}
+
+function dayKey (date) {
+  return date.getFullYear() + '-' + date.getMonth() + '-' + date.getDate()
+}
+
+// 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)
+  const days = dates.map(date => ({ date, time: 0 }))
+  calculateRPMSections(deviceRoute, threshold).forEach(section => {
+    for (let i = 1; i < section.length; i++) {
+      const start = new Date(section[i - 1].fixTime)
+      const duration = new Date(section[i].fixTime).getTime() - start.getTime()
+      const day = days.find(a => dayKey(a.date) === dayKey(start))
+      if (day) {
+        day.time += duration
+      }
+    }
+  })
+  return {
+    device,
+    threshold,
+    time: days.reduce((a, b) => a + b.time, 0),
+    days
+  }
+}
+
+async function exportRPMReportToPDF (userData, reportData) {
+  const translations = getTranslations(userData)
+  const weekDays = getWeekDays(translations)
+  const style = getStyle(getUserPartner(userData.user))
+
+  const orientation = userData.groupByDay ? 'p' : 'l'
+  // eslint-disable-next-line new-cap
+  const doc = new jsPDF.jsPDF(orientation)
+  await headerFromUser(doc, translations.report.titleRPMReport, userData.user, orientation)
+
+  if (userData.groupByDay) {
+    const headers = [translations.report.date, translations.report.timeAboveRPM]
+    reportData.devices.forEach((d, index) => {
+      pdfPageByDay(userData, d, index, doc, translations, reportData)
+      const data = d.days.map(day => [
+        new Date(day.date).toLocaleDateString() + ' - ' + weekDays[new Date(day.date).getDay()],
+        convertMS(day.time)
+      ])
+      const footValues = [translations.report.rpmThreshold + ': ' + d.threshold, convertMS(d.time)]
+      addTable(doc, headers, data, footValues, style, 40, { 1: { halign: 'right' } })
+    })
+  } else {
+    doc.setFontSize(11)
+    doc.text(new Date(reportData.from).toLocaleString() + ' - ' + new Date(reportData.to).toLocaleString(), 20, 33)
+    const headers = [
+      translations.report.vehicle,
+      translations.settings.vehicle_licenseplate,
+      translations.report.group,
+      translations.report.rpmThreshold,
+      translations.report.timeAboveRPM
+    ]
+    const data = reportData.devices.map(d => {
+      const group = userData.groups.find(g => d.device.groupId === g.id)
+      return [
+        d.device.name,
+        d.device.attributes.license_plate || '',
+        group ? group.name : '',
+        d.threshold,
+        convertMS(d.time)
+      ]
+    })
+    const footValues = [
+      'Total:' + reportData.devices.length,
+      '',
+      '',
+      '',
+      convertMS(reportData.devices.reduce((a, b) => a + b.time, 0))
+    ]
+    addTable(doc, headers, data, footValues, style, 35, { 3: { halign: 'right' }, 4: { halign: 'right' } })
+  }
+  return doc
+}
+
+function exportRPMReportToExcel (userData, reportData) {
+  const translations = getTranslations(userData)
+  const weekDays = getWeekDays(translations)
+
+  const settings = {
+    sheetName: translations.report.titleRPMReport.substring(0, 31),
+    fileName
+  }
+
+  const headers = [
+    { label: translations.report.vehicle, value: 'name' },
+    { label: translations.settings.vehicle_licenseplate, value: 'licenseplate' },
+    { label: translations.report.group, value: 'group' },
+    { label: translations.report.rpmThreshold, value: 'threshold' }
+  ]
+  if (userData.groupByDay) {
+    headers.push(
+      { label: translations.report.date, value: 'date' },
+      { label: translations.report.weekDay, value: 'weekday' })
+  }
+  headers.push({ label: translations.report.timeAboveRPM, value: 'time' })
+
+  const data = []
+  reportData.devices.forEach(d => {
+    const group = userData.groups.find(g => d.device.groupId === g.id)
+    const row = {
+      name: d.device.name,
+      licenseplate: d.device.attributes.license_plate,
+      group: group ? group.name : '',
+      threshold: d.threshold
+    }
+    if (userData.groupByDay) {
+      data.push(...d.days.map(day => ({
+        ...row,
+        date: new Date(day.date).toLocaleDateString(),
+        weekday: weekDays[new Date(day.date).getDay()],
+        time: convertMS(day.time)
+      })))
+    } else {
+      data.push({ ...row, time: convertMS(d.time) })
+    }
+  })
+
+  return {
+    headers,
+    data,
+    settings
+  }
+}
+
+function getWeekDays (translations) {
+  return [
+    translations.report.sunday,
+    translations.report.monday,
+    translations.report.tuesday,
+    translations.report.wednesday,
+    translations.report.thursday,
+    translations.report.friday,
+    translations.report.saturday
+  ]
+}
+
+exports.processDevice = processDevice
+exports.createRPMReport = createRPMReport
+exports.exportRPMReportToPDF = exportRPMReportToPDF
+exports.exportRPMReportToExcel = exportRPMReportToExcel
+exports.create = createRPMReport
+exports.exportToPDF = exportRPMReportToPDF
+exports.exportToExcel = exportRPMReportToExcel

package/src/tests/rpm.test.js

@@ -0,0 +1,33 @@
+/* eslint-disable no-undef */
+const assert = require('assert')
+const { processDevice } = require('../rpm-report')
+
+function position (fixTime, rpm) {
+  return { fixTime: new Date(fixTime).toISOString(), attributes: { rpm } }
+}
+
+describe('RPM_Report', function () {
+  const dates = [new Date(2026, 9, 1, 12), new Date(2026, 9, 2, 12)]
+  const route = [
+    position(new Date(2026, 9, 1, 10, 0), 2000),
+    position(new Date(2026, 9, 1, 10, 1), 2600),
+    position(new Date(2026, 9, 1, 10, 2), 2700),
+    position(new Date(2026, 9, 1, 10, 4), 3000),
+    position(new Date(2026, 9, 1, 10, 5), 1500),
+    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)
+    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)
+  })
+})