fleetmap-reports 1.0.502 → 1.0.504

package/package.json

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

package/src/index.test.js

@@ -15,7 +15,6 @@ 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()
@@ -37,7 +36,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
-  }, 30000)
+  }, 20000)
   // eslint-disable-next-line no-undef
   it('Trip by device', async () => {
     const report = await getReports()
@@ -377,7 +376,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
@@ -392,21 +391,6 @@ 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/speeding-report.js

@@ -80,21 +80,23 @@ async function createSpeedingReportByDevice (from, to, userData, traccarInstance
     xpert: devices.filter(d => d && d.attributes && d.attributes.xpert).length > 0
   }
 
-  const sliced = automaticReports.sliceArray(devices, 10)
+  const _sliced = automaticReports.sliceArray(automaticReports.sliceArray(devices, 10), 100)
 
   let deviceCount = 0
-  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}`)
-    }
-  }))
+  for (const sliced of _sliced) {
+    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,20 +1,14 @@
 
-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()}`
 
-  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
-  })
+    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

package/src/util/traccar.js

@@ -91,7 +91,6 @@ async function getAllInOne (
     const requests = []
     for (const _chunk of automaticReports.sliceArray(chunk, devicesPerRequest)) {
       const u = url + '&' + _chunk.map(d => `deviceId=${d.id}`).join('&')
-      console.log(u)
       requests.push(
         traccar.axios.get(u, {
           jar: traccar.cookieJar,