fleetmap-reports 2.0.164 → 2.0.166

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fleetmap-reports",
-  "version": "2.0.164",
+  "version": "2.0.166",
   "description": "",
   "main": "src/index.js",
   "scripts": {
@@ -18,7 +18,7 @@
     "country-reverse-geocoding": "^0.2.2",
     "docx": "^7.3.0",
     "file-saver": "^2.0.5",
-    "fleetmap-partners": "1.0.179",
+    "fleetmap-partners": "1.0.185",
     "json-as-xlsx": "2.5.6",
     "jspdf": "^2.5.1",
     "jspdf-autotable": "3.8.1",

package/src/partnerReports/dailyuse-report.js

@@ -1,11 +1,7 @@
 const traccarHelper = require('../util/traccar')
 const { isInsideTimetable } = require('../util/trips')
-const { convertFromUTCDate, getTranslations, convertMS, convertToLocaleTimeString, isClientSide } = require('../util/utils')
+const { convertFromUTCDate } = require('../util/utils')
 const automaticReports = require('../automaticReports')
-const jsPDF = require('jspdf')
-const { getStyle } = require('../reportStyle')
-const { getUserPartner } = require('fleetmap-partners')
-const { addTable, headerFromUser } = require('../util/pdfDocument')
 
 async function createDailyUseReport (from, to, userData, traccar) {
   const reportData = []
@@ -81,72 +77,4 @@ function processDeviceData (allInOne, d, userData) {
   }
 }
 
-async function exportDailyUseReportToPDF (userData, reportData) {
-  const translations = getTranslations(userData)
-  const timezone = userData.user.attributes.timezone
-  const lang = userData.user.attributes.lang || (isClientSide() && navigator.language)
-
-  const headers = [
-    translations.report.vehicle,
-    'Immatriculation',
-    'Groupe',
-    'Matin départ',
-    'Matin arrêt',
-    'Matin temps',
-    'Déjeuner',
-    'Après-midi départ',
-    'Après-midi arrêt',
-    'Après-midi temps',
-    'Total temps',
-    'Total conduit',
-    'Total arrêts',
-    'Total kms'
-  ]
-
-  const data = []
-  reportData.forEach(d => {
-    const row = [
-      d.device,
-      d.licensePlate,
-      d.group,
-      convertToLocaleTimeString(d.morningStart, lang, timezone, userData.user),
-      convertToLocaleTimeString(d.morningEnd, lang, timezone, userData.user),
-      convertMS(d.morningTime),
-      convertMS(d.lunch),
-      convertToLocaleTimeString(d.afternoonStart, lang, timezone, userData.user),
-      convertToLocaleTimeString(d.afternoonEnd, lang, timezone, userData.user),
-      convertMS(d.afternoonTime),
-      convertMS(d.totalTime),
-      convertMS(d.totalDrivingTime),
-      d.totalStops,
-      (d.totalDistance / 100).toFixed(1)
-    ]
-    data.push(row)
-  })
-
-  const doc = new jsPDF.jsPDF('l')
-  await headerFromUser(doc, 'Rapport de Performance', userData.user)
-  const style = getStyle(getUserPartner(userData.user))
-
-  const footValues = []
-
-  doc.setFontSize(11)
-  doc.text(new Date(userData.from).toLocaleString() + ' - ' + new Date(userData.to).toLocaleString(), 20, 33)
-
-  style.headerFontSize = 8
-  style.bodyFontSize = 7
-  const columnStyles = {}
-  for (let i = 3; i < 14; i++) {
-    columnStyles[i] = { halign: 'right' }
-  }
-  addTable(doc, headers, data, footValues, style, 40, columnStyles)
-  return doc
-}
-
-function exportDailyUseReportToExcel (userData, reportData) {
-
-}
-
 exports.createDailyUseReport = createDailyUseReport
-exports.exportDailyUseReportToPDF = exportDailyUseReportToPDF
-exports.exportDailyUseReportToExcel = exportDailyUseReportToExcel

package/src/partnerReports/driverranking-report.js

@@ -10,6 +10,7 @@ const { getUserPartner } = require('fleetmap-partners')
 const { getOverspeedEvents } = require('../speeding-report')
 const { calculateConsumption } = require('../util/fuel')
 const { getCanAvgConsumption } = require('../fuel-consumption-report')
+const automaticReports = require('../automaticReports')
 
 const distanceCoefficient = 0.5
 const consumptionCoefficient = 0.7
@@ -28,7 +29,6 @@ async function create (from, to, userData, traccar) {
     drivers: []
   }
 
-  const drivers = userData.drivers
   const devices = userData.devices
   userData.geofences = []
   userData.roadSpeedLimits = true
@@ -37,77 +37,34 @@ async function create (from, to, userData, traccar) {
   const driversData = new Map()
   const overspeedEvents = await getOverspeedEvents(from, to, userData, devices, userData, traccar)
 
-  for (const device of devices) {
-    const allInOne = await traccarHelper.getAllInOne(traccar, from, to, [device], true, true, false, false, deviceCount, devices.length)
-    const deviceOverspeedEvents = overspeedEvents.find(e => e.device.id === device.id)
-    const { data } = await traccar.reports.reportsEventsGet(from, to, [device.id], null, ['alarm'])
-
-    for (const d of drivers) {
-      const { trips, route } = await getDriverData(d, allInOne, userData)
-      const positionsIds = route.map(p => p.id)
-      const events = data.filter(e => positionsIds.includes(e.positionId))
-      const driverOverSpeedEvents = deviceOverspeedEvents ? deviceOverspeedEvents.alerts.filter(e => positionsIds.includes(e.position.id)) : []
-      const spentFuel = calculateConsumption(device, { trips, route })
-
-      const geofenceAlarm = events.filter(e => e.attributes.alarm === 'la ceinture').length
-      const continuesDrivingAlarm = events.filter(e => e.attributes.alarm === 'Conduite continue').length
-      const reverseAlarm = events.filter(e => e.attributes.alarm === 'MARCHE ARIERRE').length
-      const otherAlarm = events.length - (geofenceAlarm + continuesDrivingAlarm + reverseAlarm)
-
-      let driverData = driversData.get(d.id)
-      if (!driverData) {
-        driverData = {
-          name: d.name,
-          distance: 0,
-          highEngineRPM: 0,
-          hardBraking: 0,
-          hardAcceleration: 0,
-          hardCornering: 0,
-          overspeed: 0,
-          spentFuel: 0,
-          geofenceAlarm: 0,
-          continuesDrivingAlarm: 0,
-          reverseAlarm: 0,
-          otherAlarm: 0
-        }
-        driversData.set(d.id, driverData)
-      }
+  const sliced = automaticReports.sliceArray(devices, 5)
 
-      let highEngineRPM = 0
-      let hardBraking = 0
-      let hardAcceleration = 0
-      let hardCornering = 0
-      if (route.find(p => p.attributes.rawXpert)) {
-        const xpertMessages = route.map(p => p.attributes.rawXpert).filter(a => a)
-        const canDriverStyle = getCanDriverStyleMessages(xpertMessages).map(m => parseCanDriverStyleMessage(m))
-        highEngineRPM = canDriverStyle.reduce((a, b) => a + b.totalTimeWithHighRpmAndTorque, 0)
-        hardBraking = canDriverStyle.reduce((a, b) => a + b.totalNumberOfHarshBrakes, 0)
-        hardAcceleration = canDriverStyle.reduce((a, b) => a + b.totalNumberOfHarshAccelerations, 0)
-      } else {
-        const highEngineRPMSections = calculateRPMSections(route, d.attributes.highRPM || 1500)
-        highEngineRPM = highEngineRPMSections.map(a => a.length > 1
-          ? a.map((p, index) => index === 0 ? 0 : new Date(p.fixTime).getTime() - new Date(a[index - 1].fixTime).getTime()).reduce((a, b) => a + b, 0)
-          : 0).reduce((a, b) => a + b, 0)
-
-        hardBraking = route.filter(p => p.attributes.alarm === 'hardBraking').length
-        hardAcceleration = route.filter(p => p.attributes.alarm === 'hardAcceleration').length
-        hardCornering = route.filter(p => p.attributes.alarm === 'hardCornering').length
-      }
+  for (const slice of sliced) {
+    const allInOne = await traccarHelper.getAllInOne(traccar, from, to, slice, true, true, false, false, deviceCount, devices.length)
+
+    const result = []
+    const requests = []
+    for (const _chunk of automaticReports.sliceArray(slice.map(d => d.id), 1)) {
+      requests.push(traccar.reports.reportsEventsGet(from, to, _chunk, null, ['alarm']))
+    }
 
-      driverData.distance = driverData.distance + trips.filter(t => t.distance > 0).reduce((a, b) => a + b.distance, 0)
-      driverData.highEngineRPM = driverData.highEngineRPM + highEngineRPM
-      driverData.hardBraking = driverData.hardBraking + hardBraking
-      driverData.hardAcceleration = driverData.hardAcceleration + hardAcceleration
-      driverData.hardCornering = driverData.hardCornering + hardCornering
-      driverData.overspeed = driverData.overspeed + driverOverSpeedEvents.length
-      driverData.spentFuel = driverData.spentFuel + spentFuel
-      driverData.geofenceAlarm = driverData.geofenceAlarm + geofenceAlarm
-      driverData.continuesDrivingAlarm = driverData.continuesDrivingAlarm + continuesDrivingAlarm
-      driverData.reverseAlarm = driverData.reverseAlarm + reverseAlarm
-      driverData.otherAlarm = driverData.otherAlarm + otherAlarm
+    try {
+      result.push(...(await Promise.all(requests)))
+    } catch (e) {
+      console.log(e)
     }
+    const alarmEvents = result.flatMap(d => d.data)
 
-    deviceCount++
+    for (const device of slice) {
+      const route = allInOne.route.filter(t => t.deviceId === device.id)
+      const trips = allInOne.trips.filter(t => t.deviceId === device.id)
+
+      const deviceOverspeedEvents = overspeedEvents.find(e => e.device.id === device.id)
+      const deviceAlarmEvents = alarmEvents.filter(e => e.deviceId === device.id)
+
+      await processDevice(driversData, device, userData, { route, trips }, deviceAlarmEvents, deviceOverspeedEvents)
+      deviceCount++
+    }
   }
 
   const allDriversData = (Array.from(driversData.values())).filter(d => d.distance > 0)
@@ -164,6 +121,73 @@ async function create (from, to, userData, traccar) {
   return reportData
 }
 
+async function processDevice (driversData, device, userData, allInOne, alarmEvents, overspeedEvents) {
+  for (const d of userData.drivers) {
+    const { trips, route } = await getDriverData(d, allInOne, userData)
+    const positionsIds = route.map(p => p.id)
+    const events = alarmEvents.filter(e => positionsIds.includes(e.positionId))
+    const driverOverSpeedEvents = overspeedEvents ? overspeedEvents.alerts.filter(e => positionsIds.includes(e.position.id)) : []
+    const spentFuel = calculateConsumption(device, { trips, route })
+
+    const geofenceAlarm = events.filter(e => e.attributes.alarm === 'la ceinture').length
+    const continuesDrivingAlarm = events.filter(e => e.attributes.alarm === 'Conduite continue').length
+    const reverseAlarm = events.filter(e => e.attributes.alarm === 'MARCHE ARIERRE').length
+    const otherAlarm = events.length - (geofenceAlarm + continuesDrivingAlarm + reverseAlarm)
+
+    let driverData = driversData.get(d.id)
+    if (!driverData) {
+      driverData = {
+        name: d.name,
+        distance: 0,
+        highEngineRPM: 0,
+        hardBraking: 0,
+        hardAcceleration: 0,
+        hardCornering: 0,
+        overspeed: 0,
+        spentFuel: 0,
+        geofenceAlarm: 0,
+        continuesDrivingAlarm: 0,
+        reverseAlarm: 0,
+        otherAlarm: 0
+      }
+      driversData.set(d.id, driverData)
+    }
+
+    let highEngineRPM = 0
+    let hardBraking = 0
+    let hardAcceleration = 0
+    let hardCornering = 0
+    if (route.find(p => p.attributes.rawXpert)) {
+      const xpertMessages = route.map(p => p.attributes.rawXpert).filter(a => a)
+      const canDriverStyle = getCanDriverStyleMessages(xpertMessages).map(m => parseCanDriverStyleMessage(m))
+      highEngineRPM = canDriverStyle.reduce((a, b) => a + b.totalTimeWithHighRpmAndTorque, 0)
+      hardBraking = canDriverStyle.reduce((a, b) => a + b.totalNumberOfHarshBrakes, 0)
+      hardAcceleration = canDriverStyle.reduce((a, b) => a + b.totalNumberOfHarshAccelerations, 0)
+    } else {
+      const highEngineRPMSections = calculateRPMSections(route, d.attributes.highRPM || 1500)
+      highEngineRPM = highEngineRPMSections.map(a => a.length > 1
+        ? a.map((p, index) => index === 0 ? 0 : new Date(p.fixTime).getTime() - new Date(a[index - 1].fixTime).getTime()).reduce((a, b) => a + b, 0)
+        : 0).reduce((a, b) => a + b, 0)
+
+      hardBraking = route.filter(p => p.attributes.alarm === 'hardBraking').length
+      hardAcceleration = route.filter(p => p.attributes.alarm === 'hardAcceleration').length
+      hardCornering = route.filter(p => p.attributes.alarm === 'hardCornering').length
+    }
+
+    driverData.distance = driverData.distance + trips.filter(t => t.distance > 0).reduce((a, b) => a + b.distance, 0)
+    driverData.highEngineRPM = driverData.highEngineRPM + highEngineRPM
+    driverData.hardBraking = driverData.hardBraking + hardBraking
+    driverData.hardAcceleration = driverData.hardAcceleration + hardAcceleration
+    driverData.hardCornering = driverData.hardCornering + hardCornering
+    driverData.overspeed = driverData.overspeed + driverOverSpeedEvents.length
+    driverData.spentFuel = driverData.spentFuel + spentFuel
+    driverData.geofenceAlarm = driverData.geofenceAlarm + geofenceAlarm
+    driverData.continuesDrivingAlarm = driverData.continuesDrivingAlarm + continuesDrivingAlarm
+    driverData.reverseAlarm = driverData.reverseAlarm + reverseAlarm
+    driverData.otherAlarm = driverData.otherAlarm + otherAlarm
+  }
+}
+
 const fileName = 'DriverRankingReport'
 async function exportToExcel (userData, reportData) {
   console.log('Export to Excel')

package/src/tests/kms.test.js

@@ -65,11 +65,10 @@ describe('Kms_Reports', function () {
   it('KmsReport by timezone marrocos', async () => {
     const reports = await getReports(process.env.email, process.env.password)
     const userData = await reports.getUserData()
-    userData.groupByDay = true
     userData.devices = userData.devices.filter(d => d.id === 93497)
     const data = await reports.kmsReport(convertFromLocal(new Date(2024, 2, 18, 0, 0, 0), userData.user.attributes.timezone), convertFromLocal(new Date(2024, 2, 18, 23, 59, 59), userData.user.attributes.timezone),
       userData)
     const device = data[0].devices.find(d => d.device.id === 93497)
-    assert.equal(device.days.length, 1)
+    assert.equal(device, 1)
   }, 3000000)
 })

package/src/tests/zones.test.js

@@ -159,21 +159,4 @@ describe('zones', function () {
     console.log(first)
     assert.equal(first.days[6].distanceOut, 867.0554430738234)
   }, 4000000)
-
-  it('works with casais zones in columns 7', async () => {
-    const report = await getReports()
-    const userData = await report.getUserData()
-    userData.zonesByColumn = true
-    userData.devices = userData.devices.filter(d => d.id === 81166)
-    userData.geofences = userData.geofences.filter(g => g.name === 'baliza 1 - raio verde ' ||
-        g.name === 'baliza 2 - raio amarelo')
-    userData.onlyWithKmsOut = false
-    const result = await report.zoneReport(
-        new Date(Date.UTC(2023, 9, 9, 0, 0, 0, 0)),
-        new Date(Date.UTC(2023, 9, 31, 23, 59, 59, 0)),
-        userData)
-    const first = result[0].devices[0]
-    console.log(first)
-    assert.equal(first.days[17].distanceOut, 720.7985320478997)
-  }, 4000000)
 })

package/src/partnerReports/passenger-report.js

@@ -1,46 +0,0 @@
-async function createPassengerReport (from, to, userData, traccar) {
-  //const allDevices = await traccar.axios.get('/devices').then(d => d.data)
-  const devices = userData.devices
-  const drivers = await traccar.axios.get('/drivers').then(d => d.data)
-  const groups = await traccar.axios.get('/groups').then(d => d.data)
-  await Promise.all(groups.map(async g => {
-    const driversByGroup = await traccar.axios.get(`/drivers?groupId=${g.id}`).then(d => d.data)
-    driversByGroup.forEach(d => {
-      const _driver = drivers.find(a => a.id === d.id)
-      if (_driver) {
-        _driver.groupName = g.name
-      }
-    })
-  }))
-  const eventsUrl = `/reports/events?${devices.map(d => 'deviceId=' + d.id).join('&')
-}&from=${from.toISOString()
-}&to=${to.toISOString()
-}`
-  const positionsUrl = `/reports/route?${devices.map(d => 'deviceId=' + d.id).join('&')
-}&from=${from.toISOString()
-}&to=${to.toISOString()
-}`
-  const events = await traccar.axios.get(eventsUrl).then(d => d.data)
-  const positions = await traccar.axios.get(positionsUrl).then(d => d.data)
-  events.forEach(e => {
-    delete e.attributes
-    const driver = getDriver(e, positions, drivers)
-    const position = positions.find(p => p.id === e.positionId)
-    e.deviceName = devices.find(d => d.id === e.deviceId).name
-    e.groupName = driver.groupName || ''
-    e.fixtime = position && new Date(position.fixTime)
-    e.notes = driver && driver.attributes.notes
-    e.driverName = (driver && driver.name) || (position && position.attributes.driverUniqueId)
-  })
-  return events
-}
-
-function getDriver (event, positions, drivers) {
-  const p = positions.find(p => p.id === event.positionId)
-  if (!p) { return '' }
-  const d = drivers.find(d => d.uniqueId === p.attributes.driverUniqueId)
-  if (!d) { return '' }
-  return d
-}
-
-exports.createPassengerReport = createPassengerReport

package/src/tests/dailyuse.test.js

@@ -1,19 +0,0 @@
-const { getReports } = require('./index')
-const assert = require('assert')
-const { createDailyUseReport } = require('../partnerReports/dailyuse-report')
-
-describe('dailyuse', function () {
-  // eslint-disable-next-line no-undef
-  it('dailyuse report', async () => {
-    const report = await getReports()
-    const userData = await report.getUserData()
-
-    const data = await createDailyUseReport(
-      new Date(Date.UTC(2023, 10, 1, 0, 0, 0, 0)),
-      new Date(Date.UTC(2023, 10, 6, 23, 59, 59, 0)),
-      userData,
-      report.traccar)
-    console.log(data)
-    assert.equal(data[0].consumption, 19.799999999999997)
-  }, 8000000)
-})

package/src/tests/gpsjump.test.js

@@ -1,23 +0,0 @@
-const { getReports } = require('./index')
-const assert = require('assert')
-const { convertMS } = require('../util/utils')
-const { createGPSJumpReport } = require('../partnerReports/gpsjump-report')
-
-// eslint-disable-next-line no-undef
-describe('gpsjump', function () {
-  // eslint-disable-next-line no-undef
-  it('gpsjump report', async () => {
-    const report = await getReports()
-    const userData = await report.getUserData()
-    userData.devices = userData.devices.filter(d => d.id === 22326)
-    const data = await createGPSJumpReport(
-      new Date(Date.UTC(2023, 6, 1, 0, 0, 0, 0)),
-      new Date(Date.UTC(2023, 6, 17, 23, 59, 59, 0)),
-      userData,
-      report.traccar)
-    console.log(data)
-    assert.equal(data[0].consumption, 19.799999999999997)
-    assert.equal(data[0].distance, 326.7657)
-    assert.equal(convertMS(data[1].time * 1000, false), '08:19')
-  }, 8000000)
-})