fleetmap-reports 2.0.77 → 2.0.78

package/package.json

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

package/src/fuelconsumption-report.js

@@ -136,12 +136,12 @@ function exportFuelConsumptionReportToExcel (userData, reportData) {
         return {
           name: d.device.name,
           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),
+          kms: formatNumber(r.distance / 1000),
+          consumption: r.spentFuel > 0 ? formatNumber(r.spentFuel) : 0,
+          avg_consumption: formatNumber(lang === 'pt-BR' ? r.avgConsumption.byLiters : r.avgConsumption.byKms),
           duration: convertMS(r.duration),
-          accumulated_kms: formatNumber((r.endOdometer / 100), lang),
-          refueling: formatNumber(r.refueling, lang)
+          accumulated_kms: formatNumber((r.endOdometer / 100)),
+          refueling: formatNumber(r.refueling)
         }
       }))
       // Totals
@@ -203,12 +203,12 @@ async function exportFuelConsumptionReportToPDF (userData, reportData) {
       d.days.forEach(r =>
         data.push([
           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),
+          formatNumber(r.distance / 1000),
+          r.spentFuel > 0 ? formatNumber(r.spentFuel) : 0,
+          formatNumber(lang === 'pt-BR' ? r.avgConsumption.byLiters : r.avgConsumption.byKms),
           convertMS(r.duration),
-          formatNumber((r.endOdometer / 1000), lang),
-          formatNumber(r.refueling, lang)
+          formatNumber((r.endOdometer / 1000)),
+          formatNumber(r.refueling)
         ]))
 
       const footValues = [

package/src/tests/fuel.test.js

@@ -20,8 +20,8 @@ describe('Test_Reports', function () {
   }, 30000)
 
   it('Fuel Consumption 1', async () => {
-    console.log('trip by device')
-    const report = await getReports('aghani@moviflotte.com', 'X8Tm<QT*')
+    console.log('Fuel Consumption')
+    const report = await getReports(process.env.email, process.env.password)
     const userData = await report.getUserData()
     userData.devices = userData.devices.filter(d => d.id === 133608)
 

package/src/tests/kms.test.js

@@ -1,7 +1,7 @@
 /* eslint-disable no-undef */
 const { getReports } = require('./index')
 const assert = require('assert')
-const {convertFromUTC, convertFromLocal} = require("../util/utils");
+const { convertFromLocal } = require('../util/utils')
 
 describe('Kms_Reports', function () {
   // eslint-disable-next-line no-undef
@@ -65,10 +65,10 @@ 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
-    const data = await reports.kmsReport(convertFromLocal(new Date(2024, 3, 5, 0, 0, 0), userData.user.attributes.timezone), convertFromLocal(new Date(2024, 3, 5, 23, 59, 59), userData.user.attributes.timezone),
+    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 === 292563)
+    const device = data[0].devices.find(d => d.device.id === 93497)
     assert.equal(device, 1)
   }, 3000000)
 })

package/src/util/trips.js

@@ -138,8 +138,15 @@ async function getDataByDay (device, date, data, userData, traccarInstance) {
   return { tripsByDay, routeByDay, refuelingPositionsByDay, zoneInOutDayData }
 }
 
+function isValidAvgSpeed (kms, startTime, endTime) {
+  const totalTime = new Date(endTime).getTime() - new Date(startTime).getTime()
+  const avgSpeed = (kms / 1000) / (totalTime / (1000 * 60 * 60))
+  return avgSpeed < 200
+}
+
 function getKms (trips) {
-  return trips.filter(t => t.distance > 0).reduce((a, b) => a + b.distance, 0)
+  const odometerKms = trips.length > 0 ? trips[trips.length - 1].endOdometer - trips[0].startOdometer : 0
+  return odometerKms > 0 && isValidAvgSpeed(odometerKms, trips[0].startTime, trips[trips.length - 1].endTime) ? odometerKms : trips.filter(t => t.distance > 0).reduce((a, b) => a + b.distance, 0)
 }
 
 function isInsideTimetable (t, userData) {

package/src/util/utils.js

@@ -41,8 +41,8 @@ function convertMS (duration, withSeconds) {
   return withSeconds ? hours + ':' + minutes + ':' + seconds : hours + ':' + minutes
 }
 
-exports.formatNumber = function formatNumber (value, lang) {
-  return Intl.NumberFormat(lang, { maximumFractionDigits: 1, minimumFractionDigits: 1 }).format(value)
+exports.formatNumber = function formatNumber (value) {
+  return Number(value.toFixed(1))
 }
 
 function coordsDistance (lon1, lat1, lon2, lat2) {