fleetmap-reports 1.0.982 → 1.0.984

package/package.json

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

package/src/index.js

@@ -19,7 +19,6 @@ function Reports (config, axios, cookieJar) {
       drivers: await this.traccar.drivers.driversGet().then(d => d.data),
       geofences: await this.traccar.geofences.geofencesGet().then(d => d.data),
       byGroup: false,
-      allWeek: true,
       dayHours: { startTime: '00:00', endTime: '23:59' }
     }
   }
@@ -184,25 +183,5 @@ function Reports (config, axios, cookieJar) {
   this.stopReportToExcel = (userData, reportData) => {
     return require('./stop-report').exportStopReportToExcel(userData, reportData)
   }
-
-  this.performanceReport = (from, to, userData) => {
-    return require('./partnerReports/performance-report').createPerformanceReport(from, to, userData, this.traccar)
-  }
-  this.performanceReportToPDF = (userData, reportData) => {
-    return require('./partnerReports/performance-report').exportPerformanceReportToPDF(userData, reportData)
-  }
-  this.performanceReportToExcel = (userData, reportData) => {
-    return require('./partnerReports/performance-report').exportPerformanceReportToExcel(userData, reportData)
-  }
-
-  this.dailyUseReport = (from, to, userData) => {
-    return require('./partnerReports/dailyuse-report').createDailyUseReport(from, to, userData, this.traccar)
-  }
-  this.dailyUseReportToPDF = (userData, reportData) => {
-    return require('./partnerReports/dailyuse-report').exportDailyUseReportToPDF(userData, reportData)
-  }
-  this.dailyUseReportToExcel = (userData, reportData) => {
-    return require('./partnerReports/dailyuse-report').exportDailyUseReportToExcel(userData, reportData)
-  }
 }
 module.exports = Reports

package/src/kms-report.js

@@ -10,9 +10,8 @@ const traccar = require('./util/traccar')
 const { getDates, getTranslations, isClientSide, executeServerSide } = require('./util/utils')
 const drivers = require('./util/driver')
 const { isInsideTimetable, isPartialInsideTimetable, calculateTrip, getDataByDay, checkTripsKms, getKms } = require('./util/trips')
-const traccarHelper = require('./util/traccar')
 const { devicesToProcess } = require('./util/device')
-const { getDriverData } = require('./util/driver')
+const { getDriverData, reportByDriver } = require('./util/driver')
 const automaticReports = require('./automaticReports')
 const { getSummaryByDay } = require('./util/traccar')
 
@@ -56,12 +55,14 @@ async function createKmsReportByDevice (from, to, userData, traccarInstance) {
         dates.forEach(date => {
           const summaryByDay = summary.find(a => a.date === date).summary
           const summaryByDevice = summaryByDay.find(a => a.deviceId === device.id)
-          days.push({
-            date,
-            kms: summaryByDevice.distance,
-            startOdometer: summaryByDevice.startOdometer,
-            endOdometer: summaryByDevice.endOdometer
-          })
+          if (summaryByDevice) {
+            days.push({
+              date,
+              kms: summaryByDevice.distance,
+              startOdometer: summaryByDevice.startOdometer,
+              endOdometer: summaryByDevice.endOdometer
+            })
+          }
         })
         const daysWithOdometer = days.filter(a => a.startOdometer > 0)
         allData.devices.push({
@@ -100,16 +101,30 @@ async function createKmsReportByDevice (from, to, userData, traccarInstance) {
 
 async function createKmsReportByDriver (from, to, userData, traccarInstance) {
   const devices = await drivers.devicesByDriver(traccarInstance, from, to, userData.drivers, userData.devices)
-  console.log(devices.length)
 
-  if (!devices.length) {
-    // empty report
-    return { drivers: [] }
-  }
+  const results = await reportByDriver(devices, traccarInstance, from, to, userData, processDrivers)
 
-  const allInOne = await traccarHelper.getAllInOne(traccarInstance, from, to, devices, true, true, false, false)
+  const report = { drivers: [] }
+
+  results.drivers.forEach(result => {
+    const driver = report.drivers.find(d => d.driver.id === result.driver.id)
+    if (driver) {
+      if (userData.groupByDay) {
+        driver.days.forEach(day => {
+          const resultDay = result.days.find(d => d.date === day.date)
+          if (resultDay) {
+            day.kms = day.kms + resultDay.kms
+          }
+        })
+      } else {
+        driver.summary.distance = driver.summary.distance + result.summary.distance
+      }
+    } else {
+      report.drivers.push(result)
+    }
+  })
 
-  return { drivers: processDrivers(from, to, userData, allInOne) }
+  return report
 }
 
 async function createKmsReportByGroup (from, to, userData, traccarInstance) {

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

@@ -1,5 +1,8 @@
 const jsPDF = require('jspdf')
-const { convertMS, convertToLocaleString, convertToFeature, convertPositionToFeature, getTranslations, getLanguage } = require('./util/utils')
+const {
+  convertMS, convertToLocaleString, convertToFeature, convertPositionToFeature, getTranslations, getLanguage,
+  getCountry
+} = require('./util/utils')
 const { headerFromUser, AmiriRegular } = require('./util/pdfDocument')
 require('jspdf-autotable')
 const { getStyle } = require('./reportStyle')
@@ -15,7 +18,6 @@ const booleanPointInPolygon = require('@turf/boolean-point-in-polygon')
 const automaticReports = require('./automaticReports')
 const { default: axios } = require('axios')
 const { getDriverName, getDriverData } = require('./util/driver')
-const crg = require('country-reverse-geocoding').country_reverse_geocoding()
 
 const fileName = 'SpeedingReport'
 const eventTypes = ['deviceOverspeed']
@@ -299,11 +301,6 @@ async function getCustomSpeedLimitEvents (devices, routes, customSpeed) {
   return events
 }
 
-function getCountry (position) {
-  const country = crg.get_country(position.latitude, position.longitude)
-  return country && country.code
-}
-
 async function getRoadSpeedLimits (devices, routes, threshold, minimumMinutes = 0) {
   const position = routes.find(p => getCountry(p))
   const country = position && getCountry(position)

package/src/tests/speeding.test.js

@@ -1,5 +1,6 @@
 const { getReports } = require('./index')
 const assert = require('assert')
+const { getCountry } = require('../util/utils')
 
 async function getSpeedingReport (report, userData) {
   const data = await report.speedingReport(
@@ -61,4 +62,49 @@ describe('speeding tests', function () {
     assert.equal(totalDistance, 46.64576895855739) // Total Kms
     assert.equal(totalEventTime, 1402000) // Total Duration
   }, 999990000)
+
+  // eslint-disable-next-line no-undef
+  it('detects brazil', () => {
+    const p = {
+      id: 24088423790,
+      attributes: {
+        door: false,
+        hours: 2520745000,
+        motion: false,
+        distance: 0,
+        odometer: 5973617,
+        sat: 17,
+        battery: 4.03,
+        hdop: 0.7,
+        idleTime: 0,
+        output: 0,
+        input: 0,
+        driverUniqueId: '',
+        power: 12.61,
+        event: 0,
+        totalDistance: 31419705.27,
+        ignition: false,
+        adc3: 0,
+        adc2: 0,
+        status: 61,
+        tripTime: 0
+      },
+      deviceId: 28097,
+      type: null,
+      protocol: 'startek',
+      serverTime: '2024-01-20T03:01:50.000+00:00',
+      deviceTime: '2024-01-20T03:01:50.000+00:00',
+      fixTime: '2024-01-20T03:01:50.000+00:00',
+      outdated: false,
+      valid: true,
+      latitude: -22.295906,
+      longitude: -48.576135,
+      altitude: 579,
+      speed: 0,
+      course: 80,
+      address: 'Avenida Deputado Zien Nassif, 938, Vila Industrial, Jaú - SP, 17204-212, Brazil',
+      accuracy: 0
+    }
+    assert.equal('BRA', getCountry(p))
+  })
 })

package/src/tests/zones.test.js

@@ -27,17 +27,6 @@ describe('zones', function () {
     console.log('result', result)
   }, 4000000)
 
-  it('trips between geofences', async () => {
-    const report = await getReports(process.env.USER_MOVIFLOTTE, process.env.PASS_MOVIFLOTTE)
-    const userData = await report.getUserData()
-    userData.tripsBetweenZones = true
-    const result = await report.zoneReport(
-        new Date(Date.UTC(2024, 0, 8, 0, 0, 0, 0)),
-        new Date(Date.UTC(2024, 0, 8, 23, 59, 59, 0)),
-        userData)
-    console.log('result', result)
-  }, 4000000)
-
   // eslint-disable-next-line no-undef
   it('works with casais', async () => {
     const report = await getReports(process.env.USER_CASAIS, process.env.PASS_CASAIS)

package/src/util/utils.js

@@ -298,3 +298,14 @@ exports.getLogoUrl = getLogoUrl
 exports.convertFromUTCDate = (value, user) => {
   return convertFromUTC(value, user.attributes.timezone || getUserPartner(user).timezone)
 }
+
+const crg = require('country-reverse-geocoding').country_reverse_geocoding()
+
+exports.getCountry = (position) => {
+  const country = crg.get_country(position.latitude, position.longitude)
+  if (!country) {
+    const country = position && position.attributes.address && position.attributes.address.split(',').slice(-1)[0].trim()
+    return { Brazil: 'BRA' }[country]
+  }
+  return country && country.code
+}

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

@@ -1,11 +0,0 @@
-const traccarHelper = require('./util/traccar')
-const { devicesToProcess } = require('./util/device')
-
-async function createTemperatureReport (from, to, userData, traccar) {
-  const devices = devicesToProcess(userData)
-
-  const allInOne = await traccarHelper.getAllInOne(traccar, from, to, devices, true, false, false, false)
-  const routeData = allInOne.route
-
-
-}

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