fleetmap-reports 1.0.922 → 1.0.924

package/package.json

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

package/src/kms-report.js

@@ -58,8 +58,8 @@ async function createKmsReportByDevice (from, to, userData, traccarInstance) {
 
       // Process report data
       if (trips.length) {
-        checkTripsKms(traccarInstance, from, to, allDevices, { trips, route })
-        allData.devices = allData.devices.concat(await processDevices(from, to, allDevices, {
+        checkTripsKms(traccarInstance, from, to, devices, { trips, route })
+        allData.devices = allData.devices.concat(await processDevices(from, to, devices, {
           trips,
           route
         }, userData, traccarInstance))

package/src/tests/zones.test.js

@@ -45,19 +45,18 @@ describe('zones', function () {
 
   // eslint-disable-next-line no-undef
   it('works with casais zones in columns', async () => {
-    const report = await getReports('fleetmap.joao.penas2@gmail.com', 'penas46881')
+    const report = await getReports(process.env.USER_CASAIS, process.env.PASS_CASAIS)
     const userData = await report.getUserData()
     userData.zonesByColumn = 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
+    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
     const result = await report.zoneReport(
-      new Date(Date.UTC(2023, 6, 13, 0, 0, 0, 0)),
-      new Date(Date.UTC(2023, 6, 13, 23, 59, 59, 0)),
+      new Date(Date.UTC(2023, 0, 1, 0, 0, 0, 0)),
+      new Date(Date.UTC(2023, 0, 31, 23, 59, 59, 0)),
       userData)
-    const first = result[0].devices[0]
+    const first = result[0].devices[0].days[0]
     console.log(first)
-    assert.equal(first.days[0].distanceOut, 28)
+    assert.equal(first.distanceOut, 35.52274536571346)
   }, 4000000)
 })

package/src/util/utils.js

@@ -226,13 +226,14 @@ function weekDaySelected (date, weekDays) {
 
 async function executeServerSide (type, allData, sliced, from, to, userData, totalDevices) {
   let deviceCount = 0
-  for (const devices of sliced) {
+  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}`)
-  }
+  }))
 }
 
 exports.executeServerSide = executeServerSide