fleetmap-reports 2.0.18 → 2.0.20

package/package.json

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

package/src/kms-report.js

@@ -45,7 +45,7 @@ async function createKmsReportByDevice (from, to, userData, traccarInstance) {
 
   if (isClientSide() && (allDevices.length > 50 || ((new Date(to).getTime() - new Date(from).getTime()) > (1000 * 60 * 60 * 24 * 15))) && userData.groupByDay) {
     const sliced = automaticReports.sliceArray(allDevices, 1)
-    await executeServerSide('kms-report', allData, sliced, from, to, userData, allDevices.length)
+    await executeServerSide('kms-report', allData, sliced, from, to, userData, allDevices.length, traccarInstance)
   } else {
     if (userData.allWeek && userData.groupByDay) {
       const dates = getDates(from, to, userData.user.attributes.timezone || getUserPartner(userData.user).timezone)

package/src/speeding-report.js

@@ -89,11 +89,7 @@ async function createSpeedingReportByDevice (from, to, userData, traccarInstance
   let deviceCount = 0
   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 = processDevices(from, to, slice, events, routes, userData)
-        allData.devices.push(...devicesProcessed)
-      }
+      allData.devices = allData.devices.concat(await getEvents(traccarInstance, from, to, slice, userData, deviceCount, devices.length, slice.length, slice))
       deviceCount = deviceCount + slice.length
       if (processServerSide()) {
         console.log('LOADING_MESSAGE:' + slice[0].name)
@@ -125,7 +121,7 @@ async function createSpeedingReportByDriver (from, to, userData, traccarInstance
   return { drivers: _drivers }
 }
 
-async function getEvents (traccarInstance, from, to, devices, userData, deviceCount, totalDevices, sliceSize) {
+async function getEvents (traccarInstance, from, to, devices, userData, deviceCount, totalDevices, sliceSize, slice) {
   if (processServerSide()) {
     const url = `https://${process.env.SERVER_HOST}/reports/speeding-report/getEvents`
     return axios.post(url, { from, to, devices, userData, deviceCount, totalDevices, sliceSize }, { withCredentials: true }).then(d => d.data)
@@ -153,7 +149,10 @@ async function getEvents (traccarInstance, from, to, devices, userData, deviceCo
         events.push(...traccarEvents)
       }
     }
-    return { routes, events }
+    if (events.length > 0) {
+      return processDevices(from, to, slice, events, routes, userData)
+    }
+    return []
   }
 }
 

package/src/util/utils.js

@@ -1,4 +1,3 @@
-import axios from 'axios'
 const turf = require('@turf/helpers')
 const { getUserPartner } = require('fleetmap-partners')
 const messages = require('../../lang')
@@ -128,7 +127,7 @@ function getDates (startDate, endDate, timezone) {
 }
 
 function getImage (url) {
-  return axios.get(url, { responseType: 'arraybuffer' }).then(d => d.data)
+  return require('axios').get(url, { responseType: 'arraybuffer' }).then(d => d.data)
 }
 
 async function getImageBase64 (url) {
@@ -228,7 +227,7 @@ function weekDaySelected (date, weekDays) {
     (date.getDay() === 6 && weekDays.saturday))
 }
 
-async function executeServerSide (type, allData, sliced, from, to, userData, totalDevices) {
+async function executeServerSide (type, allData, sliced, from, to, userData, totalDevices, { axios }) {
   let deviceCount = 0
   console.log('PROGRESS_PERC:1')
   const maxRequests = 10