fleetmap-reports 2.0.46 → 2.0.47

package/package.json

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

package/src/activity-report.js

@@ -1,7 +1,7 @@
 const automaticReports = require('./automaticReports')
 const {
   convertMS, getDates, getTranslations, weekDaySelected, convertToLocaleString, isClientSide,
-  getLanguage
+  getLanguage, executeServerSide
 } = require('./util/utils')
 const jsPDF = require('jspdf')
 require('jspdf-autotable')
@@ -75,17 +75,6 @@ async function createActivityReportByGroup (from, to, userData, traccarInstance)
   return reportData
 }
 
-async function executeServerSide (allData, sliced, from, to, userData, totalDevices, { axios }) {
-  let deviceCount = 0
-  for (const devices of sliced) {
-    const url = `https://${process.env.SERVER_HOST}/reports/activity-report`
-    const data = await axios.post(url, { from, to, userData: { ...userData, devices } }, { withCredentials: true }).then(d => d.data)
-    allData.devices.push(...(data[0].devices))
-    deviceCount = deviceCount + devices.length
-    console.log(`PROGRESS_PERC:${deviceCount / totalDevices * 100}`)
-  }
-}
-
 async function createActivityReportByDevice (from, to, userData, traccarInstance) {
   console.log('createActivityReportByDevice')
   const allDevices = devicesToProcess(userData)
@@ -99,7 +88,9 @@ async function createActivityReportByDevice (from, to, userData, traccarInstance
 
   if (isClientSide() && allDevices.length > 20) {
     const sliced = automaticReports.sliceArray(allDevices, 10)
-    await executeServerSide(allData, sliced, from, to, userData, allDevices.length, traccarInstance)
+    await executeServerSide('activity-report', sliced, from, to, userData, allDevices.length, traccarInstance, 5).then(devices => {
+      allData.devices = devices
+    })
   } else {
     let summaryByDay = []
     if (userData.allWeek && userData.groupByDay) {

package/src/index.js

@@ -18,6 +18,7 @@ function Reports (config, axios) {
       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' }
     }
   }
@@ -182,5 +183,25 @@ function Reports (config, axios) {
   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/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/delayedstart-report.js

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

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

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

@@ -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

@@ -52,4 +52,13 @@ describe('Kms_Reports', function () {
     assert.equal(device.days.length, 30) // Total Kms
     assert.equal(device.days[29].kms, 136174.93281451002) // Total Kms
   }, 30000)
+  it('KmsReport by driver', async () => {
+    const reports = await getReports(process.env.USER_CTM_MOVIFLOTTE, process.env.PASS_CTM_MOVIFLOTTE)
+    const userData = await reports.getUserData()
+    userData.byDriver = true
+    console.log(userData.drivers)
+    const data = await reports.kmsReport(new Date(2024, 0, 1, 0, 0, 0), new Date(2024, 0, 31, 23, 59, 59),
+        userData)
+    assert.equal(data.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/utils.js

@@ -243,11 +243,13 @@ async function executeServerSide (type, sliced, from, to, userData, totalItems,
           userData: userData.byDriver
             ? {
                 ...userData,
-                drivers: items
+                drivers: items,
+                geofences: []
               }
             : {
                 ...userData,
-                devices: items
+                devices: items,
+                geofences: []
               }
         }, { withCredentials: true }).then(d => d.data)
         reportData.push(...(userData.byDriver ? data[0].drivers : data[0].devices))