fleetmap-reports 2.0.174 → 2.0.176

package/package.json

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

package/src/activity-report.js

@@ -181,7 +181,7 @@ async function processDevices (from, to, devices, data, userData, traccarInstanc
           trips.push(t)
           continue
         }
-        if (await isPartialInsideTimetable(t, userData, deviceRoute)) {
+        if (await isPartialInsideTimetable(d, t, userData, deviceRoute)) {
           trips.push(t)
         }
       }
@@ -233,7 +233,7 @@ async function processDevices (from, to, devices, data, userData, traccarInstanc
       }
     } else {
       if (!userData.allWeek && userData.weekDays && userData.dayHours) {
-        const trips = deviceTrips.filter(t => userData.allWeek || !userData.weekDays || isInsideTimetable(t, userData) || isPartialInsideTimetable(t, userData, deviceRoute))
+        const trips = deviceTrips.filter(t => userData.allWeek || !userData.weekDays || isInsideTimetable(t, userData) || isPartialInsideTimetable(d, t, userData, deviceRoute))
         const distance = getKms(trips)
         summary.push({
           deviceId: d.id,
@@ -296,7 +296,7 @@ function processDrivers (from, to, drivers, driversData, userData) {
           const toByDay = new Date(date.getFullYear(), date.getMonth(), date.getDate(), 23, 59, 59)
 
           const tripsByDay = trips.filter(t => (new Date(t.startTime) > fromByDay && new Date(t.endTime) < toByDay) &&
-                    (userData.allWeek || !userData.weekDays || isInsideTimetable(t, userData) || isPartialInsideTimetable(t, userData, route)))
+                    (userData.allWeek || !userData.weekDays || isInsideTimetable(t, userData) || isPartialInsideTimetable(undefined, t, userData, route)))
 
           calculateMultiDayTrips(trips, route, tripsByDay, fromByDay, toByDay, userData.devices)
 

package/src/kms-report.js

@@ -90,14 +90,12 @@ async function createKmsReportByDevice (from, to, userData, traccarInstance) {
           summary
         } = await traccar.getAllInOne(traccarInstance, from, to, devices, needRoute, true, false, !userData.groupByDay, deviceCount, allDevices.length, 10, 2)
 
-        // Process report data
-        if (trips.length) {
-          allData.devices = allData.devices.concat(await processDevices(from, to, devices, {
-            trips,
-            route,
-            summary
-          }, userData, traccarInstance))
-        }
+        allData.devices = allData.devices.concat(await processDevices(from, to, devices, {
+          trips,
+          route,
+          summary
+        }, userData, traccarInstance))
+
         deviceCount += devices.length
       }
     }
@@ -238,7 +236,7 @@ async function processDevices (from, to, devices, data, userData, traccarInstanc
       }
     }
 
-    const trips = deviceTrips.filter(t => userData.allWeek || !userData.weekDays || isInsideTimetable(t, userData) || isPartialInsideTimetable(t, userData, deviceRoute))
+    const trips = deviceTrips.filter(t => userData.allWeek || !userData.weekDays || isInsideTimetable(t, userData) || isPartialInsideTimetable(d, t, userData, deviceRoute))
 
     if (userData.groupByDay) {
       if (trips.length > 0) {

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

@@ -1,7 +1,10 @@
 const automaticReports = require('./automaticReports')
 const traccarHelper = require('./util/traccar')
 const { devicesToProcess, deviceName } = require('./util/device')
-const { getTranslations, isClientSide, convertToLocaleString, convertMS, getDates } = require('./util/utils')
+const {
+  getTranslations, isClientSide, convertToLocaleString, convertMS, getDates, convertToLocaleDateString,
+  convertToLocaleTimeString
+} = require('./util/utils')
 const jsPDF = require('jspdf')
 const { headerFromUser, addTable } = require('./util/pdfDocument')
 const { getStyle } = require('./reportStyle')
@@ -47,7 +50,7 @@ function processDevices (from, to, devices, data, userData) {
     if (userData.groupByDay) {
       const dates = getDates(from, to, userData.user.attributes.timezone)
 
-      const data = groupByDay(rows, dates, userData)
+      const data = userData.groupBySensor ? groupByDayAndSensor(rows, dates) : groupByDay(rows, dates)
 
       result.push({
         device: d,
@@ -84,7 +87,7 @@ async function create (from, to, userData, traccar) {
     deviceCount = deviceCount + slice.length
   }
 
-  return result
+  return [{ devices: result }]
 }
 
 function groupByDay (rows, dates) {
@@ -145,6 +148,70 @@ function groupByDay (rows, dates) {
   return Object.entries(groupedByDay)
 }
 
+function groupByDayAndSensor (rows, dates) {
+  const groupedData = {}
+
+  dates.forEach(dateStr => {
+    const dayStart = new Date(dateStr)
+    dayStart.setHours(0, 0, 0, 0)
+    const dayEnd = new Date(dayStart.getTime() + 86400000 - 1) // 23:59:59
+
+    if (!groupedData[dateStr]) {
+      groupedData[dateStr] = {
+        firstActivation: null,
+        lastActivation: null,
+        totalDuration: 0
+      }
+    }
+
+    const activePeriods = []
+
+    rows.forEach(row => {
+      if (row.value) {
+        const rowStart = new Date(row.startTime).getTime()
+        const rowEnd = new Date(row.endTime).getTime()
+
+        if (rowStart <= dayEnd.getTime() && rowEnd >= dayStart.getTime()) {
+          const periodStart = Math.max(rowStart, dayStart.getTime())
+          const periodEnd = Math.min(rowEnd, dayEnd.getTime())
+
+          activePeriods.push([periodStart, periodEnd]) // Store activation period
+        }
+      }
+    })
+
+    // Merge overlapping activation periods
+    activePeriods.sort((a, b) => a[0] - b[0]) // Sort by start time
+    const mergedPeriods = []
+    let currentPeriod = null
+
+    activePeriods.forEach(([start, end]) => {
+      if (!currentPeriod) {
+        currentPeriod = [start, end]
+      } else if (start <= currentPeriod[1]) {
+        // Extend the current period if overlapping
+        currentPeriod[1] = Math.max(currentPeriod[1], end)
+      } else {
+        // Store the finished period and start a new one
+        mergedPeriods.push(currentPeriod)
+        currentPeriod = [start, end]
+      }
+    })
+    if (currentPeriod) {
+      mergedPeriods.push(currentPeriod)
+    }
+
+    const totalDuration = mergedPeriods.reduce((sum, [start, end]) => sum + (end - start), 0)
+
+    if (mergedPeriods.length > 0) {
+      groupedData[dateStr].firstActivation = mergedPeriods[0][0]
+      groupedData[dateStr].lastActivation = mergedPeriods[mergedPeriods.length - 1][1]
+      groupedData[dateStr].totalDuration = totalDuration
+    }
+  })
+
+  return Object.entries(groupedData)
+}
 async function exportToPDF (userData, reportData) {
   console.log('exportSensorReportToPDF')
 
@@ -153,14 +220,29 @@ async function exportToPDF (userData, reportData) {
   const lang = userData.user.attributes.lang || (isClientSide() && navigator.language)
   const reportDataRows = reportData.devices
 
-  const headers = [
-    'Sensor',
-    translations.report.start,
-    translations.report.end,
-    'Estado',
-    translations.report.duration,
-    translations.report.endAddress
-  ]
+  const headers = userData.groupByDay && userData.groupBySensor
+    ? [
+        translations.report.date,
+        translations.report.start,
+        translations.report.end,
+        translations.report.duration
+      ]
+    : (userData.groupByDay
+        ? [
+            translations.report.date,
+            'Sensor',
+            translations.report.start,
+            translations.report.end,
+            translations.report.duration
+          ]
+        : [
+            'Sensor',
+            translations.report.start,
+            translations.report.end,
+            'Estado',
+            translations.report.duration,
+            translations.report.endAddress
+          ])
 
   if (reportDataRows) {
     // eslint-disable-next-line new-cap
@@ -185,25 +267,52 @@ async function exportToPDF (userData, reportData) {
         doc.text(group ? translations.report.group + ': ' + group.name : '', 200, space + 20)
         doc.text(convertToLocaleString(d.from, lang, timezone, userData.user) + ' - ' + convertToLocaleString(d.to, lang, timezone, userData.user), 20, space + 25)
 
-        d.rows.forEach(row => {
-          const temp = [
-            row.name,
-            convertToLocaleString(row.startTime, lang, timezone, userData.user),
-            convertToLocaleString(row.endTime, lang, timezone, userData.user),
-            row.valueDescription,
-            convertMS(row.duration),
-            row.endAddress
-          ]
-          data.push(temp)
-        })
+        if (userData.groupByDay && userData.groupBySensor) {
+          d.rows.forEach(day => {
+            const temp = [
+              convertToLocaleDateString(day[0], lang, timezone, userData.user),
+              day[1].firstActivation ? convertToLocaleTimeString(day[1].firstActivation, lang, timezone, userData.user) : '-',
+              day[1].lastActivation ? convertToLocaleTimeString(day[1].lastActivation, lang, timezone, userData.user) : '-',
+              convertMS(day[1].totalDuration)
+            ]
+            data.push(temp)
+          })
+        } else if (userData.groupByDay) {
+          d.rows.forEach(day => {
+            const sensors = Object.entries(day[1])
+            sensors.forEach(sensor => {
+              const temp = [
+                convertToLocaleDateString(day[0], lang, timezone, userData.user),
+                sensor[0],
+                sensor[1].firstActivation ? convertToLocaleTimeString(sensor[1].firstActivation, lang, timezone, userData.user) : '-',
+                sensor[1].lastActivation ? convertToLocaleTimeString(sensor[1].lastActivation, lang, timezone, userData.user) : '-',
+                convertMS(sensor[1].totalDuration)
+              ]
+              data.push(temp)
+            })
+          })
+        } else {
+          d.rows.forEach(row => {
+            const temp = [
+              row.name,
+              convertToLocaleString(row.startTime, lang, timezone, userData.user),
+              convertToLocaleString(row.endTime, lang, timezone, userData.user),
+              row.valueDescription,
+              convertMS(row.duration),
+              row.endAddress
+            ]
+            data.push(temp)
+          })
+        }
+
+        const totalDuration = (userData.groupByDay && userData.groupBySensor) ? getTotalDuration(d.rows) : 0
 
-        const footValues = []
+        const footValues = (userData.groupByDay && userData.groupBySensor) ? ['', '', '', totalDuration] : []
 
         const style = getStyle(getUserPartner(userData.user))
 
-        addTable(doc, headers, data, footValues, style, 40, {
-          4: { halign: 'right' }
-        })
+        addTable(doc, headers, data, footValues, style, 40,
+          (userData.groupByDay && userData.groupBySensor ? { 3: { halign: 'right' } } : { 4: { halign: 'right' } }))
 
         index++
       }
@@ -212,7 +321,13 @@ async function exportToPDF (userData, reportData) {
   }
 }
 
-function exportToExcel (userData, reportData) {}
+function getTotalDuration (rows) {
+  return convertMS(rows.reduce((a, b) => a + b[1].totalDuration, 0), false)
+}
+
+function exportToExcel (userData, reportData) {
+
+}
 
 exports.exportToPDF = exportToPDF
 exports.exportToExcel = exportToExcel

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

@@ -65,10 +65,11 @@ 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, 1)
+    assert.equal(device.days.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/trip-report.js

@@ -165,7 +165,7 @@ async function processDevices (from, to, devices, data, userData, traccar) {
       if (userData.allWeek ||
         !userData.weekDays ||
         isInsideTimetable(t, userData) ||
-        await isPartialInsideTimetable(t, userData, deviceRoute)) {
+        await isPartialInsideTimetable(d, t, userData, deviceRoute)) {
         trips.push(t)
       }
     }

package/src/util/driver.js

@@ -70,7 +70,7 @@ async function getDriverData (d, data, userData) {
       if (userData.allWeek ||
           !userData.weekDays ||
           isInsideTimetable(t, userData) ||
-          await isPartialInsideTimetable(t, userData, route)) {
+          await isPartialInsideTimetable(undefined, t, userData, route)) {
         filteredTrips.push(t)
       }
     }

package/src/util/trips.js

@@ -67,7 +67,7 @@ async function calculatePartialTrip (device, startDate, endDate, route, t, tracc
   return isPartialInside
 }
 
-function isPartialInsideTimetable (t, userData, route) {
+function isPartialInsideTimetable (device, t, userData, route) {
   if (weekDaySelected(new Date(t.startTime), userData.weekDays)) {
     const startDateLocal = new Date(convertFromUTC(t.startTime, userData.user.attributes.timezone).toISOString().split('T')[0] + ' ' + userData.dayHours.startTime)
     const endDateLocal = new Date(convertFromUTC(t.startTime, userData.user.attributes.timezone).toISOString().split('T')[0] + ' ' + userData.dayHours.endTime)
@@ -75,7 +75,7 @@ function isPartialInsideTimetable (t, userData, route) {
     const startDate = isClientSide() ? startDateLocal : convertFromLocal(startDateLocal, userData.user.attributes.timezone)
     const endDate = isClientSide() ? endDateLocal : convertFromLocal(endDateLocal, userData.user.attributes.timezone)
 
-    return calculatePartialTrip(undefined, startDate, endDate, route, t)
+    return calculatePartialTrip(device, startDate, endDate, route, t)
   }
 
   return false
@@ -133,7 +133,7 @@ function isInsideTimetable (t, userData) {
 function updateTrip (device, t, route) {
   route = route.filter(p => p && p.attributes.ignition)
   if (!route.length) { return }
-  const distance = calculateDistance(route, true) * 1000
+  const distance = calculateDistance(route, device ? device.attributes['report.ignoreOdometer'] : true) * 1000
   t.distance = distance
   t.duration = new Date(route[route.length - 1].fixTime).getTime() - new Date(route[0].fixTime).getTime()
   t.maxSpeed = route.reduce((a, b) => Math.max(a, b.speed), 0)