fleetmap-reports 1.0.988 → 1.0.990

package/package.json

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

package/src/location-report.js

@@ -323,13 +323,13 @@ function getDigitalPortValue (row, index, translations, dAttributes) {
       if (row.attributes && row.attributes.door1 !== undefined) {
         return translations.report[row.attributes.door1]
       }
-      if (row.attributes && row.attributes.sensor !== undefined) {
-        return row.attributes.sensor
+      if (row.attributes && row.attributes[dAttributes.sensor1Attribute] !== undefined) {
+        return row.attributes[dAttributes.sensor1Attribute]
           ? dAttributes.sensor1on || row.attributes.sensor
           : dAttributes.sensor1off || row.attributes.sensor
       }
-      if (row.attributes && row.attributes[dAttributes.sensor1Attribute] !== undefined) {
-        return row.attributes[dAttributes.sensor1Attribute]
+      if (row.attributes && row.attributes.sensor !== undefined) {
+        return row.attributes.sensor
           ? dAttributes.sensor1on || row.attributes.sensor
           : dAttributes.sensor1off || row.attributes.sensor
       }

package/src/tests/zones.test.js

@@ -27,6 +27,17 @@ describe('zones', function () {
     console.log('result', result)
   }, 4000000)
 
+  it('trips between geofences', async () => {
+    const report = await getReports(process.env.USER_MOVIFLOTTE, process.env.PASS_MOVIFLOTTE)
+    const userData = await report.getUserData()
+    userData.tripsBetweenZones = true
+    const result = await report.zoneReport(
+        new Date(Date.UTC(2024, 0, 8, 0, 0, 0, 0)),
+        new Date(Date.UTC(2024, 0, 8, 23, 59, 59, 0)),
+        userData)
+    console.log('result', result)
+  }, 4000000)
+
   // eslint-disable-next-line no-undef
   it('works with casais', async () => {
     const report = await getReports(process.env.USER_CASAIS, process.env.PASS_CASAIS)
@@ -111,7 +122,24 @@ describe('zones', function () {
       userData)
     const first = result[0].devices[0]
     console.log(first)
-    assert.equal(first.days[0].distanceOut, 24)
-    assert.equal(first.days[1].distanceOut, 0)
+    assert.equal(first.days[0].distanceOut, 0)
+    assert.equal(first.days[1].distanceOut, 24)
+  }, 4000000)
+
+  it('works with casais zones in columns 5', async () => {
+    const report = await getReports()
+    const userData = await report.getUserData()
+    userData.zonesByColumn = true
+    userData.devices = userData.devices.filter(d => d.id === 81172)
+    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, 8, 3, 0, 0, 0, 0)),
+        new Date(Date.UTC(2023, 8, 10, 23, 59, 59, 0)),
+        userData)
+    const first = result[0].devices[0]
+    console.log(first)
+    assert.equal(first.days[1].distanceOut, 347.06754247750894)
   }, 4000000)
 })

package/src/zone-report.js

@@ -329,7 +329,7 @@ function calculateDistanceOut (zoneInOutDayData, dayRoute, fromByDay, toByDay, f
     const dataInsideDay = zoneInOutDayData.filter(z => z.outTime && new Date(z.outTime.fixTime) < toByDay)
     let distanceOut = dataInsideDay.reduce((a, b) => a + (b[field] || 0), 0)
 
-    if (zoneInOutDayData[0].inTime && new Date(zoneInOutDayData[0].inTime.fixTime) > fromByDay && (field !== 'distanceOutAny' || zoneInOutDayData[0].anyLastExit)) {
+    if (zoneInOutDayData[0].inTime && new Date(zoneInOutDayData[0].inTime.fixTime) > fromByDay) {
       // Add distanceOut before the first entry
       const routeOut = dayRoute.filter(p =>
         new Date(p.fixTime).getTime() < new Date(zoneInOutDayData[0].inTime.fixTime).getTime() &&
@@ -338,7 +338,7 @@ function calculateDistanceOut (zoneInOutDayData, dayRoute, fromByDay, toByDay, f
       distanceOut = distanceOut + calculateDistance(routeOut, device.attributes['report.ignoreOdometer'])
     }
 
-    if (zoneInOutDayData[zoneInOutDayData.length - 1].outTime && new Date(zoneInOutDayData[zoneInOutDayData.length - 1].outTime.fixTime) < toByDay && (field !== 'distanceOutAny' || zoneInOutDayData[zoneInOutDayData.length - 1].anyNextIn)) {
+    if (zoneInOutDayData[zoneInOutDayData.length - 1].outTime && new Date(zoneInOutDayData[zoneInOutDayData.length - 1].outTime.fixTime) < toByDay) {
       // Add distanceOut after last exit
       distanceOut = distanceOut - zoneInOutDayData[zoneInOutDayData.length - 1][field]
       const routeOut = dayRoute.filter(p =>