fleetmap-reports 2.0.52 → 2.0.54

package/package.json

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

package/src/kms-report.js

@@ -44,8 +44,8 @@ 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', sliced, from, to, userData, allDevices.length, traccarInstance).then(devices => {
+    const sliced = automaticReports.sliceArray(allDevices, 2)
+    await executeServerSide('kms-report', sliced, from, to, userData, allDevices.length, traccarInstance, 1).then(devices => {
       allData.devices = devices
     })
   } else {

package/src/util/utils.js

@@ -240,7 +240,7 @@ async function executeServerSide (type, sliced, from, to, userData, totalItems,
     await Promise.all(_sliced.map(async items => {
       const url = `https://${getServerHost()}/reports/${type}`
       try {
-        const data = await axios.post(url, {
+        await axios.post(url, {
           from,
           to,
           userData: userData.byDriver
@@ -254,8 +254,9 @@ async function executeServerSide (type, sliced, from, to, userData, totalItems,
                 devices: items,
                 geofences: []
               }
-        }, { withCredentials: true }).then(d => d.data)
-        reportData.push(...(userData.byDriver ? data[0].drivers : data[0].devices))
+        }, { withCredentials: true }).then(d => {
+          reportData.push(...(userData.byDriver ? d.data[0].drivers : d.data[0].devices))
+        })
         itemsCount = itemsCount + items.length
       } catch (e) {
         console.error(e)