fleetmap-reports 2.0.266 → 2.0.267

package/package.json

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

package/src/location-report.js

@@ -41,6 +41,24 @@ async function createLocationReport (from, to, userData, traccar) {
   return reportData
 }
 
+async function createLocationReportByDriver (from, to, userData, traccar) {
+  // 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)
+
+  if (!devices.length) {
+    // Empty report
+    return { drivers: [] }
+  }
+
+  const sliced = automaticReports.sliceArray(devices, 1)
+  const deviceCount = 0
+  const promises = sliced.map(slice => _process(traccar, from, to, slice, deviceCount, devices, userData))
+  const result = await Promise.all(promises)
+  return { drivers: result.flat() }
+}
+
 async function _process (traccar, from, to, slice, deviceCount, devices, userData) {
   const url = `https://${process.env.SERVER_HOST}/pinmeapi/process-report/get-driver-route'`
   return traccar.axios.post(url, {
@@ -67,21 +85,6 @@ async function process (traccar, from, to, slice, deviceCount, devices, userData
   await processDrivers(from, to, userData, allInOne)
 }
 
-async function createLocationReportByDriver (from, to, userData, traccar) {
-  // 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)
-
-  if (!devices.length) { return { drivers: [] } }
-
-  const sliced = automaticReports.sliceArray(devices, 1)
-  const deviceCount = 0
-  const promises = sliced.map(slice => _process(traccar, from, to, slice, deviceCount, devices, userData))
-  const result = await Promise.all(promises)
-  return { drivers: result.flat() }
-}
-
 async function createLocationReportByGroup (from, to, userData, traccar) {
   const reportData = []
 

package/src/speeding-report.js

@@ -79,7 +79,7 @@ function processServerSide () {
 }
 
 async function getOverspeedEvents (from, to, userData, devices, allData, traccarInstance) {
-  const _sliced = automaticReports.sliceArray(automaticReports.sliceArray(devices, 5), 5)
+  const _sliced = automaticReports.sliceArray(automaticReports.sliceArray(devices, 4), 4)
   let deviceCount = 0
   const overspeedEvents = []
   for (const sliced of _sliced) {