fleetmap-reports 1.0.759 → 1.0.761

package/package.json

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

package/src/tests/performance.test.js

@@ -2,15 +2,14 @@ const { getReports } = require('./index')
 const { createPerformanceReport } = require('../partnerReports/performance-report')
 // eslint-disable-next-line no-undef
 describe('performance', function () {
-  this.timeout(500000)
   // eslint-disable-next-line no-undef
   it('performance report', async () => {
     const report = await getReports()
     const userData = await report.getUserData()
-    userData.devices = userData.devices.filter(d => d.id === 128270)
+    userData.devices = userData.devices.filter(d => d.attributes.xpert)
     const data = await createPerformanceReport(
-      new Date(Date.UTC(2023, 5, 29, 0, 0, 0, 0)),
-      new Date(Date.UTC(2023, 5, 30, 23, 59, 59, 0)),
+      new Date(Date.UTC(2023, 5, 10, 0, 0, 0, 0)),
+      new Date(Date.UTC(2023, 5, 20, 23, 59, 59, 0)),
       userData,
       report.traccar)
     console.log(data)

package/src/tests/zones.test.js

@@ -2,7 +2,6 @@ const { getReports } = require('./index')
 const assert = require('assert')
 // eslint-disable-next-line no-undef
 describe('zones', function () {
-  this.timeout(500000)
   // eslint-disable-next-line no-undef
   it('works with ellca', async () => {
     const report = await getReports()
@@ -38,51 +37,30 @@ describe('zones', function () {
     const report = await getReports(process.env.USER_CASAIS, process.env.PASS_CASAIS)
     const userData = await report.getUserData()
     userData.devices = userData.devices.filter(d => d.name === 'G-1101-E Clio')
-    userData.geofences = userData.geofences.filter(g => g.name === 'baliza raio verde ')
+    userData.geofences = userData.geofences.filter(g => g.name === 'baliza 1 - raio verde ')
     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)),
       userData)
     const first = result[0].devices[0].geofences[0]
     console.log(first)
-    assert.equal(first.inTime.fixTime, '2023-01-03T21:23:24.000+0000')
-    assert.equal(first.outTime.fixTime, '2023-01-07T12:22:53.000+0000')
+    assert.equal(first.inTime.fixTime, '2023-01-03T21:23:24.000+00:00')
+    assert.equal(first.outTime.fixTime, '2023-01-07T12:22:53.000+00:00')
   }, 4000000)
 
   // eslint-disable-next-line no-undef
-  it('works with casais 2', async () => {
-    const report = await getReports('mario.andre.moreira@casais.gi', 'Casais.23')
-    const userData = await report.getUserData()
-    userData.groupByDay = true
-    userData.devices = userData.devices.filter(d => d.name === 'G-2542-F Fiat Tipo')
-    userData.geofences = userData.geofences.filter(g => g.name === 'baliza raio verde ')
-    assert.equal(userData.geofences.length > 0, true)
-    assert.equal(userData.devices.length > 0, true)
-    const result = await report.zoneReport(
-      new Date(2023, 1, 27, 0, 0, 0, 0),
-      new Date(2023, 1, 27, 23, 59, 59, 0),
-      userData)
-    assert.equal(result[0].devices[0].geofences.length, 1)
-    assert.equal(result[0].devices[0].geofences[0].days.length, 1)
-    const first = result[0].devices[0].geofences[0].days[0]
-    assert.equal(first.firstIn, '2023-02-27T21:53:16.000+0000')
-    assert.equal(first.distanceIn, 93.03917199839687)
-    assert.equal(first.distanceOut, 819.6685737216337)
-  }, 4000000)
-
-  it('works with casais 3', async () => {
+  it('works with casais zones in columns', async () => {
     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.name === 'G-1101-E Clio')
-    userData.geofences = userData.geofences.filter(g => g.name === 'baliza raio verde ' || g.name === 'baliza raio amarelo ')
+    userData.geofences = userData.geofences.filter(g => g.name === 'baliza raio verde ')
     const result = await report.zoneReport(
-        new Date(Date.UTC(2023, 0, 29, 0, 0, 0, 0)),
-        new Date(Date.UTC(2023, 0, 31, 23, 59, 59, 0)),
-        userData)
-    const first = result[0].devices[0].geofences[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].days[0]
     console.log(first)
-    assert.equal(first.name, 'baliza raio verde ')
-    assert.equal(first.distanceIn, '1069.343491503579')
+    assert.equal(first.distanceOut, 0.0009407267222226043)
   }, 4000000)
 })

package/src/zone-report.js

@@ -154,20 +154,24 @@ async function processDevices (from, to, devices, userData, data) {
             }
           })
 
-          groupByDay.push({
-            date,
-            geofences,
-            distanceOut
-          })
+          if (distanceOut || geofences.filter(g => g.distanceIn).length) {
+            groupByDay.push({
+              date,
+              geofences,
+              distanceOut
+            })
+          }
         }
 
-        devicesResult.push({
-          device: d,
-          from,
-          to,
-          zonesByColumn: true,
-          days: groupByDay
-        })
+        if (groupByDay.length) {
+          devicesResult.push({
+            device: d,
+            from,
+            to,
+            zonesByColumn: true,
+            days: groupByDay
+          })
+        }
       } else {
         devicesResult.push({
           device: d,
@@ -527,7 +531,7 @@ async function exportZoneReportToPDF (userData, reportData) {
 
         let columnIndex = 1
         const columnStyles = { }
-        reportData.devices[0].days[0].geofences.forEach(a => {
+        reportData.devices[0].days[0].geofences.forEach(() => {
           columnStyles[columnIndex] = { halign: 'right' }
           columnIndex++
         })