fleetmap-reports 1.0.407 → 1.0.410

package/package.json

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

package/src/util/traccar.js

@@ -77,30 +77,33 @@ async function getAllInOne (
   currentDeviceCount = 0,
   totalDevices = devices.length,
   sliceSize = 5,
-  vehiclesByRequest = 1) {
+  devicesPerRequest = 1,
+  counter = undefined) {
   let url = `/reports/allinone?from=${from.toISOString()}&to=${to.toISOString()}`
   if (getRoutes) url += '&type=route'
   if (getTrips) url += '&type=trips'
   if (getStops) url += '&type=stops'
   if (getSummary) url += '&type=summary'
 
-  console.log('getAllInOn', devices.map(d => d.id))
-
   const sliced = automaticReports.sliceArray(devices, sliceSize)
   const result = []
   for (const chunk of sliced) {
     const requests = []
-    for (const _chunk of automaticReports.sliceArray(chunk, vehiclesByRequest)) {
+    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,
           withCredentials: true
         }).then(r => r.data).then(x => {
           console.log('LOADING_MESSAGE:' + _chunk[0].name)
-          currentDeviceCount += vehiclesByRequest
-          console.log(`PROGRESS_PERC:${currentDeviceCount / totalDevices * 100}`)
+          if (counter) {
+            counter.count += devicesPerRequest
+            console.log(`PROGRESS_PERC:${counter.count / totalDevices * 100}`)
+          } else {
+            currentDeviceCount += devicesPerRequest
+            console.log(`PROGRESS_PERC:${currentDeviceCount / totalDevices * 100}`)
+          }
           return x
         }))
     }

package/src/zone-report.js

@@ -30,7 +30,7 @@ async function createZoneReport (from, to, userData, traccar) {
           group: g,
           xpert: devices.filter(d => d.attributes.xpert).length > 0
         }
-
+        console.log('LOADING_MESSAGE:' + 'Eventos...')
         const response = await traccar.reports.reportsEventsGet(from, to, null, [g.id], types)
         const data = response.data
 
@@ -53,22 +53,26 @@ async function createZoneReport (from, to, userData, traccar) {
     xpert: devices.filter(d => d.attributes.xpert).length > 0
   }
 
-  const sliced = automaticReports.sliceArray(devices, 5)
+  const sliced = automaticReports.sliceArray(devices, 30)
 
-  let deviceCount = 0
+  const deviceCount = { count: 0 }
+  const promises = []
   for (const slice of sliced) {
-    const allInOne = await traccarHelper.getAllInOne(traccar, from, to, slice, true, false, false, false, deviceCount, devices.length, 30, 10)
-    const routeData = allInOne.route
+    promises.push(traccarHelper.getAllInOne(
+      traccar, from, to, slice, true, false, false, false,
+      deviceCount, devices.length, 20, 5, deviceCount).then(async allInOne => {
+      const routeData = allInOne.route
 
-    const data = getInAndOutEvents(slice, routeData, userData)
+      const data = getInAndOutEvents(slice, routeData, userData)
 
-    console.log('Geofence Enter/Exit Alerts:' + data.length)
+      console.log('Geofence Enter/Exit Alerts:' + data.length)
 
-    if (data.length) {
-      allData.devices.push(...await processDevices(from, to, devices, userData.drivers, userData.geofences, data, traccar))
-    }
-    deviceCount = deviceCount + slice.length
+      if (data.length) {
+        allData.devices.push(...await processDevices(from, to, devices, userData.drivers, userData.geofences, data, traccar))
+      }
+    }))
   }
+  await Promise.all(promises)
 
   reportData.push(allData)