fleetmap-reports 1.0.685 → 1.0.687

package/package.json

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

package/src/fuelconsumption-report.js

@@ -143,7 +143,7 @@ function exportFuelConsumptionReportToExcel (userData, reportData) {
     { label: translations.report.date, value: 'date' },
     { label: translations.report.distance, value: 'kms' },
     { label: translations.report.consumption, value: 'consumption' },
-    { label: translations.report.avg_consumption, value: 'avg_consumption' },
+    { label: (lang === 'pt-BR' ? translations.report.avg_consumption_by_liters : translations.report.avg_consumption), value: 'avg_consumption' },
     { label: translations.report.duration, value: 'duration' },
     { label: translations.report.odometer, value: 'accumulated_kms' },
     { label: translations.report.refueling, value: 'refueling' }
@@ -159,7 +159,7 @@ function exportFuelConsumptionReportToExcel (userData, reportData) {
           consumption: r.spentFuel > 0 ? formatNumber(r.spentFuel, lang) : 0,
           avg_consumption: formatNumber(lang === 'pt-BR' ? r.avgConsumption.byLiters : r.avgConsumption.byKms, lang),
           duration: convertMS(r.duration),
-          accumulated_kms: (r.endOdometer / 100).toFixed(1),
+          accumulated_kms: formatNumber((r.endOdometer / 100), lang),
           refueling: formatNumber(r.refueling, lang)
         }
       }))
@@ -196,7 +196,7 @@ async function exportFuelConsumptionReportToPDF (userData, reportData) {
     translations.report.date,
     translations.report.distance,
     translations.report.consumption,
-    translations.report.avg_consumption,
+    (lang === 'pt-BR' ? translations.report.avg_consumption_by_liters : translations.report.avg_consumption),
     translations.report.duration,
     translations.report.odometer,
     translations.report.refueling
@@ -226,8 +226,8 @@ async function exportFuelConsumptionReportToPDF (userData, reportData) {
           r.spentFuel > 0 ? formatNumber(r.spentFuel, lang) : 0,
           formatNumber(lang === 'pt-BR' ? r.avgConsumption.byLiters : r.avgConsumption.byKms, lang),
           convertMS(r.duration),
-          (r.endOdometer / 1000).toFixed(1),
-          r.refueling
+          formatNumber((r.endOdometer / 1000), lang),
+          formatNumber(r.refueling, lang)
         ]))
 
       const footValues = [
@@ -285,7 +285,7 @@ function getTotalRefueling (user, data) {
 }
 
 function getTotalAvgConsumption (user, data) {
-  const values = data.map(a => a.distance * a.avgConsumption.byKms).reduce((a, b) => a + b, 0)
+  const values = data.map(a => a.distance * (user.attributes.lang === 'pt-BR' ? a.avgConsumption.byLiters : a.avgConsumption.byKms)).reduce((a, b) => a + b, 0)
   const totalKms = data.reduce((a, b) => a + b.distance, 0)
 
   const totalAvgConsumption = values / totalKms

package/src/fueldrop-report.js

@@ -1,6 +1,7 @@
 const automaticReports = require('./automaticReports')
 const { devicesToProcess } = require('./util/device')
 const { getTranslations } = require('./util/utils')
+const traccarHelper = require('./util/traccar')
 
 function calculateFuelDrop (position, positions) {
   const index = positions.indexOf(position)
@@ -21,48 +22,43 @@ function calculateFuelDrop (position, positions) {
 async function createFuelDropReport (from, to, userData, traccar) {
   console.log('Create FuelDropReport')
 
-  const reportData = []
-
   const allData = {
     devices: [],
     from,
     to
   }
 
+  const reportData = []
+  reportData.push(allData)
+
   const devices = devicesToProcess(userData)
 
-  const arrayOfArrays = automaticReports.sliceArray(devices)
+  const arrayOfArrays = automaticReports.sliceArray(devices, 50)
   let data = []
-  const types = ['deviceFuelDrop']
 
+  const types = ['deviceFuelDrop']
   for (const a of arrayOfArrays) {
     const response = await traccar.reports.reportsEventsGet(from, to, a.map(d => d.id), null, types)
     data = data.concat(response.data)
   }
-
   console.log('FuelDrop Alerts:' + data.length)
-
-  if (data.length === 0) {
-    return reportData
-  }
   allData.totalDevices = 0
   allData.totalFuelDrops = 0
   allData.totalFuelDropLiters = 0
 
   for (const d of devices) {
     const alerts = data.filter(t => t.deviceId === d.id)
-
     if (alerts.length > 0) {
-      const response = await traccar.reports.reportsRouteGet(from, to, [d.id])
-      const positions = response.data
+      const allInOne = await traccarHelper.getAllInOne(traccar, from, to, [d], true, false, false, false, 1, devices.length)
+      const route = allInOne.route.filter(t => t.deviceId === d.id)
 
       for (const a of alerts) {
         a.fuelDropLiters = 0
         if (a.positionId > 0) {
-          const position = positions.find(p => p.id === a.positionId)
+          const position = route.find(p => p.id === a.positionId)
           if (position) {
             a.position = position
-            const diff = calculateFuelDrop(position, positions)
+            const diff = calculateFuelDrop(position, route)
             a.fuelDropLiters = Math.round(diff * d.attributes.fuel_tank_capacity / 100)
           }
         }
@@ -76,16 +72,10 @@ async function createFuelDropReport (from, to, userData, traccar) {
           device: d,
           alerts: filteredAlerts
         })
-
-        allData.totalDevices = allData.totalDevices + 1
-        allData.totalFuelDrops = allData.totalFuelDrops + filteredAlerts.length
-        allData.totalFuelDropLiters = allData.totalFuelDropLiters + filteredAlerts.reduce((a, b) => a + b.fuelDropLiters, 0)
       }
     }
   }
 
-  reportData.push(allData)
-
   return reportData
 }
 

package/src/tests/fuel.test.js

@@ -5,6 +5,7 @@ const assert = require('assert')
 const deviceId = 122575
 // eslint-disable-next-line no-undef
 describe('Test_Reports', function () {
+  this.timeout(5000000)
   it('Trip by device', async () => {
     console.log('trip by device')
     const report = await getReports()