fleetmap-reports 1.0.498 → 1.0.500

package/package.json

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

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('Speeding by device', async () => {
     const report = await getReports()
@@ -36,7 +37,7 @@ describe('Test_Reports', function () {
     assert.equal(device.alerts.length, 13) // Total Alerts
     assert.equal(totalDistance, 46.64576895855739) // Total Kms
     assert.equal(totalEventTime, 1402000) // Total Duration
-  }, 20000)
+  }, 30000)
   // eslint-disable-next-line no-undef
   it('Trip by device', async () => {
     const report = await getReports()
@@ -376,7 +377,7 @@ describe('Test_Reports', function () {
     assert.equal(device.days[0].spentFuel, 2)
   }, 30000)
   // eslint-disable-next-line no-undef
-  it('FuelConsumption Odoo Report', async () => {
+  /* it('FuelConsumption Odoo Report', async () => {
     const report = await getReports()
     const userData = await report.getUserData()
     userData.withOdooServices = true
@@ -391,6 +392,21 @@ describe('Test_Reports', function () {
     assert.equal(device.days.length, 25)
   }, 30000)
   // eslint-disable-next-line no-undef
+  it('FuelConsumption Odoo13 Report', async () => {
+    const report = await getReports()
+    const userData = await report.getUserData()
+    userData.withOdooServices = true
+    userData.devices = userData.devices.filter(d => d.id === 22326)
+    const data = await report.fuelConsumptionReport(
+        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 === 22326)
+    assert.equal(device.days.length, 25)
+  }, 30000) */
+  // eslint-disable-next-line no-undef
   it('Zone Report', async () => {
     const report = await getReports()
     const userData = await report.getUserData()

package/src/location-report.js

@@ -6,6 +6,7 @@ const { getUserPartner } = require('fleetmap-partners')
 const { convertToLocaleString, getTranslations } = require('./util/utils')
 const traccarHelper = require('./util/traccar')
 const { devicesToProcess } = require('./util/device')
+const automaticReports = require('./automaticReports')
 
 const fileName = 'LocationReport'
 
@@ -86,27 +87,35 @@ async function createLocationReportByDevice (from, to, userData, traccar) {
     xpert: devices.filter(d => d.attributes.xpert).length > 0
   }
 
-  const allInOne = await traccarHelper.getAllInOne(traccar, from, to, devices, true, false, false, false)
-  const routeData = allInOne.route
+  const sliced = automaticReports.sliceArray(devices, 5)
 
-  console.log('Locations:' + routeData.length)
+  let deviceCount = 0
+  for (const slice of sliced) {
+    const allInOne = await traccarHelper.getAllInOne(traccar, from, to, slice, true, false, false, false, deviceCount, devices.length)
+    const routeData = allInOne.route
 
-  if (routeData.length > 0) {
-    allData.devices = processDevices(from, to, devices, userData.drivers, routeData)
+    console.log('Locations:' + routeData.length)
+
+    if (routeData.length > 0) {
+      allData.devices.push(...processDevices(from, to, slice, {
+        route: routeData
+      }, userData))
+    }
+    deviceCount = deviceCount + slice.length
   }
 
   return allData
 }
 
-function processDevices (from, to, devices, drivers, data) {
+function processDevices (from, to, devices, data, userData) {
   const devicesResult = []
 
   for (const d of devices) {
-    const positions = data.filter(t => t.deviceId === d.id)
+    const positions = data.route.filter(t => t.deviceId === d.id)
 
-    if (drivers.length > 0) {
+    if (userData.drivers.length > 0) {
       positions.forEach(p => {
-        const driver = drivers.find(d => d.uniqueId === p.attributes.driverUniqueId)
+        const driver = userData.drivers.find(d => d.uniqueId === p.attributes.driverUniqueId)
         if (driver) {
           p.driverName = driver.name
         }

package/src/speeding-report.js

@@ -83,18 +83,18 @@ async function createSpeedingReportByDevice (from, to, userData, traccarInstance
   const sliced = automaticReports.sliceArray(devices, 10)
 
   let deviceCount = 0
-  for (const slice of sliced) {
-    const { routes, events } = await getEvents(traccarInstance, from, to, slice, userData, deviceCount, devices.length, slice.length)
-    if (processServerSide()) {
-      console.log('LOADING_MESSAGE:' + slice[0].name)
-      console.log(`PROGRESS_PERC:${deviceCount / devices.length * 100}`)
-    }
+  await Promise.all(sliced.map(async slice => {
+    const { routes, events } = await getEvents(traccarInstance, from, to, slice, userData, deviceCount, devices.length, slice.length)    
     if (events.length > 0) {
       const devicesProcessed = await processDevices(from, to, slice, events, routes, userData)
       allData.devices.push(...devicesProcessed)
     }
     deviceCount = deviceCount + slice.length
-  }
+    if (processServerSide()) {
+      console.log('LOADING_MESSAGE:' + slice[0].name)
+      console.log(`PROGRESS_PERC:${deviceCount / devices.length * 100}`)
+    }
+  }))
 
   return allData
 }

package/src/util/odoo.js

@@ -1,14 +1,20 @@
 
-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 })
+  console.log('LOADING_MESSAGE:' + url)
+  console.log(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)
+  console.log(data)
 
-    return data
+  return data
 }
 
 exports.getOdooFuelServices = getOdooFuelServices