fleetmap-reports 1.0.924 → 1.0.928

package/package.json

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

package/src/kms-report.js

@@ -44,7 +44,7 @@ async function createKmsReportByDevice (from, to, userData, traccarInstance) {
   }
 
   if (isClientSide() && allDevices.length > 50 && userData.groupByDay) {
-    const sliced = automaticReports.sliceArray(allDevices, 20)
+    const sliced = automaticReports.sliceArray(allDevices, 1)
     await executeServerSide('kms-report', allData, sliced, from, to, userData, allDevices.length)
   } else {
     let deviceCount = 0

package/src/partnerReports/performance-report.js

@@ -214,4 +214,14 @@ function calculateRPMSections (route, min, max) {
   return sections
 }
 
+function exportPerformanceReportToPDF (userData, reportData) {
+
+}
+
+function exportPerformanceReportToExcel (userData, reportData) {
+
+}
+
 exports.createPerformanceReport = createPerformanceReport
+exports.exportPerformanceReportToPDF = exportPerformanceReportToPDF
+exports.exportPerformanceReportToExcel = exportPerformanceReportToExcel

package/src/tests/zones.test.js

@@ -45,18 +45,19 @@ describe('zones', function () {
 
   // eslint-disable-next-line no-undef
   it('works with casais zones in columns', async () => {
-    const report = await getReports(process.env.USER_CASAIS, process.env.PASS_CASAIS)
+    const report = await getReports('fleetmap.joao.penas2@gmail.com', 'penas46881')
     const userData = await report.getUserData()
     userData.zonesByColumn = true
-    userData.devices = userData.devices.filter(d => d.name === 'G-1101-E Clio')
-    userData.geofences = userData.geofences.filter(g => g.name === 'baliza 1 - raio verde ')
-    userData.onlyWithKmsOut = true
+    userData.devices = userData.devices.filter(d => d.id === 81202)
+    userData.geofences = userData.geofences.filter(g => g.name === 'baliza 1 - raio verde ' ||
+    g.name === 'baliza 2 - raio amarelo')
+    userData.onlyWithKmsOut = false
     const result = await report.zoneReport(
-      new Date(Date.UTC(2023, 0, 1, 0, 0, 0, 0)),
-      new Date(Date.UTC(2023, 0, 31, 23, 59, 59, 0)),
+      new Date(Date.UTC(2023, 6, 13, 0, 0, 0, 0)),
+      new Date(Date.UTC(2023, 6, 13, 23, 59, 59, 0)),
       userData)
-    const first = result[0].devices[0].days[0]
+    const first = result[0].devices[0]
     console.log(first)
-    assert.equal(first.distanceOut, 35.52274536571346)
+    assert.equal(first.days[0].distanceOut, 28)
   }, 4000000)
 })

package/src/util/utils.js

@@ -226,14 +226,29 @@ function weekDaySelected (date, weekDays) {
 
 async function executeServerSide (type, allData, sliced, from, to, userData, totalDevices) {
   let deviceCount = 0
-  console.log(`PROGRESS_PERC:${1 / totalDevices * 100}`)
-  await Promise.all(sliced.map(async devices => {
-    const url = `https://${process.env.SERVER_HOST}/reports/${type}`
-    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}`)
-  }))
+  console.log('PROGRESS_PERC:1')
+  const maxRequests = 10
+  for (let i = 0; i < sliced.length; i += maxRequests) {
+    const _sliced = sliced.slice(i, i + maxRequests)
+    await Promise.all(_sliced.map(async devices => {
+      const url = `https://${process.env.SERVER_HOST}/reports/${type}`
+      try {
+        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
+      } catch (e) {
+        console.error(e)
+      }
+      console.log(`PROGRESS_PERC:${deviceCount / totalDevices * 100}`)
+    }))
+  }
 }
 
 exports.executeServerSide = executeServerSide