fleetmap-reports 1.0.778 → 1.0.780

package/package.json

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

package/src/activity-report.js

@@ -13,6 +13,7 @@ const { isInsideTimetable, isPartialInsideTimetable, calculateTrip } = require('
 const tripHelper = require('./util/trips')
 const { devicesToProcess } = require('./util/device')
 const { getDriverData } = require('./util/driver')
+const { calculateConsumption } = require('./util/fuel')
 
 const fileName = 'ActivityReport'
 
@@ -204,7 +205,7 @@ function processDevices (from, to, devices, data, userData) {
           if (summaryCurrentDay) {
             summaryCurrentDay.engineHours = tripsByDay.reduce((a, b) => a + b.duration, 0)
             summaryCurrentDay.distance = distance
-            summaryCurrentDay.convertedSpentFuel = automaticReports.calculateSpentFuel(summaryCurrentDay.spentFuel, d)
+            summaryCurrentDay.convertedSpentFuel = calculateConsumption(d, { route: deviceRoute, summary: summaryCurrentDay })
             summaryCurrentDay.startTime = tripsByDay.length && tripsByDay[0].startTime
             summaryCurrentDay.startAddress = tripsByDay.length && tripsByDay[0].startAddress
             summaryCurrentDay.endTime = tripsByDay.length && tripsByDay[tripsByDay.length - 1].endTime
@@ -240,7 +241,7 @@ function processDevices (from, to, devices, data, userData) {
           summary.forEach(s => {
             s.engineHours = deviceTrips.reduce((a, b) => a + b.duration, 0)
             s.distance = deviceTrips.reduce((a, b) => a + b.distance, 0)
-            s.convertedSpentFuel = automaticReports.calculateSpentFuel(s.spentFuel, d)
+            s.convertedSpentFuel = calculateConsumption(d, { route: deviceRoute, summary: s })
             s.startTime = deviceTrips.length && deviceTrips[0].startTime
             s.startAddress = deviceTrips.length && deviceTrips[0].startAddress
             s.endTime = deviceTrips.length && deviceTrips[deviceTrips.length - 1].endTime

package/src/automaticReports.js

@@ -21,10 +21,6 @@ function deviceWithFuelInfo (device) {
         (device.attributes.fuel_low_threshold >= 0 && device.attributes.fuel_high_threshold >= 0 && device.attributes.fuel_tank_capacity)
 }
 
-function fuelSignalInverter (device) {
-  return device.attributes.fuel_low_threshold <= device.attributes.fuel_high_threshold ? 1 : -1
-}
-
 function calculateXpertDistance (date, positions) {
   const begin = moment(date, 'YYYY-MM-DD').startOf('day')
   const end = moment(date, 'YYYY-MM-DD').endOf('day')
@@ -33,19 +29,7 @@ function calculateXpertDistance (date, positions) {
   return datePositions.reduce((a, b) => a + b.attributes.distance, 0)
 }
 
-function calculateSpentFuel (value, device) {
-  if (!value || device.attributes.xpert) { return value }
-
-  if (device.attributes.fuel_low_threshold && device.attributes.fuel_high_threshold) {
-    const valueSignalCheck = value * fuelSignalInverter(device)
-    const valuePercentage = (valueSignalCheck * 100) / Math.abs(device.attributes.fuel_low_threshold - device.attributes.fuel_high_threshold)
-    return Math.round((valuePercentage * device.attributes.fuel_tank_capacity) / 100)
-  }
-  return value
-}
-
 exports.sliceArray = sliceArray
 exports.deviceWithFuelInfo = deviceWithFuelInfo
-exports.calculateSpentFuel = calculateSpentFuel
 exports.calculateXpertDistance = calculateXpertDistance
 exports.maxParallelRequests = maxParallelRequests

package/src/fuelconsumption-report.js

@@ -1,4 +1,3 @@
-const automaticReports = require('./automaticReports')
 const refuelingReport = require('./refueling-report')
 const traccarHelper = require('./util/traccar')
 const odoo = require('./util/odoo')
@@ -8,6 +7,7 @@ const { getStyle } = require('./reportStyle')
 const { getUserPartner } = require('fleetmap-partners')
 const { addTable, headerFromUser } = require('./util/pdfDocument')
 const jsPDF = require('jspdf')
+const { useOdooFuelData, calculateConsumption } = require('./util/fuel')
 
 async function createFuelConsumptionReport (from, to, userData, traccar) {
   console.log('Create FuelConsumption Report')
@@ -22,24 +22,23 @@ async function createFuelConsumptionReport (from, to, userData, traccar) {
 
   const devices = devicesToProcess(userData)
 
-  const allInOne = await traccarHelper.getAllInOne(traccar, from, to, devices, true, true, false, false)
-  const tripsData = allInOne.trips
-  const routeData = allInOne.route
+  const allInOne = await traccarHelper.getAllInOne(traccar, from, to, devices, true, true, true, false)
 
   const fuelServicesData = []
   if (devices.some(d => d.attributes.odooId)) {
     fuelServicesData.push(...(await odoo.getOdooFuelServices(traccar, from, to)))
   }
 
-  if (tripsData.length === 0) {
+  if (allInOne.trips.length === 0) {
     return reportData
   }
 
   allData.totalDevices = 0
 
   for (const d of devices) {
-    const trips = tripsData.filter(t => t.deviceId === d.id)
-    const route = routeData.filter(r => r.deviceId === d.id)
+    const trips = allInOne.trips.filter(t => t.deviceId === d.id)
+    const route = allInOne.route.filter(r => r.deviceId === d.id)
+    const stops = allInOne.stops.filter(s => s.deviceId === d.id)
     const deviceFuelServices = fuelServicesData.filter(f => Number.parseInt(d.attributes.odooId) === f.vehicle_id[0])
 
     if (trips.length > 0) {
@@ -55,6 +54,12 @@ async function createFuelConsumptionReport (from, to, userData, traccar) {
         new Map()
       )
 
+      stops.forEach(s => { s.startDate = s.startTime.substring(0, 10) })
+      const groupedStopsByDay = stops.reduce(
+        (entryMap, e) => entryMap.set(e.startDate, [...entryMap.get(e.startDate) || [], e]),
+        new Map()
+      )
+
       route.forEach(p => { p.startDate = p.fixTime.substring(0, 10) })
       const groupedRouteByDay = route.reduce(
         (entryMap, e) => entryMap.set(e.startDate, [...entryMap.get(e.startDate) || [], e]),
@@ -69,7 +74,7 @@ async function createFuelConsumptionReport (from, to, userData, traccar) {
         const dayTrips = groupedTripsByDay.get(day)
         const dayRefueling = groupedRefuelingsByDay.get(day)
         const distance = dayTrips.reduce((a, b) => a + b.distance, 0)
-        const spentFuel = calculateConsumption(userData, d, day, odooAvgConsumption, { trips: dayTrips, route: groupedRouteByDay.get(day) })
+        const spentFuel = calculateConsumption(d, { trips: dayTrips, stops: groupedStopsByDay.get(day), route: groupedRouteByDay.get(day) }, odooAvgConsumption)
 
         const dataRow = {
           date: day,
@@ -126,18 +131,6 @@ function calculateAvgConsumption (fuel, distance) {
   return { byKms: fuel * 100 / (distance / 1000), byLiters: (distance / 1000) / fuel }
 }
 
-function calculateConsumption (userData, d, day, avgConsumption, data) {
-  if (useOdooFuelData(d, data.route)) {
-    return (avgConsumption.byKms * (data.trips.reduce((a, b) => a + b.distance, 0) / 1000) / 100)
-  }
-
-  if (data.route.length > 1 && data.route[0].attributes.fuelUsed) {
-    return data.route[data.route.length - 1].attributes.fuelUsed - data.route[0].attributes.fuelUsed
-  }
-
-  return automaticReports.calculateSpentFuel(data.trips.reduce((a, b) => a + b.spentFuel, 0), d)
-}
-
 function exportFuelConsumptionReportToExcel (userData, reportData) {
   const translations = getTranslations(userData)
   const lang = getLanguage(userData)
@@ -268,10 +261,6 @@ function deviceName (device) {
   return device.name + (device.attributes.license_plate ? ', ' + device.attributes.license_plate : '') + (device.model ? ', ' + device.model : '')
 }
 
-function useOdooFuelData (d, route) {
-  return route.length && !route[0].attributes.fuel && d.attributes.odooId
-}
-
 function getTotalKms (user, data) {
   const totalKms = data.reduce((a, b) => a + b.distance, 0)
   return formatNumber(totalKms / 1000, user.attributes.lang)

package/src/partnerReports/performance-report.js

@@ -136,12 +136,12 @@ function getDeviceData (allInOne, d) {
 
     const highEngineRPMSections = calculateRPMSections(deviceRoute, d.attributes.highRPM || 1300)
     const highEngineRPM = highEngineRPMSections.map(a => a.length > 1
-      ? a.map((p, index) => index === 0 ? 0 : new Date(p.fixTime).getTime() - new Date(a[index - 1].fixTime).getTime()).reduce((a, b) => a + b)
+      ? a.map((p, index) => index === 0 ? 0 : new Date(p.fixTime).getTime() - new Date(a[index - 1].fixTime).getTime()).reduce((a, b) => a + b, 0)
       : 0).reduce((a, b) => a + b, 0)
 
     const economicRPMSections = calculateRPMSections(deviceRoute, d.attributes.minEconomicRPM || 1000, d.attributes.maxEconomicRPM || 1250)
     const economicTime = economicRPMSections.map(a => a.length > 1
-      ? a.map((p, index) => index === 0 ? 0 : new Date(p.fixTime).getTime() - new Date(a[index - 1].fixTime).getTime()).reduce((a, b) => a + b)
+      ? a.map((p, index) => index === 0 ? 0 : new Date(p.fixTime).getTime() - new Date(a[index - 1].fixTime).getTime()).reduce((a, b) => a + b, 0)
       : 0).reduce((a, b) => a + b, 0)
     const economicDistance = economicRPMSections.map(a => a.length > 1
       ? calculateDistance(a)

package/src/tests/activity.test.js

@@ -58,4 +58,18 @@ describe('activity report', function () {
     console.log(device)
     assert.equal(device.summary[0].convertedSpentFuel, 168.6)
   }, 800000)
+  // eslint-disable-next-line no-undef
+  it('Activity check fuel consumption group by day', async () => {
+    const report = await getReports()
+    const userData = await report.getUserData()
+    userData.groupByDay = true
+    userData.devices = userData.devices.filter(d => d.id === 69114)
+    const data = await report.activityReport(new Date(2023, 5, 11, 0, 0, 0, 0),
+      new Date(2023, 6, 11, 23, 59, 59, 0),
+      userData)
+    assert.equal(data.length, 1)
+    const device = data[0].devices.find(d => d.device.id === 69114)
+    console.log(device)
+    assert.equal(device.summary.reduce((a, b) => a + b.convertedSpentFuel, 0), 168.79999999999995)
+  }, 800000)
 })

package/src/trip-report.js

@@ -19,6 +19,7 @@ const { getIdleEvents } = require('./util/route')
 const { reportByDriver, getDriverName, getDriverData } = require('./util/driver')
 const { getNearestPOIs } = require('./util/geofence')
 const { parallel } = require('./util/parallel')
+const { calculateConsumption } = require('./util/fuel')
 
 const fileName = 'TripReport'
 
@@ -171,7 +172,7 @@ function processDevices (from, to, devices, data, userData, traccar) {
 
       if ((deviceRoute[0].protocol === 'teltonika' && deviceRoute.some(r => r.attributes.fuel)) ||
           automaticReports.deviceWithFuelInfo(d)) {
-        trip.fuelConsumption = trip.spentFuel + (stop ? stop.spentFuel : 0)
+        trip.fuelConsumption = calculateConsumption(d, { trips: [trip], stops: (stop ? [stop] : []), route: deviceRoute })
         trip.avgFuelConsumption = trip.totalKms > 0 ? trip.fuelConsumption * 100 / trip.totalKms : 0
       }
 

package/src/util/fuel.js

@@ -22,5 +22,45 @@ function getRefuelingLiters (d, position, diff) {
   return Math.round(diff * d.attributes.fuel_tank_capacity / 100)
 }
 
+function calculateConsumption (d, data, avgConsumption) {
+  let fuelConsumption = 0
+  if (useOdooFuelData(d, data.route)) {
+    fuelConsumption = (avgConsumption.byKms * (data.trips.reduce((a, b) => a + b.distance, 0) / 1000) / 100)
+  } else {
+    const withFuelUsed = data.route && data.route.find(p => p.attributes.fuelUsed)
+    if (data.summary) {
+      fuelConsumption = calculateSpentFuel(data.summary.spentFuel, d, withFuelUsed)
+    } else if (data.trips && data.stops) {
+      const spentFuel = data.trips.reduce((a, b) => a + b.spentFuel, 0) + data.stops.reduce((a, b) => a + b.spentFuel, 0)
+      fuelConsumption = calculateSpentFuel(spentFuel, d, withFuelUsed)
+    } else if (data.route && data.route.length > 1 && data.route[0].attributes.fuelUsed) {
+      fuelConsumption = data.route[data.route.length - 1].attributes.fuelUsed - data.route[0].attributes.fuelUsed
+    }
+  }
+  return fuelConsumption > 0 ? fuelConsumption : 0
+}
+
+function calculateSpentFuel (value, device, withFuelUsed) {
+  if (!value) { return value }
+
+  if (device.attributes.xpert) {
+    return withFuelUsed ? value : (value * device.attributes.fuel_tank_capacity) / 100
+  }
+
+  if (device.attributes.fuel_low_threshold && device.attributes.fuel_high_threshold) {
+    const valueSignalCheck = value * fuelSignalInverter(device)
+    const valuePercentage = (valueSignalCheck * 100) / Math.abs(device.attributes.fuel_low_threshold - device.attributes.fuel_high_threshold)
+    return Math.round((valuePercentage * device.attributes.fuel_tank_capacity) / 100)
+  }
+
+  return value
+}
+
+function useOdooFuelData (d, route) {
+  return route && route.length && !route[0].attributes.fuel && d.attributes.odooId
+}
+
 exports.calculateFuelDiff = calculateFuelDiff
 exports.getRefuelingLiters = getRefuelingLiters
+exports.calculateConsumption = calculateConsumption
+exports.useOdooFuelData = useOdooFuelData