fleetmap-reports 2.0.132 → 2.0.134

package/lang/frFR.json

@@ -193,6 +193,7 @@
     "titleMachinesReport": "Rapport machine",
     "titleStopReport": "Arrêter le rapport",
     "titleDelayedStartReport": "Rapport de Departs Tardifs",
+    "titleDriverRankingReport": "Rapport d'conducteur",
     "from": "Dans",
     "to": "Le",
     "headerStartAddress": "lieu de départ",

package/package.json

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

package/src/kms-report.js

@@ -9,7 +9,8 @@ const { getUserPartner } = require('fleetmap-partners')
 const traccar = require('./util/traccar')
 const { getDates, getTranslations, isClientSide, executeServerSide } = require('./util/utils')
 const driversUtil = require('./util/driver')
-const { isInsideTimetable, isPartialInsideTimetable, calculateTrip, getDataByDay, getKms,
+const {
+  isInsideTimetable, isPartialInsideTimetable, calculateTrip, getDataByDay, getKms,
   getTripTotalKms
 } = require('./util/trips')
 const { devicesToProcess } = require('./util/device')
@@ -121,7 +122,7 @@ async function createKmsReportByDriver (from, to, userData, traccarInstance) {
       report.drivers = drivers
     })
   } else {
-    const results = await reportByDriver(userData.devices, traccarInstance, from, to, userData, processDrivers, { route: !userData.allWeek, trips: true, stops: false, summary: false })
+    const results = await reportByDriver(userData.devices, traccarInstance, from, to, userData, processDrivers, { route: !userData.allWeek || userData.byDriver, trips: true, stops: true, summary: false })
 
     results.drivers.forEach(result => {
       const driver = report.drivers.find(d => d.driver.id === result.driver.id)
@@ -204,7 +205,13 @@ async function processDrivers (from, to, userData, data) {
         }
       } else {
         driverData.summary = {
-          distance: trips.reduce((a, b) => a + getTripTotalKms(b, getStop(b.endTime, data.stops), data.route), 0)
+          distance: trips.reduce((a, b) =>
+            a + getTripTotalKms(
+              b,
+              getStop(new Date(b.endTime), data.stops.filter(s => s.deviceId === b.deviceId)),
+              data.route.filter(r => r.deviceId === b.deviceId)
+            ), 0
+          ) * 1000
         }
       }
       driversResult.push(driverData)

package/src/partnerReports/dailyuse-report.js

@@ -1,7 +1,11 @@
 const traccarHelper = require('../util/traccar')
 const { isInsideTimetable } = require('../util/trips')
-const { convertFromUTCDate } = require('../util/utils')
+const { convertFromUTCDate, getTranslations, convertMS, convertToLocaleTimeString, isClientSide } = 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 = []
@@ -77,4 +81,72 @@ 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

@@ -1,6 +1,12 @@
 const traccarHelper = require('../util/traccar')
 const { getDriverData } = require('../util/driver')
 const { getCanDriverStyleMessages, parseCanDriverStyleMessage } = require('../util/xpert')
+const { calculateRPMSections } = require('./performance-report')
+const { getTranslations, isClientSide, convertToLocaleString } = require('../util/utils')
+const jsPDF = require('jspdf')
+const { headerFromUser, addTable } = require('../util/pdfDocument')
+const { getStyle } = require('../reportStyle')
+const { getUserPartner } = require('fleetmap-partners')
 
 async function create (from, to, userData, traccar) {
   const reportData = []
@@ -8,35 +14,160 @@ async function create (from, to, userData, traccar) {
   const drivers = userData.drivers
   const devices = userData.devices
 
-  const allInOne = await traccarHelper.getAllInOne(traccar, from, to, devices, true, true, false, false)
+  let deviceCount = 0
+  const driversData = new Map()
+  for (const device of devices) {
+    const allInOne = await traccarHelper.getAllInOne(traccar, from, to, [device], true, true, false, false, deviceCount, devices.length)
 
-  for (const d of drivers) {
-    const { trips, route } = await getDriverData(d, allInOne, userData)
-    const xpertMessages = route.map(p => p.attributes.rawXpert).filter(a => a)
-    const canDriverStyle = getCanDriverStyleMessages(xpertMessages).map(m => parseCanDriverStyleMessage(m.xpertString || m)).sort((a, b) => a.date.localeCompare(b.date))
+    for (const d of drivers) {
+      const { trips, route } = await getDriverData(d, allInOne, userData)
 
-    const highEngineRPM = canDriverStyle.length > 1 ? canDriverStyle[canDriverStyle.length - 1].totalTimeWithHighRpmAndTorque - canDriverStyle[0].totalTimeWithHighRpmAndTorque : 0
-    const hardBraking = canDriverStyle.length > 1 ? canDriverStyle[canDriverStyle.length - 1].totalNumberOfHarshBrakes - canDriverStyle[0].totalNumberOfHarshBrakes : 0
-    const hardAcceleration = canDriverStyle.length > 1 ? canDriverStyle[canDriverStyle.length - 1].totalNumberOfHarshAccelerations - canDriverStyle[0].totalNumberOfHarshAccelerations : 0
+      let driverData = driversData.get(d.id)
+      if (!driverData) {
+        driverData = {
+          name: d.name,
+          distance: 0,
+          highEngineRPM: 0,
+          hardBraking: 0,
+          hardAcceleration: 0,
+          hardCornering: 0
+        }
+        driversData.set(d.id, driverData)
+      }
 
-    reportData.drivers.push({
-      name: d.name,
-      distance: trips.filter(t => t.distance > 0).reduce((a, b) => a + b.distance, 0),
-      highEngineRPM,
-      hardBraking,
-      hardAcceleration
-    })
+      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.xpertString || m)).sort((a, b) => a.date.localeCompare(b.date))
+        highEngineRPM = canDriverStyle.length > 1 ? canDriverStyle[canDriverStyle.length - 1].totalTimeWithHighRpmAndTorque - canDriverStyle[0].totalTimeWithHighRpmAndTorque : 0
+        hardBraking = canDriverStyle.length > 1 ? canDriverStyle[canDriverStyle.length - 1].totalNumberOfHarshBrakes - canDriverStyle[0].totalNumberOfHarshBrakes : 0
+        hardAcceleration = canDriverStyle.length > 1 ? canDriverStyle[canDriverStyle.length - 1].totalNumberOfHarshAccelerations - canDriverStyle[0].totalNumberOfHarshAccelerations : 0
+      } else {
+        const highEngineRPMSections = calculateRPMSections(route, d.attributes.highRPM || 1300)
+        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
+    }
+
+    deviceCount++
   }
 
+  const allDriversData = (Array.from(driversData.values())).filter(d => d.distance > 0)
+  allDriversData.forEach(d => {
+    d.score = (d.highEngineRPM + d.hardBraking + d.hardAcceleration + d.hardCornering) / (d.distance / 1000)
+  })
+  allDriversData.sort((a, b) => (a.score > b.score) ? 1 : -1)
+
+  reportData.push(...allDriversData)
+
   return reportData
 }
 
+const fileName = 'DriverRankingReport'
 async function exportToExcel (userData, reportData) {
+  console.log('Export to Excel')
+
+  const translations = getTranslations(userData)
+
+  const reportDataRows = reportData
+
+  const settings = {
+    sheetName: translations.report.titleDriverRankingReport, // The name of the sheet
+    fileName // The name of the spreadsheet
+  }
+
+  const headers = [
+    { label: translations.report.driver, value: 'name' },
+    { label: translations.report.distance, value: 'distance' },
+    { label: translations.report.highEngineRPM, value: 'highEngineRPM' },
+    { label: translations.report.hardBraking, value: 'hardBraking' },
+    { label: translations.report.hardAcceleration, value: 'hardAcceleration' },
+    { label: translations.report.hardCornering, value: 'hardCornering' },
+    { label: translations.report.score, value: 'score' }
+  ]
 
+  let data = []
+  if (reportDataRows) {
+    reportDataRows.forEach(row => {
+      data = data.concat({
+        name: row.name,
+        distance: row.distance,
+        highEngineRPM: row.highEngineRPM,
+        hardBraking: row.hardBraking,
+        hardAcceleration: row.hardAcceleration,
+        hardCornering: row.hardCornering,
+        score: row.score
+      })
+    })
+    console.log(data)
+    return {
+      headers,
+      data,
+      settings
+    }
+  }
 }
 
 async function exportToPDF (userData, reportData) {
+  console.log('exportDelayedStartReportToPDF')
+
+  const timezone = userData.user.attributes.timezone
+  const translations = getTranslations(userData)
+  const lang = userData.user.attributes.lang || (isClientSide() && navigator.language)
+  const reportDataRows = reportData.devices
+
+  const headers = [
+    translations.report.driver,
+    translations.report.distance,
+    translations.report.highEngineRPM,
+    translations.report.hardBraking,
+    translations.report.hardAcceleration,
+    translations.report.hardCornering,
+    translations.report.score
+  ]
+
+  if (reportDataRows) {
+    // eslint-disable-next-line new-cap
+    const doc = new jsPDF.jsPDF('l')
+    await headerFromUser(doc, translations.report.titleDriverRankingReport, userData.user)
 
+    doc.setFontSize(13)
+    doc.text(convertToLocaleString(reportData.from, lang, timezone, userData.user) + ' - ' + convertToLocaleString(reportData.to, lang, timezone, userData.user), 20, 25)
+
+    const data = []
+    reportDataRows.forEach(function (row) {
+      const temp = [
+        row.name,
+        row.distance,
+        row.highEngineRPM,
+        row.hardBraking,
+        row.hardAcceleration,
+        row.hardCornering,
+        row.score
+      ]
+      data.push(temp)
+    })
+    const footValues = []
+
+    const style = getStyle(getUserPartner(userData.user))
+
+    addTable(doc, headers, data, footValues, style, 40)
+    return doc
+  }
 }
 
 exports.create = create

package/src/partnerReports/passenger-report.js

@@ -0,0 +1,46 @@
+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/partnerReports/performance-report.js

@@ -352,6 +352,7 @@ function exportPerformanceReportToExcel (userData, reportData) {
   }
 }
 
+exports.calculateRPMSections = calculateRPMSections
 exports.createPerformanceReport = createPerformanceReport
 exports.createPerformanceReportSingle = createPerformanceReportSingle
 exports.exportPerformanceReportToPDF = exportPerformanceReportToPDF

package/src/tests/dailyuse.test.js

@@ -0,0 +1,19 @@
+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

@@ -0,0 +1,23 @@
+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)
+})

package/src/tests/kms.test.js

@@ -65,10 +65,11 @@ 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, 1)
+    assert.equal(device.days.length, 1)
   }, 3000000)
 })

package/src/tests/zones.test.js

@@ -159,4 +159,21 @@ 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/util/driver.js

@@ -79,7 +79,7 @@ async function getDriverData (d, data, userData) {
   return {
     route,
     trips: filteredTrips,
-    events,
+    events
   }
 }