fleetmap-reports 1.0.918 → 1.0.920

package/package.json

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

package/src/kms-report.js

@@ -50,7 +50,7 @@ async function createKmsReportByDevice (from, to, userData, traccarInstance) {
     const {
       trips,
       route
-    } = await traccar.getAllInOne(traccarInstance, from, to, devices, needRoute, true, false, false, deviceCount, allDevices.length, 10)
+    } = await traccar.getAllInOne(traccarInstance, from, to, devices, needRoute, true, false, false, deviceCount, allDevices.length, 10, 2)
 
     // Process report data
     if (trips.length) {
@@ -166,17 +166,15 @@ async function processDevices (from, to, devices, data, userData, traccarInstanc
 
     if (userData.groupByDay) {
       if (trips.length > 0) {
-        const days = []
         const trips = deviceTrips.filter(t => userData.allWeek || !userData.weekDays || isInsideTimetable(t, userData) || isPartialInsideTimetable(t, userData, deviceRoute))
         const dates = getDates(from, to, userData.user.attributes.timezone || getUserPartner(userData.user).timezone)
-        for (const date of dates) {
+        const days = await Promise.all(dates.map(async date => {
           const { tripsByDay } = await getDataByDay(d, date, { trips }, userData, traccarInstance)
-          const day = {
+          return {
             date,
             kms: tripsByDay.reduce((a, b) => a + b.distance, 0)
           }
-          days.push(day)
-        }
+        }))
 
         devicesResult.push({
           device: d,

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)
 })