fleetmap-reports 2.0.317 → 2.0.319

package/package.json

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

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/speeding-report.js

@@ -566,12 +566,14 @@ function exportSpeedingReportToExcel (userData, reportData) {
   const translations = getTranslations(userData)
   const overspeedData = userData.byDriver ? reportData.drivers : reportData.devices
 
-  const settings = {
+
+    const settings = {
     sheetName: translations.report.titleSpeedingReport.substring(0, 31), // The name of the sheet
     fileName // The name of the spreadsheet
   }
   const headers = [
     userData.byDriver ? { label: translations.report.driver, value: 'driver' } : { label: translations.report.vehicle, value: 'name' },
+    userData.byDriver ? { label: translations.report.group, value: 'groupName' } : { label: translations.report.group, value: 'groupName' },
     { label: translations.report.date, value: 'fixTime' },
     { label: translations.report.address, value: 'address' },
     {
@@ -595,7 +597,9 @@ function exportSpeedingReportToExcel (userData, reportData) {
     overspeedData.forEach(d => {
       data = data.concat([{}])
       data = data.concat(d.alerts.map(a => {
+        const group = userData.groups.find(g => g.id === a.device.groupId)
         return {
+          groupName: group ? group.name : '',
           driver: userData.byDriver ? d.driver.name : a.driver,
           speed: Math.round(a.attributes.speed * 1.85200),
           distance: a.distance && new Intl.NumberFormat(lang, { maximumSignificantDigits: 1 }).format(a.distance),

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/util/route.js

@@ -51,7 +51,10 @@ function cleanPosition (p) {
     deviceId: p.deviceId,
     speed: p.speed,
     valid: p.valid,
-    attributes: { driverUniqueId: p.attributes.driverUniqueId }
+    attributes: {
+      ignition: p.attributes.ignition,
+      driverUniqueId: p.attributes.driverUniqueId
+    }
   }
 }
 

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)
-})