fleetmap-reports 2.0.168 → 2.0.170

package/package.json

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

package/src/sensor-report.js

@@ -1,7 +1,7 @@
 const automaticReports = require('./automaticReports')
 const traccarHelper = require('./util/traccar')
 const { devicesToProcess, deviceName } = require('./util/device')
-const { getTranslations, isClientSide, convertToLocaleString, convertMS } = require('./util/utils')
+const { getTranslations, isClientSide, convertToLocaleString, convertMS, getDates } = require('./util/utils')
 const jsPDF = require('jspdf')
 const { headerFromUser, addTable } = require('./util/pdfDocument')
 const { getStyle } = require('./reportStyle')
@@ -44,12 +44,25 @@ function processDevices (from, to, devices, data, userData) {
 
     rows.sort((a, b) => new Date(a.startTime).getTime() - new Date(b.startTime).getTime())
 
-    result.push({
-      device: d,
-      from,
-      to,
-      rows
-    })
+    if (userData.groupByDay) {
+      const dates = getDates(from, to, userData.user.attributes.timezone)
+
+      const data = groupByDay(rows, dates, userData)
+
+      result.push({
+        device: d,
+        from,
+        to,
+        rows: data
+      })
+    } else {
+      result.push({
+        device: d,
+        from,
+        to,
+        rows
+      })
+    }
   }
 
   return result
@@ -74,6 +87,64 @@ async function create (from, to, userData, traccar) {
   return result
 }
 
+function groupByDay (rows, dates) {
+  const groupedByDay = {}
+
+  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
+
+    rows.forEach(row => {
+      if (row.value) {
+        const rowStart = new Date(row.startTime)
+        const rowEnd = new Date(row.endTime)
+
+        if (rowStart <= dayEnd && rowEnd >= dayStart) {
+          if (!groupedByDay[dateStr]) {
+            groupedByDay[dateStr] = {}
+          }
+
+          if (!groupedByDay[dateStr][row.name]) {
+            groupedByDay[dateStr][row.name] = {
+              firstActivation: null,
+              lastActivation: null,
+              totalDuration: 0
+            }
+          }
+
+          const periodStart = Math.max(rowStart.getTime(), dayStart.getTime())
+          const periodEnd = Math.min(rowEnd.getTime(), dayEnd.getTime())
+
+          const sensorData = groupedByDay[dateStr][row.name]
+
+          if (!sensorData.firstActivation || periodStart < sensorData.firstActivation) {
+            sensorData.firstActivation = periodStart
+          }
+
+          if (!sensorData.lastActivation || periodEnd > sensorData.lastActivation) {
+            sensorData.lastActivation = periodEnd
+          }
+
+          sensorData.totalDuration += periodEnd - periodStart
+        }
+      }
+    })
+  })
+
+  // 🖨️ Exibir os dados processados
+  Object.entries(groupedByDay).forEach(([date, sensors]) => {
+    Object.entries(sensors).forEach(([sensor, data]) => {
+      console.log(`Data: ${date}, Sensor: ${sensor}`)
+      console.log(`  Primeira ativação: ${data.firstActivation ? new Date(data.firstActivation).toLocaleTimeString() : '00:00'}`)
+      console.log(`  Última ativação: ${data.lastActivation ? new Date(data.lastActivation).toLocaleTimeString() : '23:59'}`)
+      console.log(`  Duração total: ${(data.totalDuration / 1000 / 60).toFixed(2)} minutos`)
+    })
+  })
+
+  return Object.entries(groupedByDay)
+}
+
 async function exportToPDF (userData, reportData) {
   console.log('exportSensorReportToPDF')
 

package/src/util/fuel.js

@@ -1,21 +1,5 @@
-function calculateFuelDiff (a, b, device, p) {
-  if (p.protocol === 'teltonika') {
-    return b - a
-  } else {
-    const diff = (b - a) * fuelSignalInverter(device)
-    if (device.attributes.xpert) {
-      return diff
-    } else {
-      return (diff * 100) / Math.abs(device.attributes.fuel_low_threshold - device.attributes.fuel_high_threshold)
-    }
-  }
-}
-
-function fuelSignalInverter (device) {
-  if (!device.attributes.fuel_low_threshold || !device.attributes.fuel_high_threshold) {
-    return 1
-  }
-  return device.attributes.fuel_low_threshold <= device.attributes.fuel_high_threshold ? 1 : -1
+function calculateFuelDiff (a, b) {
+  return b - a
 }
 
 function getRefuelingLiters (d, position, diff) {