fleetmap-reports 1.0.915 → 1.0.917

package/package.json

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

package/src/activity-report.js

@@ -62,7 +62,7 @@ async function createActivityReportByGroup (from, to, userData, traccarInstance)
       devices.sort((a, b) => (a.name > b.name) ? 1 : -1)
 
       if (summary.length > 0) {
-        groupData.devices = processDevices(from, to, devices, { summary, trips }, userData)
+        groupData.devices = await processDevices(from, to, devices, { summary, trips }, userData, traccarInstance)
 
         reportData.push(groupData)
       }
@@ -113,7 +113,7 @@ async function createActivityReportByDevice (from, to, userData, traccarInstance
 
       // Process report data
       if (summary.length || trips.length) {
-        allData.devices = allData.devices.concat(processDevices(from, to, devices, { summary, trips, route }, userData))
+        allData.devices = allData.devices.concat(await processDevices(from, to, devices, { summary, trips, route }, userData, traccarInstance))
       }
       deviceCount += devices.length
     }
@@ -157,10 +157,10 @@ async function createActivityReportByDriver (from, to, userData, traccarInstance
   return allData
 }
 
-function processDevices (from, to, devices, data, userData) {
+async function processDevices (from, to, devices, data, userData, traccarInstance) {
   const devicesResult = []
 
-  devices.forEach(d => {
+  for (const d of devices) {
     const deviceTrips = data.trips.filter(t => t.deviceId === d.id)
     const deviceRoute = data.route.filter(t => t.deviceId === d.id)
 
@@ -177,7 +177,7 @@ function processDevices (from, to, devices, data, userData) {
       const trips = deviceTrips.filter(t => userData.allWeek || !userData.weekDays || isInsideTimetable(t, userData) || isPartialInsideTimetable(t, userData, deviceRoute))
       const dates = getDates(from, to, userData.user.attributes.timezone || getUserPartner(userData.user).timezone)
       for (const date of dates) {
-        const { tripsByDay, routeByDay } = getDataByDay(date, trips, userData, deviceRoute)
+        const { tripsByDay, routeByDay } = await getDataByDay(d, date, { trips, route: deviceRoute }, userData, traccarInstance)
 
         const distance = tripsByDay.reduce((a, b) => a + b.distance, 0)
         if (!userData.allWeek && userData.weekDays && userData.dayHours) {
@@ -263,7 +263,7 @@ function processDevices (from, to, devices, data, userData) {
     if ((deviceData.summary.length && deviceData.summary.some(s => s.startTime)) || !userData.onlyWithActivity) {
       devicesResult.push(deviceData)
     }
-  })
+  }
 
   return devicesResult
 }

package/src/kms-report.js

@@ -8,12 +8,12 @@ const {
 const { getUserPartner } = require('fleetmap-partners')
 const traccar = require('./util/traccar')
 const { getDates, getTranslations } = require('./util/utils')
-const trips = require('./util/trips')
 const drivers = require('./util/driver')
-const { isInsideTimetable, isPartialInsideTimetable, calculateTrip, getDataByDay } = require('./util/trips')
+const { isInsideTimetable, isPartialInsideTimetable, calculateTrip, getDataByDay, checkTripsKms } = require('./util/trips')
 const traccarHelper = require('./util/traccar')
 const { devicesToProcess } = require('./util/device')
 const { getDriverData } = require('./util/driver')
+const automaticReports = require('./automaticReports')
 
 const fileName = 'KmsReport'
 
@@ -35,7 +35,7 @@ async function createKmsReport (from, to, userData, traccarInstance) {
 }
 
 async function createKmsReportByDevice (from, to, userData, traccarInstance) {
-  const devices = devicesToProcess(userData)
+  const allDevices = devicesToProcess(userData)
 
   const allData = {
     devices: [],
@@ -43,16 +43,21 @@ async function createKmsReportByDevice (from, to, userData, traccarInstance) {
     to
   }
 
-  const needRoute = !userData.allWeek || userData.groupByDay
-  const allInOne = await traccarHelper.getAllInOne(traccarInstance, from, to, devices, needRoute, true, false, false, 0, devices.length, 20)
-  const tripsData = allInOne.trips
-  const routeData = allInOne.route
-
-  console.log('trips:' + tripsData.length)
-
-  if (tripsData.length > 0) {
-    trips.checkTripsKms(traccarInstance, from, to, devices, { trips: tripsData, route: routeData })
-    allData.devices = processDevices(from, to, devices, { trips: tripsData, route: routeData }, userData)
+  let deviceCount = 0
+  const sliced = automaticReports.sliceArray(allDevices, 20)
+  for (const devices of sliced) {
+    const needRoute = !userData.allWeek
+    const {
+      trips,
+      route
+    } = await traccar.getAllInOne(traccarInstance, from, to, devices, needRoute, true, false, false, deviceCount, allDevices.length, 10)
+
+    // Process report data
+    if (trips.length) {
+      checkTripsKms(traccarInstance, from, to, allDevices, { trips, route })
+      allData.devices = await processDevices(from, to, allDevices, { trips, route }, userData, traccarInstance)
+    }
+    deviceCount += devices.length
   }
 
   return allData
@@ -92,8 +97,8 @@ async function createKmsReportByGroup (from, to, userData, traccarInstance) {
       console.log('trips:' + tripsData.length)
 
       if (tripsData.length > 0) {
-        trips.checkTripsKms(traccarInstance, from, to, devices, { trips: tripsData, route })
-        groupData.devices = processDevices(from, to, devices, { trips: tripsData, route }, userData)
+        checkTripsKms(traccarInstance, from, to, devices, { trips: tripsData, route })
+        groupData.devices = await processDevices(from, to, devices, { trips: tripsData, route }, userData, traccarInstance)
       }
 
       reportData.push(groupData)
@@ -142,7 +147,7 @@ function processDrivers (from, to, userData, data) {
   return driversResult
 }
 
-function processDevices (from, to, devices, data, userData) {
+async function processDevices (from, to, devices, data, userData, traccarInstance) {
   const devicesResult = []
 
   for (const d of devices) {
@@ -165,7 +170,7 @@ function processDevices (from, to, devices, data, userData) {
         const trips = deviceTrips.filter(t => userData.allWeek || !userData.weekDays || isInsideTimetable(t, userData) || isPartialInsideTimetable(t, userData, deviceRoute))
         const dates = getDates(from, to, userData.user.attributes.timezone || getUserPartner(userData.user).timezone)
         for (const date of dates) {
-          const { tripsByDay } = getDataByDay(date, trips, userData, deviceRoute)
+          const { tripsByDay } = await getDataByDay(d, date, { trips }, userData, traccarInstance)
           const day = {
             date,
             kms: tripsByDay.reduce((a, b) => a + b.distance, 0)

package/src/tests/zones.test.js

@@ -48,16 +48,16 @@ describe('zones', function () {
     const report = await getReports('fleetmap.joao.penas2@gmail.com', 'penas46881')
     const userData = await report.getUserData()
     userData.zonesByColumn = true
-    userData.devices = userData.devices.filter(d => d.name === 'G-5983-E Clio')
+    userData.devices = userData.devices.filter(d => d.id === 81202)
     userData.geofences = userData.geofences.filter(g => g.name === 'baliza 1 - raio verde ' ||
     g.name === 'baliza 2 - raio amarelo')
-    userData.onlyWithKmsOut = true
+    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, 30, 23, 59, 59, 0)),
+      new Date(Date.UTC(2023, 6, 13, 0, 0, 0, 0)),
+      new Date(Date.UTC(2023, 6, 13, 23, 59, 59, 0)),
       userData)
     const first = result[0].devices[0]
     console.log(first)
-    assert.equal(first.distanceOut, 0)
+    assert.equal(first.days[0].distanceOut, 28)
   }, 4000000)
 })

package/src/util/traccar.js

@@ -78,7 +78,8 @@ async function getAllInOne (
   totalDevices = devices.length,
   sliceSize = 5,
   devicesPerRequest = 1,
-  counter = undefined) {
+  counter = undefined,
+  ignorePercentage = false) {
   let url = `/reports/10240/allinone?from=${from.toISOString()}&to=${to.toISOString()}`
   if (getRoutes) url += '&type=route'
   if (getTrips) url += '&type=trips'
@@ -101,10 +102,10 @@ async function getAllInOne (
           console.log('LOADING_MESSAGE:' + _chunk[0].name)
           if (counter) {
             counter.count += devicesPerRequest
-            console.log(`PROGRESS_PERC:${counter.count / totalDevices * 100}`)
+            ignorePercentage || console.log(`PROGRESS_PERC:${counter.count / totalDevices * 100}`)
           } else {
             currentDeviceCount += devicesPerRequest
-            console.log(`PROGRESS_PERC:${currentDeviceCount / totalDevices * 100}`)
+            ignorePercentage || console.log(`PROGRESS_PERC:${currentDeviceCount / totalDevices * 100}`)
           }
           console.log(_chunk.map(d => `deviceId=${d.id}`), x.route && x.route.length)
           return x

package/src/util/trips.js

@@ -1,5 +1,6 @@
 const { coordsDistance, convertFromUTC, weekDaySelected, convertFromLocal, isClientSide, calculateDistance } = require('./utils')
 const { isInside } = require('./timetable')
+const traccarHelper = require('./traccar')
 
 const minDistance = 0
 const minAvgSpeed = 0
@@ -30,7 +31,7 @@ function checkTripsKms (traccarInstance, from, to, devices, data) {
   }
 }
 
-function calculatePartialTrip (startDate, endDate, route, t) {
+async function calculatePartialTrip (device, startDate, endDate, route, t, traccarInstance) {
   let isPartialInside = false
   const tripStart = new Date(t.startTime)
   const tripEnd = new Date(t.endTime)
@@ -39,6 +40,10 @@ function calculatePartialTrip (startDate, endDate, route, t) {
     if (tripStart.getTime() < endDate.getTime() &&
         tripEnd.getTime() > endDate.getTime()) {
       // Trip starts inside time period and ends outside time period
+      if (!route) {
+        const allInOneData = await traccarHelper.getAllInOne(traccarInstance, startDate, endDate, [device], true, false, false, false, undefined, undefined, 5, 1, undefined, true)
+        route = allInOneData.route
+      }
       const routeInside = route.filter(p => new Date(p.fixTime).getTime() < new Date(endDate.toUTCString()).getTime() && new Date(p.fixTime).getTime() > new Date(t.startTime).getTime() && t.deviceId === p.deviceId)
       updateTrip(t, routeInside)
       t.endTime = endDate.toISOString().replace('Z', '+0000')
@@ -49,6 +54,10 @@ function calculatePartialTrip (startDate, endDate, route, t) {
     if (tripStart.getTime() < startDate.getTime() &&
         new Date(t.endTime).getTime() > startDate.getTime()) {
       // Trip starts outside time period and ends inside time period
+      if (!route) {
+        const allInOneData = await traccarHelper.getAllInOne(traccarInstance, startDate, endDate, [device], true, false, false, false, undefined, undefined, 5, 1, undefined, true)
+        route = allInOneData.route
+      }
       const routeInside = route.filter(p => new Date(p.fixTime).getTime() > startDate.getTime() && new Date(p.fixTime).getTime() < new Date(t.endTime).getTime() && t.deviceId === p.deviceId)
       updateTrip(t, routeInside)
       t.startTime = startDate.toISOString().replace('Z', '+0000')
@@ -59,6 +68,10 @@ function calculatePartialTrip (startDate, endDate, route, t) {
     if (tripStart.getTime() < startDate.getTime() &&
         tripEnd.getTime() > startDate.getTime()) {
       // Trip starts outside time period and ends inside time period
+      if (!route) {
+        const allInOneData = await traccarHelper.getAllInOne(traccarInstance, startDate, endDate, [device], true, false, false, false, undefined, undefined, 5, 1, undefined, true)
+        route = allInOneData.route
+      }
       const routeInside = route.filter(p => new Date(p.fixTime).getTime() > new Date(startDate.toUTCString()).getTime() && new Date(p.fixTime).getTime() < new Date(t.endTime).getTime() && t.deviceId === p.deviceId)
       updateTrip(t, routeInside)
       t.startTime = startDate.toISOString().replace('Z', '+0000')
@@ -69,6 +82,10 @@ function calculatePartialTrip (startDate, endDate, route, t) {
     if (tripStart.getTime() < endDate.getTime() &&
         tripEnd.getTime() > endDate.getTime()) {
       // Trip starts inside time period and ends outside time period
+      if (!route) {
+        const allInOneData = await traccarHelper.getAllInOne(traccarInstance, startDate, endDate, [device], true, false, false, false, undefined, undefined, 5, 1, undefined, true)
+        route = allInOneData.route
+      }
       const routeInside = route.filter(p => new Date(p.fixTime).getTime() < endDate.getTime() && new Date(p.fixTime).getTime() > new Date(t.startTime).getTime() && t.deviceId === p.deviceId)
       updateTrip(t, routeInside)
       t.endTime = endDate.toISOString().replace('Z', '+0000')
@@ -93,10 +110,10 @@ function isPartialInsideTimetable (t, userData, route) {
   return false
 }
 
-function getDataByDay (date, trips, userData, deviceRoute) {
+async function getDataByDay (device, date, data, userData, traccarInstance) {
   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 tripsByDay = trips.filter(t => new Date(t.endTime) > fromByDay && new Date(t.startTime) < toByDay).map(t => {
+  const tripsByDay = data.trips.filter(t => new Date(t.endTime) > fromByDay && new Date(t.startTime) < toByDay).map(t => {
     return { ...t }
   })
 
@@ -104,10 +121,11 @@ function getDataByDay (date, trips, userData, deviceRoute) {
   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)
-  tripsByDay.forEach(t => calculatePartialTrip(startDate, endDate, deviceRoute, t))
-  console.log(date, tripsByDay)
+  for (const t of tripsByDay) {
+    await calculatePartialTrip(device, startDate, endDate, data.route, t, traccarInstance)
+  }
 
-  const routeByDay = deviceRoute.filter(p => (new Date(p.fixTime) > fromByDay && new Date(p.fixTime) < toByDay))
+  const routeByDay = data.route ? data.route.filter(p => (new Date(p.fixTime) > fromByDay && new Date(p.fixTime) < toByDay)) : []
   return { tripsByDay, routeByDay }
 }
 

package/src/zone-report.js

@@ -261,8 +261,13 @@ function getAnyNextIn (outDate, alerts, deviceRoute) {
   const next = alerts
     .filter(a => a.type === 'geofenceEnter')
     .find(a => new Date(a.position.fixTime).getTime() > outDate)
-  return (next && next.position && new Date(next.position.fixTime).getTime()) ||
-      new Date(deviceRoute.slice(-1)[0].fixTime).getTime()
+
+  if (!alerts.filter(a => a.type === 'geofenceExit' &&
+      new Date(a.position.fixTime).getTime() > outDate &&
+      new Date(a.position.fixTime).getTime() < new Date(next.position.fixTime).getTime()).length) {
+    return (next && next.position && new Date(next.position.fixTime).getTime()) ||
+        new Date(deviceRoute.slice(-1)[0].fixTime).getTime()
+  }
 }
 
 function calculateDistanceIn (zoneInOutDayData, deviceRoute, dayRoute, fromByDay, toByDay, to, device) {
@@ -289,9 +294,8 @@ function calculateDistanceIn (zoneInOutDayData, deviceRoute, dayRoute, fromByDay
 
 function calculateDistanceOut (zoneInOutDayData, dayRoute, fromByDay, toByDay, field, device) {
   if (zoneInOutDayData.length) {
-    const dataInsideDay = zoneInOutDayData.filter(z => (z.inTime && new Date(z.inTime.fixTime) > fromByDay) && (z.outTime && new Date(z.outTime.fixTime) > toByDay))
-    let distanceOut = dataInsideDay.reduce((a, b) => a + (b[field] || 0), 0) -
-        (dataInsideDay.length ? (dataInsideDay[dataInsideDay.length - 1][field] || 0) : 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)
 
     if (zoneInOutDayData[0].inTime && new Date(zoneInOutDayData[0].inTime.fixTime) > fromByDay) {
       // Add distanceOut before the first entry
@@ -303,6 +307,7 @@ function calculateDistanceOut (zoneInOutDayData, dayRoute, fromByDay, toByDay, f
     }
 
     if (zoneInOutDayData[zoneInOutDayData.length - 1].outTime && new Date(zoneInOutDayData[zoneInOutDayData.length - 1].outTime.fixTime) < toByDay) {
+      distanceOut = distanceOut - zoneInOutDayData[zoneInOutDayData.length - 1][field]
       const routeOut = dayRoute.filter(p =>
         new Date(p.fixTime) >= new Date(zoneInOutDayData[zoneInOutDayData.length - 1].outTime.fixTime).getTime() &&
           new Date(p.fixTime) < toByDay.getTime())