fleetmap-reports 1.0.785 → 1.0.787

package/package.json

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

package/src/activity-report.js

@@ -1,5 +1,5 @@
 const automaticReports = require('./automaticReports')
-const { convertMS, getDates, getTranslations, weekDaySelected, convertToLocaleString } = require('./util/utils')
+const { convertMS, getDates, getTranslations, weekDaySelected, convertToLocaleString, isClientSide } = require('./util/utils')
 const jsPDF = require('jspdf')
 require('jspdf-autotable')
 const {
@@ -14,6 +14,7 @@ const tripHelper = require('./util/trips')
 const { devicesToProcess } = require('./util/device')
 const { getDriverData } = require('./util/driver')
 const { calculateConsumption } = require('./util/fuel')
+const { default: axios } = require('axios')
 
 const fileName = 'ActivityReport'
 
@@ -73,6 +74,25 @@ async function createActivityReportByGroup (from, to, userData, traccarInstance)
   return reportData
 }
 
+async function executeServerSide (allData, sliced, from, to, userData, totalDevices) {
+  let deviceCount = 0
+  for (const devices of sliced) {
+    const url = `https://${process.env.SERVER_HOST}/reports/activity-report`
+    const data = await axios.post(url, {
+      from,
+      to,
+      sliced,
+      userData,
+      deviceCount,
+      totalDevices,
+      sliceSize: 50
+    }, { withCredentials: true }).then(d => d.data)
+
+    allData.devices.push(data.devices)
+    deviceCount += devices.length
+  }
+}
+
 async function createActivityReportByDevice (from, to, userData, traccarInstance) {
   const allDevices = devicesToProcess(userData)
 
@@ -83,48 +103,52 @@ async function createActivityReportByDevice (from, to, userData, traccarInstance
     to
   }
 
-  const sliced = automaticReports.sliceArray(allDevices, 10)
-  let deviceCount = 0
-  for (const devices of sliced) {
-    let summaries = []
-    const needRoute = userData.groupByDay || !userData.allWeek
-    const {
-      trips,
-      route,
-      summary
-    } = await traccar.getAllInOne(traccarInstance, from, to, devices, needRoute, true, false, !userData.groupByDay, deviceCount, allDevices.length)
+  const sliced = automaticReports.sliceArray(allDevices, 50)
+  if (isClientSide() && allDevices.length > 200) {
+    await executeServerSide(allData, sliced, from, to, userData, allDevices.length)
+  } else {
+    let deviceCount = 0
+    for (const devices of sliced) {
+      let summaries = []
+      const needRoute = userData.groupByDay || !userData.allWeek
+      const {
+        trips,
+        route,
+        summary
+      } = await traccar.getAllInOne(traccarInstance, from, to, devices, needRoute, true, false, !userData.groupByDay, deviceCount, allDevices.length)
 
-    if (userData.groupByDay) {
-      console.log('trips:' + trips.length)
+      if (userData.groupByDay) {
+        console.log('trips:' + trips.length)
 
-      if (trips.length) {
-        tripHelper.checkTripsKms(traccarInstance, from, to, devices, { trips, route })
-      }
+        if (trips.length) {
+          tripHelper.checkTripsKms(traccarInstance, from, to, devices, { trips, route })
+        }
 
-      const dates = getDates(from, to)
-      for (const date of dates) {
-        if (userData.allWeek || !userData.weekDays || !userData.dayHours) {
-          const fromByDay = new Date(date.getFullYear(), date.getMonth(), date.getDate(), 0, 0, 0)
-          const toByDay = new Date(date.getFullYear(), date.getMonth(), date.getDate(), 23, 59, 59)
+        const dates = getDates(from, to)
+        for (const date of dates) {
+          if (userData.allWeek || !userData.weekDays || !userData.dayHours) {
+            const fromByDay = new Date(date.getFullYear(), date.getMonth(), date.getDate(), 0, 0, 0)
+            const toByDay = new Date(date.getFullYear(), date.getMonth(), date.getDate(), 23, 59, 59)
 
-          const summary = await traccar.getSummary(traccarInstance, fromByDay, toByDay, devices)
-          summary.forEach(s => {
-            s.date = date
-          })
-          summaries = summaries.concat(summary)
+            const summary = await traccar.getSummary(traccarInstance, fromByDay, toByDay, devices)
+            summary.forEach(s => {
+              s.date = date
+            })
+            summaries = summaries.concat(summary)
+          }
         }
+      } else {
+        summaries = summary
       }
-    } else {
-      summaries = summary
-    }
 
-    console.log('Summary:' + summaries.length)
+      console.log('Summary:' + summaries.length)
 
-    // Process report data
-    if (summaries.length || trips.length) {
-      allData.devices = allData.devices.concat(processDevices(from, to, devices, { summaries, trips, route }, userData))
+      // Process report data
+      if (summaries.length || trips.length) {
+        allData.devices = allData.devices.concat(processDevices(from, to, devices, { summaries, trips, route }, userData))
+      }
+      deviceCount += devices.length
     }
-    deviceCount += devices.length
   }
 
   return allData

package/src/util/traccar.js

@@ -112,7 +112,11 @@ async function getAllInOne (
     }
     const now = new Date()
     console.log('parallel', requests.length)
-    result.push(...(await Promise.all(requests)))
+    try {
+      result.push(...(await Promise.all(requests)))
+    } catch (e) {
+      console.log(e)
+    }
     console.log('took', new Date() - now, 'ms')
   }
   return {