fleetmap-reports 1.0.513 → 1.0.515

package/package.json

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

package/src/automaticReports.js

@@ -1,67 +1,66 @@
 const moment = require('moment')
 
-function sliceArray(longArray,  size = 1) {
-    const arrayToSlice = longArray.slice()
+function sliceArray (longArray, size = 1) {
+  const arrayToSlice = longArray.slice()
 
-    const arrayOfArrays = []
-    for (let i=0; i<arrayToSlice.length; i+=size) {
-        arrayOfArrays.push(arrayToSlice.slice(i,i+size));
-    }
+  const arrayOfArrays = []
+  for (let i = 0; i < arrayToSlice.length; i += size) {
+    arrayOfArrays.push(arrayToSlice.slice(i, i + size))
+  }
 
-    return arrayOfArrays
+  return arrayOfArrays
 }
 
-function deviceWithFuelInfo(device) {
-    return device.attributes.xpert
-        || (device.attributes.fuel_low_threshold >= 0 && device.attributes.fuel_high_threshold >= 0 && device.attributes.fuel_tank_capacity)
+function deviceWithFuelInfo (device) {
+  return device.attributes.odooId || device.attributes.xpert ||
+        (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 fuelSignalInverter (device) {
+  return device.attributes.fuel_low_threshold <= device.attributes.fuel_high_threshold ? 1 : -1
 }
 
-function calculateFuelDiff(a, b, device) {
-    const diff = (b - a) * fuelSignalInverter(device)
-    if(device.attributes.xpert) {
-        return diff
-    } else {
-        return (diff * 100) / Math.abs(device.attributes.fuel_low_threshold - device.attributes.fuel_high_threshold)
-    }
+function calculateFuelDiff (a, b, device) {
+  const diff = (b - a) * fuelSignalInverter(device)
+  if (device.attributes.xpert) {
+    return diff
+  } else {
+    return (diff * 100) / Math.abs(device.attributes.fuel_low_threshold - device.attributes.fuel_high_threshold)
+  }
 }
 
-function calculateXpertSpentFuel(date, positions) {
-    const begin = moment(date, 'YYYY-MM-DD').startOf('day')
-    const end = moment(date, 'YYYY-MM-DD').endOf('day')
-    const datePositions = positions.filter(p => moment(p.fixTime).isAfter(begin) && moment(p.fixTime).isBefore(end))
-    const xpertMessages = datePositions.map(p => p.attributes.xpert).flat().filter(p => p)
-    const xpertEndTripMessage = xpertMessages.filter(x => x.type === '3')
-    if(xpertEndTripMessage.length > 1) {
-        const diff = xpertEndTripMessage[xpertEndTripMessage.length-1].total_fuel - xpertEndTripMessage[0].total_fuel
-        console.log('Diff:',diff)
-        return Math.round(diff)
-    }
-    return 0
+function calculateXpertSpentFuel (date, positions) {
+  const begin = moment(date, 'YYYY-MM-DD').startOf('day')
+  const end = moment(date, 'YYYY-MM-DD').endOf('day')
+  const datePositions = positions.filter(p => moment(p.fixTime).isAfter(begin) && moment(p.fixTime).isBefore(end))
+  const xpertMessages = datePositions.map(p => p.attributes.xpert).flat().filter(p => p)
+  const xpertEndTripMessage = xpertMessages.filter(x => x.type === '3')
+  if (xpertEndTripMessage.length > 1) {
+    const diff = xpertEndTripMessage[xpertEndTripMessage.length - 1].total_fuel - xpertEndTripMessage[0].total_fuel
+    console.log('Diff:', diff)
+    return Math.round(diff)
+  }
+  return 0
 }
 
-function calculateXpertDistance(date, positions) {
-    const begin = moment(date, 'YYYY-MM-DD').startOf('day')
-    const end = moment(date, 'YYYY-MM-DD').endOf('day')
-    const datePositions = positions.filter(p => moment(p.fixTime).isAfter(begin) && moment(p.fixTime).isBefore(end))
+function calculateXpertDistance (date, positions) {
+  const begin = moment(date, 'YYYY-MM-DD').startOf('day')
+  const end = moment(date, 'YYYY-MM-DD').endOf('day')
+  const datePositions = positions.filter(p => moment(p.fixTime).isAfter(begin) && moment(p.fixTime).isBefore(end))
 
-    return datePositions.reduce((a, b) => a + b.attributes.distance, 0)
+  return datePositions.reduce((a, b) => a + b.attributes.distance, 0)
 }
 
-function calculateSpentFuel(value, device) {
-    if(!value)
-        return value
+function calculateSpentFuel (value, device) {
+  if (!value) { return value }
 
-    if(device.attributes.xpert) {
-        return Math.round(( value * device.attributes.fuel_tank_capacity) / 100)
-    } else {
-        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)
-    }
+  if (device.attributes.xpert) {
+    return Math.round((value * device.attributes.fuel_tank_capacity) / 100)
+  } else {
+    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)
+  }
 }
 
 exports.sliceArray = sliceArray

package/src/fuelconsumption-report.js

@@ -36,7 +36,7 @@ async function createFuelConsumptionReport (from, to, userData, traccar) {
   for (const d of devices) {
     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])
+    const deviceFuelServices = fuelServicesData.filter(f => Number.parseInt(d.attributes.odooId) === f.vehicle_id[0])
 
     if (trips.length > 0) {
       const refuelingPositions = await refuelingReport.calculateRefuelingPositions(userData, d, { route, trips, fuelServices: deviceFuelServices })
@@ -45,17 +45,16 @@ async function createFuelConsumptionReport (from, to, userData, traccar) {
         new Map()
       )
 
-      trips.forEach(t => {
-        t.startDate = t.startTime.substring(0, 10)
-      })
+      trips.forEach(t => { t.startDate = t.startTime.substring(0, 10) })
       const groupedTripsByDay = trips.reduce(
         (entryMap, e) => entryMap.set(e.startDate, [...entryMap.get(e.startDate) || [], e]),
         new Map()
       )
 
+      const odooAvgConsumption = userData.withOdooServices ? getOdooAvgConsumption(refuelingPositions, trips) : 0
+
       const days = []
       const keys = Array.from(groupedTripsByDay.keys())
-      const odooAvgConsumption = userData.withOdooServices ? calculateAvgConsumption(refuelingPositions, trips) : 0
 
       keys.forEach(day => {
         const dayTrips = groupedTripsByDay.get(day)
@@ -67,7 +66,7 @@ async function createFuelConsumptionReport (from, to, userData, traccar) {
           date: day,
           distance,
           spentFuel,
-          avgConsumption: userData.withOdooServices ? odooAvgConsumption : distance > 0 && spentFuel > 0 ? Math.round(spentFuel * 100 / (distance / 1000)) : 0,
+          avgConsumption: userData.withOdooServices ? odooAvgConsumption : getCanAvgConsumption(userData, odooAvgConsumption, distance, spentFuel),
           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
@@ -91,12 +90,16 @@ async function createFuelConsumptionReport (from, to, userData, traccar) {
   return reportData
 }
 
-function calculateAvgConsumption (refuelingPositions, trips) {
+function getOdooAvgConsumption (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 getCanAvgConsumption (userData, distance, spentFuel) {
+  return distance > 0 && spentFuel > 0 ? Math.round(spentFuel * 100 / (distance / 1000)) : 0
+}
+
 function calculateConsumption (userData, d, day, avgConsumption, data) {
   if (d.attributes.xpert) {
     return automaticReports.calculateXpertSpentFuel(day, data.route)

package/src/index.test.js

@@ -15,6 +15,7 @@ async function getSpeedingReport (report, userData) {
 
 // eslint-disable-next-line no-undef
 describe('Test_Reports', function () {
+  this.timeout(5000000)
   // eslint-disable-next-line no-undef
   it('works with road speed limits', async () => {
     const report = await getReports()
@@ -25,7 +26,7 @@ describe('Test_Reports', function () {
     assert.equal(totalDistance, 36.63687856826021) // Total Kms
     assert.equal(totalEventTime, 1524000) // Total Duration
   }, 200000)
-
+  // eslint-disable-next-line no-undef
   it('works by device speed limit', async () => {
     const report = await getReports()
     const userData = await report.getUserData()
@@ -69,7 +70,7 @@ describe('Test_Reports', function () {
     assert.equal(device.trips[0].idleTime, 602000)
     assert.equal(device.trips[1].endPOIName, undefined)
     assert.equal(device.totalDistance, 339170.3099999875) // Total Kms
-  }, 20000)
+  }, 30000)
   // eslint-disable-next-line no-undef
   it('Trip by driver', async () => {
     const report = await getReports()
@@ -396,15 +397,15 @@ describe('Test_Reports', function () {
     const report = await getReports()
     const userData = await report.getUserData()
     userData.withOdooServices = true
-    userData.devices = userData.devices.filter(d => d.id === 25508)
+    userData.devices = userData.devices.filter(d => d.id === 22326)
     const data = await report.fuelConsumptionReport(
-      new Date(Date.UTC(2022, 1, 1, 0, 0, 0, 0)),
-      new Date(Date.UTC(2022, 1, 28, 23, 59, 59, 0)),
+      new Date(Date.UTC(2022, 9, 1, 0, 0, 0, 0)),
+      new Date(Date.UTC(2022, 9, 31, 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)
+    const device = data[0].devices.find(d => d.device.id === 22326)
+    assert.equal(device.days.length, 23)
   }, 30000)
   // eslint-disable-next-line no-undef
   it('Zone Report', async () => {

package/src/refueling-report.js

@@ -3,6 +3,8 @@ const automaticReports = require('./automaticReports')
 const { devicesToProcess } = require('./util/device')
 const distance = require('@turf/distance')
 const { getTranslations } = require('./util/utils')
+const odoo = require('./util/odoo')
+const traccarHelper = require('./util/traccar')
 
 const positionsToCheck = 15
 
@@ -22,13 +24,16 @@ async function createRefuelingReport (from, to, userData, traccar) {
   console.log('Devices:' + devices.length)
 
   const arrayOfArrays = automaticReports.sliceArray(devices)
-  let data = []
+  const data = []
   for (const a of arrayOfArrays) {
-    const response = await traccar.reports.reportsRouteGet(from, to, a.map(d => d.id))
-    data = data.concat(response.data)
+    const allInOne = await traccarHelper.getAllInOne(traccar, from, to, a, true, false, false, false)
+    data.push(allInOne.route)
   }
 
-  console.log('Locations:' + data.length)
+  const fuelServicesData = []
+  if (userData.withOdooServices) {
+    fuelServicesData.push(...(await odoo.getOdooFuelServices(traccar, from, to)))
+  }
 
   if (data.length === 0) {
     return reportData
@@ -40,9 +45,10 @@ async function createRefuelingReport (from, to, userData, traccar) {
 
   for (const d of devices) {
     const positions = data.filter(t => t.deviceId === d.id)
+    const deviceFuelServices = fuelServicesData.filter(f => Number.parseInt(d.attributes.odooId) === f.vehicle_id[0])
 
     if (positions.length > 0) {
-      const refuelingPositions = await this.calculateRefuelingPositions(userData, d, { route: positions })
+      const refuelingPositions = await this.calculateRefuelingPositions(userData, d, { route: positions, fuelServices: deviceFuelServices })
 
       if (userData.drivers.length > 0) {
         refuelingPositions.forEach(p => {
@@ -121,7 +127,7 @@ async function calculateRefuelingPositions (userData, d, data) {
 
       const routeBeforeService = data.route.filter(r => new Date(r.fixTime).getTime() < serviceDate.getTime())
 
-      const quantity = s.notes.split(':')[1].replace(',', '.') || 0
+      const quantity = s.liter
 
       if (routeBeforeService.length) {
         refuelingPositions.push({ date: s.date, diff: Number.parseFloat(quantity), cost: s.amount })

package/src/speeding-report.js

@@ -343,7 +343,7 @@ async function getHereEvents (devices, routes, threshold) {
         events.push(...reduced)
         resolve()
       }).catch(e => {
-        console.warn('error on route match, moving on', e.message)
+        console.warn('route match, moving on', e.message)
         resolve()
       })
     }))

package/src/util/odoo.js

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