fleetmap-reports 1.0.377 → 1.0.378

package/lang/enGB.js

@@ -178,6 +178,7 @@ module.exports = {
     titleSpeedingReport: 'Overspeed Report',
     titleZoneReport: 'Zone Report',
     titleRefuelReport: 'Refueling Report',
+    titleFuelConsumptionReport: 'Fuel Consumption Report',
     titleFuelDropReport: 'Fuel Drop Report',
     titleEventsReport: 'Events Report',
     titleActivityReport: 'Activity Report',

package/lang/esCL.js

@@ -172,6 +172,7 @@ module.exports = {
     titleSpeedingReport: 'Informe de Excesos de Velocidad',
     titleZoneReport: 'Informe de Zonas',
     titleRefuelingReport: 'Informe de Cargas',
+    titleFuelConsumptionReport: 'Informe de Consumos',
     titleFuelDropReport: 'Fuel Drop Report',
     titleEventsReport: 'Informe de Eventos',
     titleActivityReport: 'Activity Report',

package/lang/ptBR.js

@@ -168,6 +168,7 @@ module.exports = {
     titleSpeedingReport: 'Relatório de Excessos de Velocidade',
     titleZoneReport: 'Relatório de Zonas',
     titleRefuelingReport: 'Relatório de Abastecimentos',
+    titleFuelConsumptionReport: 'Relatório de Consumos',
     titleFuelDropReport: 'Relatório de Perdas de Combustível',
     titleEventsReport: 'Relatório de Eventos',
     titleActivityReport: 'Relatório de Actividade',

package/lang/ptPT.js

@@ -174,6 +174,7 @@ module.exports = {
     titleSpeedingReport: 'Relatório de Excessos de Velocidade',
     titleZoneReport: 'Relatório de Zonas',
     titleRefuelingReport: 'Relatório de Abastecimentos',
+    titleFuelConsumptionReport: 'Relatório de Consumos',
     titleFuelDropReport: 'Relatório de Perdas de Combustível',
     titleEventsReport: 'Relatório de Eventos',
     titleActivityReport: 'Relatório de Actividade',

package/package.json

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

package/src/fuelconsumption-report.js

@@ -1,5 +1,9 @@
-const automaticReports = require("./automaticReports");
-const refuelingReport = require("./refueling-report");
+const automaticReports = require("./automaticReports")
+const refuelingReport = require("./refueling-report")
+const traccarHelper = require("./util/traccar")
+const odoo = require("./util/odoo")
+
+
 
 async function createFuelConsumptionReport(from, to, userData, traccar) {
     console.log('Create FuelConsumption Report')
@@ -13,66 +17,61 @@ async function createFuelConsumptionReport(from, to, userData, traccar) {
     }
 
     userData.devices.sort((a, b) => (a.name > b.name) ? 1 : -1)
-    const devicesToSlice = userData.devices.filter(d => automaticReports.deviceWithFuelInfo(d)).slice()
-    console.log('Devices:'+devicesToSlice.length)
-
-    const arrayOfArrays = automaticReports.sliceArray(devicesToSlice)
-    let data = []
-    for (const a of arrayOfArrays) {
-        const response = await traccar.reports.reportsTripsGet(from, to, a.map(d => d.id))
-        data = data.concat(response.data)
+
+    const allInOne =  await traccarHelper.getAllInOne(traccar, from, to, userData.devices, true, true, false, false)
+    const tripsData = allInOne.trips
+    const routeData = allInOne.route
+
+    const fuelServicesData = []
+    if(userData.withOdooServices) {
+        fuelServicesData.push(...(await odoo.getOdooFuelServices(traccar, from, to)))
     }
-    console.log('Trips:'+data.length)
 
-    if(data.length === 0) {
+    if(tripsData.length === 0) {
         return reportData
     }
 
     allData.totalDevices = 0
 
     for (const d of userData.devices) {
-        const trips = data.filter(t => t.deviceId===d.id)
+        const trips = tripsData.filter(t => t.deviceId===d.id)
+        const route = routeData.filter(r => r.deviceId===d.id)
+        const deviceFuelServices = fuelServicesData.filter(f => d.attributes.odooId === f.vehicle_id[0])
 
         if(trips.length > 0) {
-            const response = await traccar.reports.reportsRouteGet(from, to, [d.id])
-            const positions = response.data
-
-            const refuelingPositions = refuelingReport.calculateRefuelingPositions(d, positions)
-
-            const groupedRefuelings = refuelingPositions.reduce(
-                (entryMap, e) => entryMap.set(e.position.fixTime.substring(0, 10), [...entryMap.get(e.position.fixTime.substring(0, 10))||[], e]),
+            const refuelingPositions = await refuelingReport.calculateRefuelingPositions(userData, d, {route: route, trips: trips, fuelServices: deviceFuelServices})
+            const groupedRefuelingsByDay = refuelingPositions.reduce(
+                (entryMap, e) => entryMap.set(e.date.substring(0, 10), [...entryMap.get(e.date.substring(0, 10))||[], e]),
                 new Map()
             )
 
             trips.forEach(t => t.startDate = t.startTime.substring(0, 10))
-            const groupedTrips = trips.reduce(
+            const groupedTripsByDay = trips.reduce(
                 (entryMap, e) => entryMap.set(e.startDate, [...entryMap.get(e.startDate)||[], e]),
                 new Map()
             )
 
             const days = []
-            const keys = Array.from(groupedTrips.keys())
+            const keys = Array.from(groupedTripsByDay.keys())
+            const odooAvgConsumption = userData.withOdooServices ? calculateAvgConsumption(refuelingPositions, trips) : 0
 
-            keys.forEach(key => {
-                const dayTrips = groupedTrips.get(key)
-                const dayRefueling = groupedRefuelings.get(key)
+            keys.forEach(day => {
+                const dayTrips = groupedTripsByDay.get(day)
+                const dayRefueling = groupedRefuelingsByDay.get(day)
                 const distance = dayTrips.reduce((a, b) => a + b.distance, 0)
-                let spentFuel = d.attributes.xpert ?
-                    automaticReports.calculateXpertSpentFuel(key, positions)
-                    :
-                    automaticReports.calculateSpentFuel(dayTrips.reduce((a, b) => a + b.spentFuel, 0), d)
+                const spentFuel = calculateConsumption(userData, d, day, odooAvgConsumption, { trips: dayTrips, route: route })
 
-                const day = {
-                    date: key,
+                const dataRow = {
+                    date: day,
                     distance: distance,
                     spentFuel: spentFuel,
-                    avgConsumption: distance > 0 && spentFuel > 0 ? Math.round(spentFuel * 100 / (distance / 1000)) : 0,
+                    avgConsumption: userData.withOdooServices ? odooAvgConsumption : distance > 0 && spentFuel > 0 ? Math.round(spentFuel * 100 / (distance / 1000)) : 0,
                     endOdometer: dayTrips.slice(-1)[0].endOdometer,
                     duration: dayTrips.reduce((a, b) => a + b.duration, 0),
                     refueling: (dayRefueling && dayRefueling.length > 0) ? dayRefueling.reduce((a, b) => a + b.diff, 0) : 0,
                 }
 
-                days.push(day)
+                days.push(dataRow)
             })
 
             if (days.length > 0) {
@@ -90,4 +89,20 @@ async function createFuelConsumptionReport(from, to, userData, traccar) {
     return reportData
 }
 
-exports.createFuelConsumptionReport = createFuelConsumptionReport;
+function calculateAvgConsumption(refuelingPositions, trips) {
+    const odooTotalfuel = refuelingPositions.reduce((a, b) => a + b.diff, 0)
+    const totalKms = trips.reduce((a, b) => a + b.distance, 0)
+    return Math.round(odooTotalfuel * 100 / (totalKms / 1000))
+}
+
+function calculateConsumption(userData, d, day, avgConsumption, data) {
+    if (d.attributes.xpert) {
+        return automaticReports.calculateXpertSpentFuel(day, data.route)
+    }
+    if (userData.withOdooServices) {
+        return Math.round((avgConsumption * (data.trips.reduce((a, b) => a + b.distance, 0)/1000)) / 100)
+    }
+    return automaticReports.calculateSpentFuel(data.trips.reduce((a, b) => a + b.spentFuel, 0), d)
+}
+
+exports.createFuelConsumptionReport = createFuelConsumptionReport

package/src/index.test.js

@@ -295,4 +295,33 @@ describe('Test_Reports', function() {
         assert.equal(device.refuelings.length, 4)
 
     }, 30000)
+    it('FuelConsumption Report', async () => {
+        const report = await getReports()
+        const userData = await report.getUserData()
+        userData.devices = userData.devices.filter(d => d.id === 22326)
+        const data = await report.fuelConsumptionReport(new Date(2022, 0, 1, 0, 0, 0, 0),
+            new Date(2022, 0, 10, 23, 59, 59, 0),
+            userData)
+
+        assert.equal(data.length, 1)
+        const device = data[0].devices.find(d => d.device.id===22326)
+        console.log(device.days)
+        assert.equal(device.days.length, 8)
+        assert.equal(device.days[0].spentFuel, 2)
+
+    }, 30000)
+    it('FuelConsumption Odoo Report', async () => {
+        const report = await getReports()
+        const userData = await report.getUserData()
+        userData.withOdooServices = true
+        userData.devices = userData.devices.filter(d => d.id === 25508)
+        const data = await report.fuelConsumptionReport(new Date(2022, 1, 1, 0, 0, 0, 0),
+            new Date(2022, 1, 28, 23, 59, 59, 0),
+            userData)
+
+        assert.equal(data.length, 1)
+        const device = data[0].devices.find(d => d.device.id===25508)
+        assert.equal(device.days.length, 25)
+
+    }, 30000)
 })

package/src/refueling-report.js

@@ -1,5 +1,5 @@
-const helpers = require("turf");
-const automaticReports = require("./automaticReports");
+const helpers = require("turf")
+const automaticReports = require("./automaticReports")
 
 const positionsToCheck = 15
 
@@ -40,7 +40,7 @@ async function createRefuelingReport(from, to, userData, traccar) {
         const positions = data.filter(t => t.deviceId===d.id)
 
         if(positions.length > 0) {
-            const refuelingPositions = this.calculateRefuelingPositions(d, positions)
+            const refuelingPositions = await this.calculateRefuelingPositions(userData, d, {route: positions})
 
             if (userData.drivers.length > 0) {
                 refuelingPositions.forEach(p => {
@@ -106,53 +106,69 @@ function coordsDistance(lon1, lat1, lon2, lat2) {
     return (helpers.distance(from, to) * 1000)
 }
 
-function calculateRefuelingPositions(d, positions) {
+async function calculateRefuelingPositions(userData, d, data) {
     const refuelingPositions = []
-    let refuelingActivated = false
-    let currentValue = null
-    let positionsChecked = 0
-    let lastRefuelingIndex = 0
-    positions.forEach(function(element, index, array){
-        if(!element.attributes.ignition && refuelingActivated && !currentValue){
-            //Ignition is off and Refueling is Active and there is no current value
-
-            //Get 5 position before the ignition off to calculate the current value of the fuel tank level
-            //lastRefuelingIndex is used to avoid re-analyzing positions prior to a refueling
-            const before = (index > 5 ? array.slice((index-6 < lastRefuelingIndex ? lastRefuelingIndex : index-6), index-1) : array.slice(0, index-1)).filter(b => b.attributes.ignition && b.attributes.fuel)
-            currentValue = Math.round(before.reduce((a, b) => a + b.attributes.fuel, 0) / before.length )
-
-            positionsChecked = 0
-        }
 
-        if(element.attributes.ignition && refuelingActivated && currentValue) {
-            //Ignition is on and Refueling is Active and there is a current value
-            //Calculate the value of the fuel tank level after turning the ignition back on
-            const after = (array.length > index + 5 ? array.slice(index, index+1) : array.slice(index)).filter(b => b.attributes.ignition && b.attributes.fuel)
-            const newValue = Math.round(after.reduce((a, b) => a + b.attributes.fuel, 0) / after.length )
-
-            const diff = automaticReports.calculateFuelDiff(currentValue, newValue, d)
-            if (diff > 20) {
-                //New refueling detected
-                const value = Math.round(diff * d.attributes.fuel_tank_capacity / 100)
-                refuelingPositions.push({position: element, diff: value})
-                lastRefuelingIndex = index
-                positionsChecked = positionsToCheck+1 // to reset values
+    if(userData.withOdooServices && d.attributes.odooId) {
+        console.log(data.fuelServices)
+        data.fuelServices.forEach(s => {
+            const serviceDate = new Date(s.date)
+            serviceDate.setHours(23, 59, 59, 59)
+
+            const routeBeforeService = data.route.filter(r => new Date(r.fixTime).getTime() < serviceDate.getTime())
+
+            const quantity = s.notes.split(':')[1].replace(',', '.') || 0
+
+            if (routeBeforeService.length) {
+                refuelingPositions.push({date: s.date, diff: Number.parseFloat(quantity), cost: s.amount})
             }
+        })
+    } else {
+        let refuelingActivated = false
+        let currentValue = null
+        let positionsChecked = 0
+        let lastRefuelingIndex = 0
+        data.route.forEach(function (element, index, array) {
+            if (!element.attributes.ignition && refuelingActivated && !currentValue) {
+                //Ignition is off and Refueling is Active and there is no current value
+
+                //Get 5 position before the ignition off to calculate the current value of the fuel tank level
+                //lastRefuelingIndex is used to avoid re-analyzing positions prior to a refueling
+                const before = (index > 5 ? array.slice((index - 6 < lastRefuelingIndex ? lastRefuelingIndex : index - 6), index - 1) : array.slice(0, index - 1)).filter(b => b.attributes.ignition && b.attributes.fuel)
+                currentValue = Math.round(before.reduce((a, b) => a + b.attributes.fuel, 0) / before.length)
 
-            if(positionsChecked > positionsToCheck) {
-                refuelingActivated = false
-                currentValue = null
                 positionsChecked = 0
-            } else {
-                positionsChecked++
             }
-        }
 
-        if(element.attributes.ignition && !refuelingActivated) {
-            refuelingActivated = true
-        }
-    })
+            if (element.attributes.ignition && refuelingActivated && currentValue) {
+                //Ignition is on and Refueling is Active and there is a current value
+                //Calculate the value of the fuel tank level after turning the ignition back on
+                const after = (array.length > index + 5 ? array.slice(index, index + 1) : array.slice(index)).filter(b => b.attributes.ignition && b.attributes.fuel)
+                const newValue = Math.round(after.reduce((a, b) => a + b.attributes.fuel, 0) / after.length)
+
+                const diff = automaticReports.calculateFuelDiff(currentValue, newValue, d)
+                if (diff > 20) {
+                    //New refueling detected
+                    const value = Math.round(diff * d.attributes.fuel_tank_capacity / 100)
+                    refuelingPositions.push({position: element, date: element.fixTime, diff: value})
+                    lastRefuelingIndex = index
+                    positionsChecked = positionsToCheck + 1 // to reset values
+                }
+
+                if (positionsChecked > positionsToCheck) {
+                    refuelingActivated = false
+                    currentValue = null
+                    positionsChecked = 0
+                } else {
+                    positionsChecked++
+                }
+            }
 
+            if (element.attributes.ignition && !refuelingActivated) {
+                refuelingActivated = true
+            }
+        })
+    }
     return refuelingPositions
 }
 

package/src/tests/index.js

@@ -16,7 +16,7 @@ axiosCookieJarSupport(axios)
 
 const getReports = async() => {
     await new SessionApi(traccarConfig, null, axios).sessionPost(process.env.email, process.env.password)
-    return new Index(traccarConfig, axios)
+    return new Index(traccarConfig, axios, cookieJar)
 }
 
 exports.getReports = getReports

package/src/util/odoo.js

@@ -0,0 +1,14 @@
+
+async function getOdooFuelServices(traccar, from, to) {
+    const url = `/odoo/reports/refuelingServices?startDate=${from.toDateString()}&endDate=${to.toDateString()}`
+
+    const {data} = await traccar.axios.get(url,{
+        jar: traccar.cookieJar,
+        withCredentials: true })
+
+    console.log(data)
+
+    return data
+}
+
+exports.getOdooFuelServices = getOdooFuelServices