fleetmap-reports 1.0.760 → 1.0.762

package/package.json

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

package/src/tests/zones.test.js

@@ -38,15 +38,31 @@ 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 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 ')
+    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].days[0]
+    console.log(first)
+    assert.equal(first.distanceOut, 0.0009407267222226043)
   }, 4000000)
 
   // eslint-disable-next-line no-undef

package/src/zone-report.js

@@ -154,7 +154,7 @@ async function processDevices (from, to, devices, userData, data) {
             }
           })
 
-          if (distanceOut && geofences.filter(g => g.distanceIn)) {
+          if (distanceOut || geofences.filter(g => g.distanceIn).length) {
             groupByDay.push({
               date,
               geofences,
@@ -237,7 +237,7 @@ function calculateDistanceIn (zoneInOutDayData, deviceRoute, dayRoute, fromByDay
   if (zoneInOutDayData.length) {
     // Check if the first entry starts only on the day before
     if (!zoneInOutDayData[0].inTime || new Date(zoneInOutDayData[0].inTime.fixTime) < fromByDay) {
-      const routeDayBefore = deviceRoute.filter(p => (!zoneInOutDayData[0].inTime || new Date(p.fixTime) >= new Date(zoneInOutDayData[0].inTime.fixTime)) &&
+      const routeDayBefore = deviceRoute.filter(p => (!zoneInOutDayData[0].inTime || (new Date(p.fixTime) >= new Date(zoneInOutDayData[0].inTime.fixTime))) &&
           new Date(p.fixTime) < fromByDay)
       distanceIn = distanceIn - calculateDistance(routeDayBefore)
     }
@@ -245,7 +245,7 @@ function calculateDistanceIn (zoneInOutDayData, deviceRoute, dayRoute, fromByDay
     // Check if the last entry ends only on the next day
     if (!zoneInOutDayData[zoneInOutDayData.length - 1].outTime || new Date(zoneInOutDayData[zoneInOutDayData.length - 1].outTime.fixTime) > toByDay) {
       const outTime = zoneInOutDayData[zoneInOutDayData.length - 1].outTime ? new Date(zoneInOutDayData[zoneInOutDayData.length - 1].outTime.fixTime) : to
-      const routeDayAfter = deviceRoute.filter(p => new Date(p.fixTime) <= outTime && new Date(p.fixTime) > toByDay)
+      const routeDayAfter = deviceRoute.filter(p => new Date(p.fixTime) < outTime && new Date(p.fixTime) > toByDay)
       distanceIn = distanceIn - calculateDistance(routeDayAfter)
     }
   }
@@ -531,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++
         })