fleetmap-reports 1.0.960 → 1.0.962

package/package.json

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

package/src/index.js

@@ -18,7 +18,8 @@ function Reports (config, axios, cookieJar) {
       groups: await this.traccar.groups.groupsGet().then(d => d.data),
       drivers: await this.traccar.drivers.driversGet().then(d => d.data),
       geofences: await this.traccar.geofences.geofencesGet().then(d => d.data),
-      byGroup: false
+      byGroup: false,
+      dayHours: { startTime: '00:00', endTime: '23:59' }
     }
   }
   this.speedingReport = (from, to, userData) => {

package/src/tests/zones.test.js

@@ -88,12 +88,30 @@ describe('zones', function () {
         g.name === 'baliza 2 - raio amarelo')
     userData.onlyWithKmsOut = false
     const result = await report.zoneReport(
-        new Date(Date.UTC(2023, 8, 1, 0, 0, 0, 0)),
-        new Date(Date.UTC(2023, 8, 10, 23, 59, 59, 0)),
-        userData)
+      new Date(Date.UTC(2023, 8, 1, 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[0].distanceOut, 294.0468270741282)
     assert.equal(first.days[1].distanceOut, 35.21209134706803)
   }, 4000000)
+
+  it('works with casais zones in columns 4', async () => {
+    const report = await getReports()
+    const userData = await report.getUserData()
+    userData.zonesByColumn = true
+    userData.devices = userData.devices.filter(d => d.id === 81164)
+    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, 10, 0, 0, 0, 0)),
+      new Date(Date.UTC(2023, 8, 11, 23, 59, 59, 0)),
+      userData)
+    const first = result[0].devices[0]
+    console.log(first)
+    assert.equal(first.days[0].distanceOut, 24)
+    assert.equal(first.days[1].distanceOut, 0)
+  }, 4000000)
 })

package/src/util/trips.js

@@ -116,19 +116,27 @@ async function getDataByDay (device, date, data, userData, traccarInstance) {
   const startDate = isClientSide() ? startDateLocal : convertFromLocal(startDateLocal, userData.user.attributes.timezone)
   const endDate = isClientSide() ? endDateLocal : convertFromLocal(endDateLocal, userData.user.attributes.timezone)
 
-  const tripsByDay = data.trips.filter(t => new Date(t.endTime) > startDate && new Date(t.startTime) < endDate).map(t => {
-    return { ...t }
-  })
-
-  for (const t of tripsByDay) {
-    await calculatePartialTrip(device, startDate, endDate, data.route, t, traccarInstance)
+  const tripsByDay = []
+  if (data.trips) {
+    tripsByDay.concat(data.trips.filter(t => new Date(t.endTime) > startDate && new Date(t.startTime) < endDate).map(t => {
+      return { ...t }
+    }))
+
+    for (const t of tripsByDay) {
+      await calculatePartialTrip(device, startDate, endDate, data.route, t, traccarInstance)
+    }
   }
 
   const routeByDay = data.route ? data.route.filter(p => (new Date(p.fixTime) > startDate && new Date(p.fixTime) < endDate)) : []
 
   const refuelingPositionsByDay = data.refuelingPositions ? data.refuelingPositions.filter(p => (new Date(p.date) > startDate && new Date(p.date) < endDate)) : []
 
-  return { tripsByDay, routeByDay, refuelingPositionsByDay }
+  const zoneInOutDayData = data.zoneInOutData
+    ? data.zoneInOutData.filter(z => (!z.inTime || (new Date(z.inTime.fixTime) < endDate)) &&
+      (!z.outTime || (new Date(z.outTime.fixTime) > startDate)))
+    : []
+
+  return { tripsByDay, routeByDay, refuelingPositionsByDay, zoneInOutDayData }
 }
 
 function getKms (trips) {

package/src/zone-report.js

@@ -4,7 +4,7 @@ const {
   calculateDistance,
   sortPositions, getDates, convertToLocaleDateString, convertToLocaleTimeString,
   isClientSide,
-  getLanguage
+  getLanguage, convertFromUTC, convertFromLocal
 } = require('./util/utils')
 const jsPDF = require('jspdf')
 require('jspdf-autotable')
@@ -20,6 +20,7 @@ const {
 } = require('./util/route')
 const { checkGeofenceIn } = require('./util/geofence')
 const { parallel } = require('./util/parallel')
+const { getDataByDay } = require('./util/trips')
 const sliceSize = 100
 const deviceChunk = 5
 const fileName = 'ZoneReport'
@@ -104,19 +105,19 @@ async function processDevices (from, to, devices, userData, data) {
 
         const dataByDay = []
         for (const date of dates) {
-          const fromByDay = new Date(date.getFullYear(), date.getMonth(), date.getDate(), 0, 0, 0)
-          const toByDay = new Date(date.getFullYear(), date.getMonth(), date.getDate(), 23, 59, 59)
+          const startDateLocal = new Date(convertFromUTC(date, userData.user.attributes.timezone).toISOString().split('T')[0] + ' ' + userData.dayHours.startTime)
+          const endDateLocal = new Date(convertFromUTC(date, userData.user.attributes.timezone).toISOString().split('T')[0] + ' ' + userData.dayHours.endTime)
+          const startDate = isClientSide() ? startDateLocal : convertFromLocal(startDateLocal, userData.user.attributes.timezone)
+          const endDate = isClientSide() ? endDateLocal : convertFromLocal(endDateLocal, userData.user.attributes.timezone)
 
-          const dayRoute = deviceRoute.filter(p => new Date(p.fixTime) >= fromByDay && new Date(p.fixTime) < toByDay)
-          const zoneInOutDayData = filteredByGeofence.filter(z => (!z.inTime || (new Date(z.inTime.fixTime) < toByDay)) &&
-                (!z.outTime || (new Date(z.outTime.fixTime) > fromByDay)))
+          const { routeByDay, zoneInOutDayData } = await getDataByDay(d, date, { route: deviceRoute, zoneInOutData: filteredByGeofence }, userData)
 
-          const firstIn = zoneInOutDayData.find(z => z.inTime && new Date(z.inTime.fixTime) > fromByDay)
-          const lastOut = zoneInOutDayData.slice().reverse().find(z => z.outTime && new Date(z.outTime.fixTime) < toByDay)
+          const firstIn = zoneInOutDayData.find(z => z.inTime && new Date(z.inTime.fixTime) > startDate)
+          const lastOut = zoneInOutDayData.slice().reverse().find(z => z.outTime && new Date(z.outTime.fixTime) < endDate)
 
-          const timeIn = calculateTimeIn(zoneInOutDayData, fromByDay, from, toByDay, to)
-          const distanceIn = calculateDistanceIn(zoneInOutDayData, deviceRoute, dayRoute, fromByDay, toByDay, to, d)
-          const distanceOut = calculateDistanceOut(zoneInOutDayData, dayRoute, fromByDay, toByDay, 'distanceOut', d)
+          const timeIn = calculateTimeIn(zoneInOutDayData, startDate, from, endDate, to)
+          const distanceIn = calculateDistanceIn(zoneInOutDayData, deviceRoute, routeByDay, startDate, endDate, to, d)
+          const distanceOut = calculateDistanceOut(zoneInOutDayData, routeByDay, startDate, endDate, 'distanceOut', d)
 
           dataByDay.push({
             date,
@@ -139,13 +140,14 @@ async function processDevices (from, to, devices, userData, data) {
       if (userData.zonesByColumn) {
         const groupByDay = []
         for (const date of dates) {
-          const fromByDay = new Date(date.getFullYear(), date.getMonth(), date.getDate(), 0, 0, 0)
-          const toByDay = new Date(date.getFullYear(), date.getMonth(), date.getDate(), 23, 59, 59)
+          const startDateLocal = new Date(convertFromUTC(date, userData.user.attributes.timezone).toISOString().split('T')[0] + ' ' + userData.dayHours.startTime)
+          const endDateLocal = new Date(convertFromUTC(date, userData.user.attributes.timezone).toISOString().split('T')[0] + ' ' + userData.dayHours.endTime)
+          const startDate = isClientSide() ? startDateLocal : convertFromLocal(startDateLocal, userData.user.attributes.timezone)
+          const endDate = isClientSide() ? endDateLocal : convertFromLocal(endDateLocal, userData.user.attributes.timezone)
 
-          const zoneInOutDayData = zoneInOutData.filter(z => (!z.inTime || (new Date(z.inTime.fixTime) < toByDay)) &&
-              (!z.outTime || (new Date(z.outTime.fixTime) > fromByDay)))
+          const { routeByDay, zoneInOutDayData } = await getDataByDay(d, date, { route: deviceRoute, zoneInOutData }, userData)
 
-          const distanceOut = calculateDistanceOut(zoneInOutDayData, deviceRoute, fromByDay, toByDay, 'distanceOutAny', d)
+          const distanceOut = calculateDistanceOut(zoneInOutDayData, routeByDay, startDate, endDate, 'distanceOutAny', d)
 
           const geofences = geofencesData.map(g => {
             const day = g.days.find(day => day.date === date)