fleetmap-reports 2.0.35 → 2.0.37

package/package.json

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

package/src/fuelconsumption-report.js

@@ -136,7 +136,7 @@ function exportFuelConsumptionReportToExcel (userData, reportData) {
       data = data.concat(d.days.map((r) => {
         return {
           name: d.device.name,
-          date: r.date,
+          date: r.date.toLocaleDateString(),
           kms: formatNumber(r.distance / 1000, lang),
           consumption: r.spentFuel > 0 ? formatNumber(r.spentFuel, lang) : 0,
           avg_consumption: formatNumber(lang === 'pt-BR' ? r.avgConsumption.byLiters : r.avgConsumption.byKms, lang),
@@ -203,7 +203,7 @@ async function exportFuelConsumptionReportToPDF (userData, reportData) {
 
       d.days.forEach(r =>
         data.push([
-          r.date,
+          r.date.toLocaleDateString(),
           formatNumber(r.distance / 1000, lang),
           r.spentFuel > 0 ? formatNumber(r.spentFuel, lang) : 0,
           formatNumber(lang === 'pt-BR' ? r.avgConsumption.byLiters : r.avgConsumption.byKms, lang),

package/src/util/driver.js

@@ -6,20 +6,13 @@ const { isInsideTimetable, isPartialInsideTimetable } = require('./trips')
 // get devices used by each driver between two dates
 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)
-    }
+  const driverUniqueIdsToProcess = new Set(eventsData.map(e => e.attributes.driverUniqueId))
+  const driversToProcess = drivers.filter(d => driverUniqueIdsToProcess.has(d.uniqueId))
 
-    deviceIds.push(...events.map(e => e.deviceId))
-  }
-  return { devices: devices.filter(d => deviceIds.includes(d.id)), drivers: drivers.filter(d => driversIds.includes(d.id)) }
+  const deviceIdsToProcess = new Set(eventsData.map(e => e.deviceId))
+  const devicesToProcess = devices.filter(d => deviceIdsToProcess.has(d.id))
+
+  return { devices: devicesToProcess, drivers: driversToProcess }
 }
 
 async function reportByDriver (devices, traccar, from, to, userData, processor, allInOneData = { route: true, trips: true, stops: true, summary: false }) {