fleetmap-reports 2.0.28 → 2.0.30

package/package.json

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

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

@@ -8,7 +8,7 @@ const {
 const { getUserPartner } = require('fleetmap-partners')
 const traccar = require('./util/traccar')
 const { getDates, getTranslations, isClientSide, executeServerSide } = require('./util/utils')
-const drivers = require('./util/driver')
+const driversUtil = require('./util/driver')
 const { isInsideTimetable, isPartialInsideTimetable, calculateTrip, getDataByDay, checkTripsKms, getKms } = require('./util/trips')
 const { devicesToProcess } = require('./util/device')
 const { getDriverData, reportByDriver } = require('./util/driver')
@@ -45,7 +45,9 @@ async function createKmsReportByDevice (from, to, userData, traccarInstance) {
 
   if (isClientSide() && (allDevices.length > 50 || ((new Date(to).getTime() - new Date(from).getTime()) > (1000 * 60 * 60 * 24 * 15))) && userData.groupByDay) {
     const sliced = automaticReports.sliceArray(allDevices, 1)
-    await executeServerSide('kms-report', allData, sliced, from, to, userData, allDevices.length, traccarInstance)
+    await executeServerSide('kms-report', sliced, from, to, userData, allDevices.length, traccarInstance).then(devices => {
+      allData.devices = devices
+    })
   } else {
     if (userData.allWeek && userData.groupByDay) {
       const dates = getDates(from, to, userData.user.attributes.timezone || getUserPartner(userData.user).timezone)
@@ -100,29 +102,41 @@ 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)
+  const report = { drivers: [] }
 
-  const results = await reportByDriver(devices, traccarInstance, from, to, userData, processDrivers)
+  const { devices, drivers } = await driversUtil.devicesByDriver(traccarInstance, from, to, userData.drivers, userData.devices)
 
-  const report = { drivers: [] }
+  console.log(drivers.length, devices.length)
 
-  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
-          }
-        })
+  userData.devices = devices
+  userData.drivers = drivers
+
+  if (isClientSide() && (userData.drivers.length > 50 || ((new Date(to).getTime() - new Date(from).getTime()) > (1000 * 60 * 60 * 24 * 15))) && userData.groupByDay) {
+    const sliced = automaticReports.sliceArray(userData.drivers, 10)
+    await executeServerSide('kms-report', sliced, from, to, userData, userData.drivers.length, traccarInstance, 5).then(drivers => {
+      report.drivers = drivers
+    })
+  } else {
+    const results = await reportByDriver(userData.devices, traccarInstance, from, to, userData, processDrivers)
+
+    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 {
-        driver.summary.distance = driver.summary.distance + result.summary.distance
+        report.drivers.push(result)
       }
-    } else {
-      report.drivers.push(result)
-    }
-  })
+    })
+  }
 
   return report
 }

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

@@ -102,7 +102,7 @@ async function createSpeedingReportByDevice (from, to, userData, traccarInstance
 }
 
 async function createSpeedingReportByDriver (from, to, userData, traccarInstance) {
-  const devices = await drivers.devicesByDriver(traccarInstance, from, to, userData.drivers, userData.devices)
+  const { devices } = await drivers.devicesByDriver(traccarInstance, from, to, userData.drivers, userData.devices)
   console.log('Devices with driver', devices.length)
   const _drivers = []
   const sliced = automaticReports.sliceArray(devices, 5)

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()
+    const userData = await reports.getUserData()
+    userData.byDriver = true
+    console.log(userData.drivers)
+    const data = await reports.kmsReport(new Date(2024, 0, 24, 0, 0, 0), new Date(2024, 0, 24, 23, 59, 59),
+        userData)
+    assert.equal(data.length, 1)
+  }, 3000000)
 })

package/src/util/driver.js

@@ -7,14 +7,19 @@ const { isInsideTimetable, isPartialInsideTimetable } = require('./trips')
 async function devicesByDriver (traccarInstance, from, to, drivers, devices) {
   const eventsData = await traccar.getEvents(traccarInstance, from, to, devices, ['driverChanged'])
   const deviceIds = []
+  const driversIds = []
   for (const d of drivers) {
     const events = eventsData.filter(e => {
       return !d.uniqueId.localeCompare(e.attributes.driverUniqueId, undefined, { sensitivity: 'base' })
     })
 
+    if (events.length) {
+      driversIds.push(d.id)
+    }
+
     deviceIds.push(...events.map(e => e.deviceId))
   }
-  return devices.filter(d => deviceIds.includes(d.id))
+  return { devices: devices.filter(d => deviceIds.includes(d.id)), drivers: drivers.filter(d => driversIds.includes(d.id)) }
 }
 
 async function reportByDriver (devices, traccar, from, to, userData, processor) {

package/src/util/utils.js

@@ -227,31 +227,38 @@ function weekDaySelected (date, weekDays) {
     (date.getDay() === 6 && weekDays.saturday))
 }
 
-async function executeServerSide (type, allData, sliced, from, to, userData, totalDevices, { axios }) {
-  let deviceCount = 0
+async function executeServerSide (type, sliced, from, to, userData, totalItems, { axios }, maxRequests = 10) {
+  let itemsCount = 0
   console.log('PROGRESS_PERC:1')
-  const maxRequests = 10
+  const reportData = []
   for (let i = 0; i < sliced.length; i += maxRequests) {
     const _sliced = sliced.slice(i, i + maxRequests)
-    await Promise.all(_sliced.map(async devices => {
+    await Promise.all(_sliced.map(async items => {
       const url = `https://${process.env.SERVER_HOST}/reports/${type}`
       try {
         const data = await axios.post(url, {
           from,
           to,
-          userData: {
-            ...userData,
-            devices
-          }
+          userData: userData.byDriver
+            ? {
+                ...userData,
+                drivers: items
+              }
+            : {
+                ...userData,
+                devices: items
+              }
         }, { withCredentials: true }).then(d => d.data)
-        allData.devices.push(...(data[0].devices))
-        deviceCount = deviceCount + devices.length
+        reportData.push(...(userData.byDriver ? data[0].drivers : data[0].devices))
+        itemsCount = itemsCount + items.length
       } catch (e) {
         console.error(e)
       }
-      console.log(`PROGRESS_PERC:${deviceCount / totalDevices * 100}`)
+      console.log(`PROGRESS_PERC:${itemsCount / totalItems * 100}`)
     }))
   }
+
+  return reportData
 }
 
 exports.executeServerSide = executeServerSide