fleetmap-reports 2.0.37 → 2.0.39

package/package.json

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

package/src/tests/zones.test.js

@@ -159,4 +159,21 @@ describe('zones', function () {
     console.log(first)
     assert.equal(first.days[6].distanceOut, 867.0554430738234)
   }, 4000000)
+
+  it('works with casais zones in columns 7', async () => {
+    const report = await getReports()
+    const userData = await report.getUserData()
+    userData.zonesByColumn = true
+    userData.devices = userData.devices.filter(d => d.id === 81166)
+    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, 9, 9, 0, 0, 0, 0)),
+        new Date(Date.UTC(2023, 9, 31, 23, 59, 59, 0)),
+        userData)
+    const first = result[0].devices[0]
+    console.log(first)
+    assert.equal(first.days[17].distanceOut, 720.7985320478997)
+  }, 4000000)
 })

package/src/trip-report.js

@@ -183,21 +183,33 @@ async function processDevices (from, to, devices, data, userData, traccar) {
       }
 
       if (userData.includeTemperature) {
-        const tripRoute = deviceRoute.filter(p => trip.startTime <= p.fixTime && trip.endTime >= p.fixTime && p.attributes.temp1 !== 175)
-        trip.maxTemp = tripRoute.length > 0
-          ? tripRoute.reduce((a, b) => {
-            return a && a > b.attributes.temp1 ? a : b.attributes.temp1
+        const tripRoute = deviceRoute.filter(p => trip.startTime <= p.fixTime && trip.endTime >= p.fixTime)
+
+        const temperatureValues = tripRoute.map(p => {
+          for (let i = 1; i <= 3; i++) {
+            const temp = 'temp' + i
+            if (p.attributes[temp] && parseFloat(p.attributes[temp]) !== 175) {
+              return parseFloat(p.attributes[temp])
+            }
+          }
+
+          return undefined
+        }).filter(a => a !== undefined)
+
+        trip.maxTemp = temperatureValues.length > 0
+          ? temperatureValues.reduce((a, b) => {
+            return a > b ? a : b
           })
           : 0
-        trip.minTemp = tripRoute.length > 0
-          ? tripRoute.reduce((a, b) => {
-            return a && a < b.attributes.temp1 ? a : b.attributes.temp1
+        trip.minTemp = temperatureValues.length > 0
+          ? temperatureValues.reduce((a, b) => {
+            return a < b ? a : b
           })
           : 0
-        trip.avgTemp = tripRoute.length > 0
-          ? (tripRoute.reduce((a, b) => {
-              return a + b.attributes.temp1
-            }, 0)) / tripRoute.length
+        trip.avgTemp = temperatureValues.length > 0
+          ? (temperatureValues.reduce((a, b) => {
+              return a + b
+            }, 0)) / temperatureValues.length
           : 0
       }
 

package/src/zone-report.js

@@ -345,6 +345,7 @@ function calculateDistanceOut (zoneInOutDayData, dayRoute, fromByDay, toByDay, f
       distanceOut = distanceOut + calculateDistance(routeOut, device.attributes['report.ignoreOdometer'])
     }
 
+    zoneInOutDayData.sort((a, b) => (a.outTime ? new Date(a.outTime.fixTime).getTime() : 0) - (b.outTime ? new Date(b.outTime.fixTime).getTime() : 0))
     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]