fleetmap-reports 2.0.34 → 2.0.36

package/package.json

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

package/src/tests/zones.test.js

@@ -32,9 +32,9 @@ describe('zones', function () {
     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)
+      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)
 
@@ -135,11 +135,28 @@ describe('zones', function () {
         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)
+      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, 298.9872662595749)
+  }, 4000000)
+
+  it('works with casais zones in columns 6', 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, 1, 0, 0, 0, 0)),
+      new Date(Date.UTC(2023, 9, 27, 23, 59, 59, 0)),
+      userData)
     const first = result[0].devices[0]
     console.log(first)
-    assert.equal(first.days[1].distanceOut, 347.06754247750894)
+    assert.equal(first.days[6].distanceOut, 867.0554430738234)
   }, 4000000)
 })

package/src/util/driver.js

@@ -6,20 +6,13 @@ const { isInsideTimetable, isPartialInsideTimetable } = require('./trips')
 // get devices used by each driver between two dates
 async function devicesByDriver (traccarInstance, from, to, drivers, devices) {
   const eventsData = await traccar.getEvents(traccarInstance, from, to, devices, ['driverChanged'])
-  const deviceIds = []
-  const driversIds = []
-  for (const d of drivers) {
-    const events = eventsData.filter(e => {
-      return !d.uniqueId.localeCompare(e.attributes.driverUniqueId, undefined, { sensitivity: 'base' })
-    })
-
-    if (events.length) {
-      driversIds.push(d.id)
-    }
+  const driverUniqueIdsToProcess = new Set(eventsData.map(e => e.attributes.driverUniqueId))
+  const driversToProcess = drivers.filter(d => driverUniqueIdsToProcess.has(d.uniqueId))
 
-    deviceIds.push(...events.map(e => e.deviceId))
-  }
-  return { devices: devices.filter(d => deviceIds.includes(d.id)), drivers: drivers.filter(d => driversIds.includes(d.id)) }
+  const deviceIdsToProcess = new Set(eventsData.map(e => e.deviceId))
+  const devicesToProcess = devices.filter(d => deviceIdsToProcess.has(d.id))
+
+  return { devices: devicesToProcess, drivers: driversToProcess }
 }
 
 async function reportByDriver (devices, traccar, from, to, userData, processor, allInOneData = { route: true, trips: true, stops: true, summary: false }) {

package/src/zone-report.js

@@ -36,7 +36,7 @@ async function createZoneReport (from, to, userData, traccar) {
   }
 
   const serverHost = isClientSide() && newDomains.includes(window.location.hostname)
-    ? window.location.hostname
+    ? `${window.location.hostname}/pinmeapi`
     : process.env.SERVER_HOST
 
   if (isClientSide()) {
@@ -332,6 +332,7 @@ function calculateDistanceIn (zoneInOutDayData, deviceRoute, dayRoute, fromByDay
 
 function calculateDistanceOut (zoneInOutDayData, dayRoute, fromByDay, toByDay, field, device) {
   if (zoneInOutDayData.length) {
+    zoneInOutDayData.sort((a, b) => (a.inTime ? new Date(a.inTime.fixTime).getTime() : 0) - (b.inTime ? new Date(b.inTime.fixTime).getTime() : 0))
     const dataInsideDay = zoneInOutDayData.filter(z => z.outTime && new Date(z.outTime.fixTime) < toByDay)
     let distanceOut = dataInsideDay.reduce((a, b) => a + (b[field] || 0), 0)