fleetmap-reports 1.0.791 → 1.0.792

package/package.json

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

package/src/activity-report.js

@@ -74,23 +74,16 @@ async function createActivityReportByGroup (from, to, userData, traccarInstance)
   return reportData
 }
 
-async function executeServerSide (allData, sliced, from, to, userData, totalDevices) {
-  let deviceCount = 0
+async function executeServerSide (allData, sliced, from, to, userData) {
+  const requests = []
   for (const devices of sliced) {
     const url = `https://${process.env.SERVER_HOST}/reports/activity-report`
-    const data = await axios.post(url, {
-      from,
-      to,
-      devices,
-      userData: { ...userData, devices },
-      deviceCount,
-      totalDevices,
-      sliceSize: 20
-    }, { withCredentials: true }).then(d => d.data)
-
-    allData.devices.push(...(data[0].devices))
-    deviceCount += devices.length
+    requests.push(axios.post(url, { from, to, userData: { ...userData, devices } }, { withCredentials: true }).then(d => {
+      const result = d.data
+      allData.devices.push(...(result[0].devices))
+    }))
   }
+  await Promise.all(requests)
 }
 
 async function createActivityReportByDevice (from, to, userData, traccarInstance) {
@@ -104,11 +97,11 @@ async function createActivityReportByDevice (from, to, userData, traccarInstance
   }
 
   if (isClientSide() && allDevices.length > 200) {
-    const sliced = automaticReports.sliceArray(allDevices, 20)
+    const sliced = automaticReports.sliceArray(allDevices, 60)
     await executeServerSide(allData, sliced, from, to, userData, allDevices.length)
   } else {
     let deviceCount = 0
-    const sliced = automaticReports.sliceArray(allDevices, 10)
+    const sliced = automaticReports.sliceArray(allDevices, 20)
     for (const devices of sliced) {
       let summaries = []
       const needRoute = userData.groupByDay || !userData.allWeek
@@ -116,7 +109,7 @@ async function createActivityReportByDevice (from, to, userData, traccarInstance
         trips,
         route,
         summary
-      } = await traccar.getAllInOne(traccarInstance, from, to, devices, needRoute, true, false, !userData.groupByDay, deviceCount, allDevices.length)
+      } = await traccar.getAllInOne(traccarInstance, from, to, devices, needRoute, true, false, !userData.groupByDay, deviceCount, allDevices.length, 10)
 
       if (userData.groupByDay) {
         console.log('trips:' + trips.length)