fleetmap-reports 2.0.170 → 2.0.172

package/package.json

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

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,
@@ -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,6 +321,10 @@ async function exportToPDF (userData, reportData) {
   }
 }
 
+function getTotalDuration (rows) {
+  return convertMS(rows.reduce((a, b) => a + b[1].totalDuration, 0), false)
+}
+
 function exportToExcel (userData, reportData) {}
 
 exports.exportToPDF = exportToPDF

package/src/util/trips.js

@@ -217,7 +217,8 @@ function shouldRecalculate (trip, route) {
 
 function getTripTotalKms (trip, stop, route) {
   // we need to add stop kms to ensure that the total kms for the day, calculated with the odometer difference, will be equal to the sum of kms of all trips
-  const stopKms = stop && (stop.endOdometer - stop.startOdometer)
+  const stopKms = stop &&
+      !route.find(p => p.attributes.putAccumulators) && (stop.endOdometer - stop.startOdometer)
   let distance = trip.distance + (stop && stopKms > 0 ? stopKms : 0)
   if (shouldRecalculate(trip, route)) {
     distance = 0