fleetmap-reports 1.0.792 → 1.0.794

package/package.json

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

package/src/activity-report.js

@@ -10,7 +10,6 @@ const { getStyle } = require('./reportStyle')
 const { getUserPartner } = require('fleetmap-partners')
 const traccar = require('./util/traccar')
 const { isInsideTimetable, isPartialInsideTimetable, calculateTrip } = require('./util/trips')
-const tripHelper = require('./util/trips')
 const { devicesToProcess } = require('./util/device')
 const { getDriverData } = require('./util/driver')
 const { calculateConsumption } = require('./util/fuel')
@@ -74,16 +73,15 @@ async function createActivityReportByGroup (from, to, userData, traccarInstance)
   return reportData
 }
 
-async function executeServerSide (allData, sliced, from, to, userData) {
-  const requests = []
+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`
-    requests.push(axios.post(url, { from, to, userData: { ...userData, devices } }, { withCredentials: true }).then(d => {
-      const result = d.data
-      allData.devices.push(...(result[0].devices))
-    }))
+    const data = await axios.post(url, { from, to, userData: { ...userData, devices } }, { withCredentials: true }).then(d => d.data)
+    allData.devices.push(...(data[0].devices))
+    deviceCount = deviceCount + devices.length
+    console.log(`PROGRESS_PERC:${deviceCount / totalDevices * 100}`)
   }
-  await Promise.all(requests)
 }
 
 async function createActivityReportByDevice (from, to, userData, traccarInstance) {
@@ -97,13 +95,12 @@ async function createActivityReportByDevice (from, to, userData, traccarInstance
   }
 
   if (isClientSide() && allDevices.length > 200) {
-    const sliced = automaticReports.sliceArray(allDevices, 60)
+    const sliced = automaticReports.sliceArray(allDevices, 50)
     await executeServerSide(allData, sliced, from, to, userData, allDevices.length)
   } else {
     let deviceCount = 0
     const sliced = automaticReports.sliceArray(allDevices, 20)
     for (const devices of sliced) {
-      let summaries = []
       const needRoute = userData.groupByDay || !userData.allWeek
       const {
         trips,
@@ -111,35 +108,9 @@ async function createActivityReportByDevice (from, to, userData, traccarInstance
         summary
       } = await traccar.getAllInOne(traccarInstance, from, to, devices, needRoute, true, false, !userData.groupByDay, deviceCount, allDevices.length, 10)
 
-      if (userData.groupByDay) {
-        console.log('trips:' + trips.length)
-
-        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 summary = await traccar.getSummary(traccarInstance, fromByDay, toByDay, devices)
-            summary.forEach(s => {
-              s.date = date
-            })
-            summaries = summaries.concat(summary)
-          }
-        }
-      } else {
-        summaries = summary
-      }
-
-      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))
+      if (summary.length || trips.length) {
+        allData.devices = allData.devices.concat(processDevices(from, to, devices, { summary, trips, route }, userData))
       }
       deviceCount += devices.length
     }