fleetmap-reports 1.0.993 → 1.0.996

package/package.json

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

package/src/activity-report.js

@@ -145,8 +145,8 @@ async function createActivityReportByDriver (from, to, userData, traccarInstance
   for (const devices of sliced) {
     const data = await traccar.getAllInOne(traccarInstance, from, to, devices, true, true, false, false, deviceCount, allDevices.length)
 
-    userData.drivers.forEach(d => {
-      const { trips, route } = getDriverData(d, data)
+    for (const d of userData.drivers) {
+      const { trips, route } = await getDriverData(d, data, userData)
       let driverData = driversData.get(d.id)
       if (!driverData) {
         driverData = { trips: [], route: [] }
@@ -154,7 +154,7 @@ async function createActivityReportByDriver (from, to, userData, traccarInstance
       }
       driverData.trips = driverData.trips.concat(...(trips || []))
       driverData.route = driverData.route.concat(...(route || []))
-    })
+    }
 
     deviceCount += devices.length
   }

package/src/idle-report.js

@@ -141,10 +141,10 @@ async function createIdleReportByDevice (from, to, userData, traccarInstance) {
   return allData
 }
 
-function processDrivers (from, to, userData, data) {
+async function processDrivers (from, to, userData, data) {
   const driversResult = []
-  userData.drivers.forEach(d => {
-    const { route } = getDriverData(d, data)
+  for (const d of userData.drivers) {
+    const { route } = await getDriverData(d, data, userData)
 
     if (route.length > 0) {
       const idleEvents = getIdleEvents(data.route, d, userData.idleSpeedThreshold / 1.85200)
@@ -165,7 +165,7 @@ function processDrivers (from, to, userData, data) {
         driversResult.push(driverData)
       }
     }
-  })
+  }
 
   return driversResult
 }

package/src/kms-report.js

@@ -166,11 +166,10 @@ async function processDrivers (from, to, userData, data) {
   const driversOnRoute = data.route ? new Set(data.route.map(p => p.attributes.driverUniqueId)) : new Set([])
   const driverToProcess = userData.drivers.filter(d => driversOnRoute.has(d.uniqueId))
 
-  driverToProcess.forEach(d => {
-    const { route, trips } = getDriverData(d, data)
-    const filteredTrips = trips.filter(t => (userData.allWeek || !userData.weekDays || isInsideTimetable(t, userData) || isPartialInsideTimetable(t, userData, route)))
+  for (const d of driverToProcess) {
+    const { trips } = await getDriverData(d, data, userData)
 
-    if (filteredTrips.length > 0) {
+    if (trips.length > 0) {
       const driverData = {
         driver: d
       }
@@ -181,7 +180,7 @@ async function processDrivers (from, to, userData, data) {
           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 = filteredTrips.filter(t => (new Date(t.startTime) > fromByDay && new Date(t.endTime) < toByDay))
+          const tripsByDay = trips.filter(t => (new Date(t.startTime) > fromByDay && new Date(t.endTime) < toByDay))
 
           driverData.days.push({
             date,
@@ -190,12 +189,12 @@ async function processDrivers (from, to, userData, data) {
         }
       } else {
         driverData.summary = {
-          distance: filteredTrips.filter(t => t.distance > 0).reduce((a, b) => a + b.distance, 0)
+          distance: trips.filter(t => t.distance > 0).reduce((a, b) => a + b.distance, 0)
         }
       }
       driversResult.push(driverData)
     }
-  })
+  }
 
   return driversResult
 }

package/src/location-report.js

@@ -46,7 +46,7 @@ async function createLocationReportByDriver (from, to, userData, traccar) {
 
   const allInOne = await traccarHelper.getAllInOne(traccar, from, to, devices, true, false, false, false)
 
-  return { drivers: processDrivers(from, to, userData, allInOne) }
+  return { drivers: await processDrivers(from, to, userData, allInOne) }
 }
 
 async function createLocationReportByGroup (from, to, userData, traccar) {
@@ -151,10 +151,10 @@ function processDevices (from, to, devices, data) {
   return devicesResult
 }
 
-function processDrivers (from, to, userData, data) {
+async function processDrivers (from, to, userData, data) {
   const driversResult = []
-  userData.drivers.forEach(d => {
-    const { route } = getDriverData(d, data)
+  for (const d of userData.drivers) {
+    const { route } = await getDriverData(d, data, userData)
     if (route.length > 0) {
       route.sort((a, b) => new Date(a.fixTime).getTime() - new Date(b.fixTime).getTime())
 
@@ -173,7 +173,7 @@ function processDrivers (from, to, userData, data) {
       }
       driversResult.push(driverData)
     }
-  })
+  }
   console.log(driversResult)
 
   return driversResult

package/src/speeding-report.js

@@ -195,8 +195,8 @@ async function processDrivers (from, to, events, routes, userData) {
 
   findEventsPosition(from, to, userData.devices, events, routes, userData)
 
-  userData.drivers.forEach(d => {
-    const driverEvents = getDriverData(d, { events }).events
+  for (const d of userData.drivers) {
+    const driverEvents = await getDriverData(d, { events }, userData).events
     if (driverEvents.length > 0) {
       driverEvents.sort((a, b) => a.positionId - b.positionId)
       driversResult.push({
@@ -209,7 +209,7 @@ async function processDrivers (from, to, events, routes, userData) {
         }, 0)
       })
     }
-  })
+  }
 
   return driversResult
 }

package/src/tests/trips.test.js

@@ -65,7 +65,7 @@ describe('trips', function () {
   }, 20000)
   // eslint-disable-next-line no-undef
   it('Trip by device with time period ', async () => {
-    const report = await getReports()
+    const report = await getReports(process.env.jppenas_email, process.env.jppenas_password)
     const userData = await report.getUserData()
 
     userData.allWeek = false
@@ -84,18 +84,18 @@ describe('trips', function () {
     }
 
     const data = await report.tripReport(
-      new Date(Date.UTC(2022, 0, 3, 0, 0, 0, 0)),
-      new Date(Date.UTC(2022, 0, 4, 23, 59, 59, 0)),
+      new Date(Date.UTC(2023, 9, 1, 0, 0, 0, 0)),
+      new Date(Date.UTC(2023, 9, 1, 23, 59, 59, 0)),
       userData)
 
     assert.equal(data.length, 1)
-    // const device = data[0].devices.find(d => d.device.id === 22326)
-    // assert.equal(device.trips.length, 1) // Total Trips
-    // assert.equal(device.totalDistance, 172190.92999999225) // Total Kms
+    const device = data[0].devices.find(d => d.device.id === 22326)
+    assert.equal(device.trips.length, 1) // Total Trips
+    assert.equal(device.totalDistance, 33538.860000000335) // Total Kms
   }, 20000)
   // eslint-disable-next-line no-undef
   it('Trip by device with time period 2', async () => {
-    const report = await getReports()
+    const report = await getReports(process.env.jppenas_email, process.env.jppenas_password)
     const userData = await report.getUserData()
 
     userData.allWeek = false
@@ -109,19 +109,19 @@ describe('trips', function () {
       saturday: true
     }
     userData.dayHours = {
-      startTime: '18:00',
+      startTime: '20:00',
       endTime: '09:00'
     }
 
     const data = await report.tripReport(
-      new Date(Date.UTC(2022, 0, 10, 0, 0, 0, 0)),
-      new Date(Date.UTC(2022, 0, 14, 23, 59, 59, 0)),
+      new Date(Date.UTC(2023, 9, 2, 0, 0, 0, 0)),
+      new Date(Date.UTC(2023, 9, 2, 23, 59, 59, 0)),
       userData)
 
     assert.equal(data.length, 1)
-    /* const device = data[0].devices.find(d => d.device.id === 22326)
-    assert.equal(device.trips.length, 22) // Total Trips
-    assert.equal(device.totalDistance, 214334.7800000161) // Total Kms */
+    const device = data[0].devices.find(d => d.device.id === 22326)
+    assert.equal(device.trips.length, 3) // Total Trips
+    assert.equal(device.totalDistance, 18589.02999999933) // Total Kms
   }, 20000)
 
   // eslint-disable-next-line no-undef

package/src/trip-report.js

@@ -268,38 +268,31 @@ async function processDrivers (from, to, userData, data) {
   }
 
   for (const d of userData.drivers) {
-    const { route, trips } = getDriverData(d, data)
-    const filteredTrips = []
-    for (const t of trips) {
-      if (userData.allWeek ||
-        !userData.weekDays ||
-        isInsideTimetable(t, userData) ||
-        await isPartialInsideTimetable(t, userData, route)) {
-        filteredTrips.push(t)
-      }
-    }
+    const { trips } = getDriverData(d, data)
 
-    filteredTrips.forEach(trip => {
-      trip.totalKms = trip.distance / 1000
+    if (trips) {
+      trips.forEach(trip => {
+        trip.totalKms = trip.distance / 1000
 
-      const nearestPOIs = getNearestPOIs(trip.endLon, trip.endLat, userData.geofences)
-      if (nearestPOIs.length > 0) {
-        trip.endPOIName = nearestPOIs[0].p.name
-      }
+        const nearestPOIs = getNearestPOIs(trip.endLon, trip.endLat, userData.geofences)
+        if (nearestPOIs.length > 0) {
+          trip.endPOIName = nearestPOIs[0].p.name
+        }
 
-      const stop = data.stops.find(s => s.deviceId === trip.deviceId && (new Date(s.startTime).getTime() === new Date(trip.endTime).getTime()))
+        const stop = data.stops.find(s => s.deviceId === trip.deviceId && (new Date(s.startTime).getTime() === new Date(trip.endTime).getTime()))
 
-      trip.stopEngineHours = getTripIdleTime(trip, idleEvents) + (stop ? stop.engineHours : 0)
-    })
+        trip.stopEngineHours = getTripIdleTime(trip, idleEvents) + (stop ? stop.engineHours : 0)
+      })
 
-    if (filteredTrips.length > 0) {
-      const driverData = {
-        driver: d,
-        from,
-        to,
-        trips: filteredTrips
+      if (trips.length > 0) {
+        const driverData = {
+          driver: d,
+          from,
+          to,
+          trips
+        }
+        driversResult.push(driverData)
       }
-      driversResult.push(driverData)
     }
   }
 

package/src/util/driver.js

@@ -1,6 +1,7 @@
 const traccar = require('./traccar')
 const automaticReports = require('../automaticReports')
 const traccarHelper = require('./traccar')
+const { isInsideTimetable, isPartialInsideTimetable } = require('./trips')
 
 // get devices used by each driver between two dates
 async function devicesByDriver (traccarInstance, from, to, drivers, devices) {
@@ -60,14 +61,26 @@ function getDriverName (driverUniqueId, date, userData) {
   return ''
 }
 
-function getDriverData (d, data) {
+async function getDriverData (d, data, userData) {
   const route = data.route ? data.route.filter(p => !d.uniqueId.localeCompare(p.attributes.driverUniqueId, undefined, { sensitivity: 'base' })) : undefined
   const trips = data.trips ? data.trips.filter(t => !d.uniqueId.localeCompare(t.driverUniqueId, undefined, { sensitivity: 'base' })) : undefined
   const events = data.events ? data.events.filter(e => e.position && !d.uniqueId.localeCompare(e.position.attributes.driverUniqueId, undefined, { sensitivity: 'base' })) : undefined
 
+  const filteredTrips = []
+  if (trips) {
+    for (const t of trips) {
+      if (userData.allWeek ||
+          !userData.weekDays ||
+          isInsideTimetable(t, userData) ||
+          await isPartialInsideTimetable(t, userData, route)) {
+        filteredTrips.push(t)
+      }
+    }
+  }
+
   return {
     route,
-    trips,
+    trips: filteredTrips,
     events
   }
 }

package/src/util/timetable.js

@@ -11,9 +11,14 @@ function isInside (start, end, userData) {
     const startDate = isClientSide() ? startDateLocal : convertFromLocal(startDateLocal, userData.user.attributes.timezone)
     const endDate = isClientSide() ? endDateLocal : convertFromLocal(endDateLocal, userData.user.attributes.timezone)
 
-    // next day
     if (startDate.getTime() > endDate.getTime()) {
-      endDate.setDate(endDate.getDate() + 1)
+      const startDatePreviousDay = new Date(startDate)
+      startDatePreviousDay.setDate(startDate.getDate() - 1)
+      const endDateNextDay = new Date(endDate)
+      endDateNextDay.setDate(endDate.getDate() + 1)
+
+      return (tripStart.getTime() > startDatePreviousDay.getTime() && tripEnd.getTime() < endDate.getTime()) ||
+          (tripStart.getTime() > startDate.getTime() && tripEnd.getTime() < endDateNextDay.getTime())
     }
     // Trips inside time period
     return tripStart.getTime() > startDate.getTime() && tripEnd.getTime() < endDate.getTime()