fleetmap-reports 2.0.259 → 2.0.261

package/package.json

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

package/src/location-report.js

@@ -42,7 +42,8 @@ async function createLocationReport (from, to, userData, traccar) {
 }
 
 async function createLocationReportByDriver (from, to, userData, traccar) {
-  const url = `https://${process.env.SERVER_HOST}/api/devices`
+  // server side only
+  const url = `http://${process.env.TRACCAR_HOST}/api/devices`
   const devices = await traccar.axios.get(url).then(d => d.data)
   console.log(devices.length)
 
@@ -51,9 +52,13 @@ async function createLocationReportByDriver (from, to, userData, traccar) {
     return { drivers: [] }
   }
 
-  const allInOne = await traccarHelper.getAllInOne(traccar, from, to, devices, true, false, false, false)
+  const sliced = automaticReports.sliceArray(devices, 5)
 
-  return { drivers: await processDrivers(from, to, userData, allInOne) }
+  for (const slice of sliced) {
+    const allInOne = await traccarHelper.getAllInOne(traccar, from, to, slice, true, false, false, false)
+    await processDrivers(from, to, userData, allInOne)
+  }
+  return { drivers: driversResult }
 }
 
 async function createLocationReportByGroup (from, to, userData, traccar) {
@@ -159,9 +164,9 @@ function processDevices (from, to, devices, data) {
 
   return devicesResult
 }
+const driversResult = []
 
 async function processDrivers (from, to, userData, data) {
-  const driversResult = []
   for (const d of userData.drivers) {
     const { route } = await getDriverData(d, data, userData)
     if (route.length > 0) {
@@ -184,8 +189,6 @@ async function processDrivers (from, to, userData, data) {
     }
   }
   console.log(driversResult)
-
-  return driversResult
 }
 
 async function exportLocationReportToPDF (userData, reportData) {