fleetmap-reports 2.0.95 → 2.0.97

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fleetmap-reports",
-  "version": "2.0.95",
+  "version": "2.0.97",
   "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/partnerReports/performance-report.js

@@ -9,6 +9,63 @@ const { getStyle } = require('../reportStyle')
 const { getUserPartner } = require('fleetmap-partners')
 const { calculateConsumption } = require('../util/fuel')
 
+async function createPerformanceReportSingle (from, to, userData, traccar) {
+  const reportData = []
+
+  const allInOne = await traccarHelper.getAllInOne(traccar, from, to, userData.devices.slice(0, 1), true, true, true, true)
+
+  const device = userData.devices[0]
+
+  const {
+    drivingTime, idleTime, cruiseControlTime, economicTime, highEngineRPM, hardBraking, hardAcceleration, hardCornering,
+    drivingConsumption, idleConsumption, cruiseControlConsumption, economicConsumption, drivingDistance, cruiseControlDistance,
+    economicDistance
+  } = getDeviceData(allInOne, device)
+
+  const totalTime = drivingTime + idleTime
+  const totalConsumption = drivingConsumption + idleConsumption
+
+  const totalIndicator = (drivingDistance > 0 ? totalConsumption * 100 / drivingDistance : 0).toFixed(1) + ' L/100'
+  const drivingIndicator = (drivingDistance > 0 ? drivingConsumption * 100 / drivingDistance : 0).toFixed(1) + ' L/100'
+  const idleIndicator = (totalConsumption > 0 ? idleConsumption * 100 / totalConsumption : 0).toFixed(1) + ' %'
+  const economicIndicator = (totalTime > 0 ? economicTime * 100 / totalTime : 0).toFixed(1) + ' %'
+  const cruiseControlIndicator = (totalTime > 0 ? cruiseControlTime * 100 / totalTime : 0).toFixed(1) + ' %'
+  const highEngineRPMIndicator = (totalTime > 0 ? highEngineRPM * 100 / totalTime : 0).toFixed(1) + ' %'
+  const hardBrakingIndicator = (drivingDistance > 0 ? hardBraking * 100 / drivingDistance : 0).toFixed(0) + ' Freinage/100 Km'
+  const hardAccelerationIndicator = (drivingDistance > 0 ? hardAcceleration * 100 / drivingDistance : 0).toFixed(0) + ' Accélération/100 Km'
+  const hardCorneringIndicator = (drivingDistance > 0 ? hardCornering * 100 / drivingDistance : 0).toFixed(0) + ' Virages/100 Km'
+
+  const drivingUse = Math.round(totalTime > 0 ? drivingTime * 100 / totalTime : 0)
+  const idleUse = Math.round(totalTime > 0 ? idleTime * 100 / totalTime : 0)
+
+  const engineEconomicRPM = Math.round(totalTime > 0 ? economicTime * 100 / totalTime : 0)
+  const engineHighRPM = Math.round(totalTime > 0 ? highEngineRPM * 100 / totalTime : 0)
+  const engineOtherRPM = 100 - (engineEconomicRPM + engineHighRPM)
+
+  const cruiseControlOn = Math.round(totalTime > 0 ? cruiseControlTime * 100 / totalTime : 0)
+  const cruiseControlOff = 100 - cruiseControlOn
+
+  const totalData = getRowData(1, device, 'Totale', totalTime, totalConsumption, drivingDistance, totalIndicator, 0, 0, 0)
+  const drivingData = getRowData(2, device, 'Conduite', drivingTime, drivingConsumption, drivingDistance, drivingIndicator, drivingUse, engineOtherRPM, cruiseControlOff)
+  const idleData = getRowData(3, device, 'Ralenti', idleTime, idleConsumption, '', idleIndicator, idleUse, 0, 0)
+  const economicData = getRowData(4, device, 'Économique', economicTime, economicConsumption, economicDistance, economicIndicator, 0, engineEconomicRPM, 0)
+  const cruiseControlData = getRowData(5, device, 'Cruise Control', cruiseControlTime, cruiseControlConsumption, cruiseControlDistance, cruiseControlIndicator, 0, 0, cruiseControlOn)
+  const highEngineRPMData = getRowData(6, device, 'Tour moteur élevé', highEngineRPM, '', '', highEngineRPMIndicator, 0, engineHighRPM, 0)
+  const hardBrakingData = getRowData(7, device, 'Freinage brusque', hardBraking, '', '', hardBrakingIndicator, 0, 0, 0)
+  const hardAccelerationData = getRowData(8, device, 'Accéleration brusque', hardAcceleration, '', '', hardAccelerationIndicator, 0, 0, 0)
+  const hardCorneringData = getRowData(9, device, 'Virages brusque', hardCornering, '', '', hardCorneringIndicator, 0, 0, 0)
+
+  reportData.push(totalData)
+  reportData.push(drivingData)
+  reportData.push(idleData)
+  reportData.push(economicData)
+  reportData.push(cruiseControlData)
+  reportData.push(highEngineRPMData)
+  reportData.push(hardBrakingData)
+  reportData.push(hardAccelerationData)
+  reportData.push(hardCorneringData)
+  return reportData
+}
 async function createPerformanceReport (from, to, userData, traccar) {
   const reportData = []
 
@@ -28,59 +85,6 @@ async function createPerformanceReport (from, to, userData, traccar) {
 
       deviceCount = deviceCount + slice.length
     }
-  } else {
-    const allInOne = await traccarHelper.getAllInOne(traccar, from, to, userData.devices, true, true, true, true)
-
-    const device = userData.devices[0]
-
-    const {
-      drivingTime, idleTime, cruiseControlTime, economicTime, highEngineRPM, hardBraking, hardAcceleration, hardCornering,
-      drivingConsumption, idleConsumption, cruiseControlConsumption, economicConsumption, drivingDistance, cruiseControlDistance,
-      economicDistance
-    } = getDeviceData(allInOne, device)
-
-    const totalTime = drivingTime + idleTime
-    const totalConsumption = drivingConsumption + idleConsumption
-
-    const totalIndicator = (drivingDistance > 0 ? totalConsumption * 100 / drivingDistance : 0).toFixed(1) + ' L/100'
-    const drivingIndicator = (drivingDistance > 0 ? drivingConsumption * 100 / drivingDistance : 0).toFixed(1) + ' L/100'
-    const idleIndicator = (totalConsumption > 0 ? idleConsumption * 100 / totalConsumption : 0).toFixed(1) + ' %'
-    const economicIndicator = (totalTime > 0 ? economicTime * 100 / totalTime : 0).toFixed(1) + ' %'
-    const cruiseControlIndicator = (totalTime > 0 ? cruiseControlTime * 100 / totalTime : 0).toFixed(1) + ' %'
-    const highEngineRPMIndicator = (totalTime > 0 ? highEngineRPM * 100 / totalTime : 0).toFixed(1) + ' %'
-    const hardBrakingIndicator = (drivingDistance > 0 ? hardBraking * 100 / drivingDistance : 0).toFixed(0) + ' Freinage/100 Km'
-    const hardAccelerationIndicator = (drivingDistance > 0 ? hardAcceleration * 100 / drivingDistance : 0).toFixed(0) + ' Accélération/100 Km'
-    const hardCorneringIndicator = (drivingDistance > 0 ? hardCornering * 100 / drivingDistance : 0).toFixed(0) + ' Virages/100 Km'
-
-    const drivingUse = Math.round(totalTime > 0 ? drivingTime * 100 / totalTime : 0)
-    const idleUse = Math.round(totalTime > 0 ? idleTime * 100 / totalTime : 0)
-
-    const engineEconomicRPM = Math.round(totalTime > 0 ? economicTime * 100 / totalTime : 0)
-    const engineHighRPM = Math.round(totalTime > 0 ? highEngineRPM * 100 / totalTime : 0)
-    const engineOtherRPM = 100 - (engineEconomicRPM + engineHighRPM)
-
-    const cruiseControlOn = Math.round(totalTime > 0 ? cruiseControlTime * 100 / totalTime : 0)
-    const cruiseControlOff = 100 - cruiseControlOn
-
-    const totalData = getRowData(1, device, 'Totale', totalTime, totalConsumption, drivingDistance, totalIndicator, 0, 0, 0)
-    const drivingData = getRowData(2, device, 'Conduite', drivingTime, drivingConsumption, drivingDistance, drivingIndicator, drivingUse, engineOtherRPM, cruiseControlOff)
-    const idleData = getRowData(3, device, 'Ralenti', idleTime, idleConsumption, '', idleIndicator, idleUse, 0, 0)
-    const economicData = getRowData(4, device, 'Économique', economicTime, economicConsumption, economicDistance, economicIndicator, 0, engineEconomicRPM, 0)
-    const cruiseControlData = getRowData(5, device, 'Cruise Control', cruiseControlTime, cruiseControlConsumption, cruiseControlDistance, cruiseControlIndicator, 0, 0, cruiseControlOn)
-    const highEngineRPMData = getRowData(6, device, 'Tour moteur élevé', highEngineRPM, '', '', highEngineRPMIndicator, 0, engineHighRPM, 0)
-    const hardBrakingData = getRowData(7, device, 'Freinage brusque', hardBraking, '', '', hardBrakingIndicator, 0, 0, 0)
-    const hardAccelerationData = getRowData(8, device, 'Accéleration brusque', hardAcceleration, '', '', hardAccelerationIndicator, 0, 0, 0)
-    const hardCorneringData = getRowData(9, device, 'Virages brusque', hardCornering, '', '', hardCorneringIndicator, 0, 0, 0)
-
-    reportData.push(totalData)
-    reportData.push(drivingData)
-    reportData.push(idleData)
-    reportData.push(economicData)
-    reportData.push(cruiseControlData)
-    reportData.push(highEngineRPMData)
-    reportData.push(hardBrakingData)
-    reportData.push(hardAccelerationData)
-    reportData.push(hardCorneringData)
   }
   return reportData
 }
@@ -100,7 +104,7 @@ function getDeviceData (allInOne, d) {
     const canDriverStyle = getCanDriverStyleMessages(deviceRoute).map(m => parseCanDriverStyleMessage(m.xpertString || m)).sort((a, b) => a.date.localeCompare(b.date))
 
     const drivingTime = endTripData.length > 1 ? endTripData[endTripData.length - 1].totalTimeDriving - endTripData[0].totalTimeDriving : 0
-    const idleTime = endTripData.length > 1 ? endTripData[endTripData.length - 1].totalTimeInIdle - endTripData[0].totalTimeInIdle : 0
+    const idleTime = endTripData.length > 1 ? (endTripData[endTripData.length - 1].totalTimeInIdle || 0) - (endTripData[0].totalTimeInIdle || 0) : 0
     const cruiseControlTime = endTripData.length > 1 ? endTripData[endTripData.length - 1].totalTimeWithCruiseControl - endTripData[0].totalTimeWithCruiseControl : 0
     const economicTime = canDriverStyle.length > 1 ? canDriverStyle[canDriverStyle.length - 1].totalTimeInEcoRange - canDriverStyle[0].totalTimeInEcoRange : 0
     const highEngineRPM = canDriverStyle.length > 1 ? canDriverStyle[canDriverStyle.length - 1].totalTimeWithHighRpmAndTorque - canDriverStyle[0].totalTimeWithHighRpmAndTorque : 0
@@ -348,5 +352,6 @@ function exportPerformanceReportToExcel (userData, reportData) {
 }
 
 exports.createPerformanceReport = createPerformanceReport
+exports.createPerformanceReportSingle = createPerformanceReportSingle
 exports.exportPerformanceReportToPDF = exportPerformanceReportToPDF
 exports.exportPerformanceReportToExcel = exportPerformanceReportToExcel

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

@@ -1,69 +0,0 @@
-const automaticReports = require('../automaticReports')
-const traccarHelper = require('../util/traccar')
-const { getDates, getTranslations } = require('../util/utils')
-const { getUserPartner } = require('fleetmap-partners')
-const { getDataByDay } = require('../util/trips')
-
-async function createDelayedStartReport (from, to, userData, traccar) {
-  const reportData = []
-
-  const devices = userData.devices
-
-  const sliced = automaticReports.sliceArray(devices, 5)
-  let deviceCount = 0
-  for (const slice of sliced) {
-    const allInOne = await traccarHelper.getAllInOne(traccar, from, to, slice, false, true, true, false, deviceCount, devices.length)
-
-    for (const d of slice) {
-      const deviceData = await processDeviceData(from, to, allInOne, d, userData, traccar)
-      reportData.push(deviceData)
-    }
-
-    deviceCount = deviceCount + slice.length
-  }
-
-  return reportData
-}
-
-async function processDeviceData (from, to, allInOne, d, userData, traccar) {
-  const group = userData.groups.find(g => g.id === d.groupId)
-  const trips = allInOne.trips.filter(t => t.deviceId === d.id)
-  const translations = getTranslations(userData)
-
-  const weekDays = [
-    translations.report.sunday,
-    translations.report.monday,
-    translations.report.tuesday,
-    translations.report.wednesday,
-    translations.report.thursday,
-    translations.report.friday,
-    translations.report.saturday
-  ]
-
-  const dates = getDates(from, to, userData.user.attributes.timezone || getUserPartner(userData.user).timezone)
-
-  const deviceData = {
-
-  }
-
-  for (const date of dates) {
-    const { tripsByDay } = await getDataByDay(d, date, { trips }, userData, traccar)
-
-    if (tripsByDay.length > 0) {
-      const startTime = tripsByDay[0].startTime
-      const stopTime = tripsByDay[tripsByDay.length].endTime
-
-      const deviceDayData = {
-        device: d.name,
-        licensePlate: d.attributes.license_plate,
-        group: group ? group.name : '',
-        driver: '',
-        weekDay: weekDays[new Date(date).getDay()],
-        startDate: '',
-        startTime: '',
-        delayDescription: '',
-        stopTime: ''
-      }
-    }
-  }
-}

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