fleetmap-reports 1.0.425 → 1.0.428

package/package.json

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

package/src/idle-report.js

@@ -7,6 +7,7 @@ const { devicesToProcess } = require('./util/device')
 const automaticReports = require('./automaticReports')
 const traccarHelper = require('./util/traccar')
 const { getIdleEvents } = require('./util/route')
+const { reportByDriver } = require('./util/driver')
 
 const fileName = 'IdleReport'
 
@@ -31,22 +32,36 @@ async function createIdleReport (from, to, userData, traccarInstance) {
   return reportData
 }
 
-async function createIdleReportByDriver (from, to, userData, traccarInstance) {
-  const devices = await traccarInstance.devices.devicesGet().then(d => d.data)
-  console.log(devices.length)
+async function createIdleReportByDriver (from, to, userData, traccar) {
+  const devices = await traccar.devices.devicesGet().then(d => d.data)
 
   if (!devices.length) {
     // Empty report
     return { drivers: [] }
   }
 
-  const { route } = await traccarHelper.getAllInOne(traccarInstance, from, to, devices, true, false, false, false)
+  const results = await reportByDriver(devices, traccar, from, to, userData, processDrivers)
 
-  return {
-    drivers: processDrivers(from, to, userData, route),
+  const report = {
+    drivers: [],
     from,
     to
   }
+
+  results.drivers.forEach(result => {
+    const driver = report.drivers.find(d => d.driver.id === result.driver.id)
+    if (driver) {
+      driver.idleEvents.push(...result.idleEvents)
+    } else {
+      report.drivers.push(result)
+    }
+  })
+
+  report.drivers.forEach(d => {
+    d.idleEvents = d.idleEvents.sort((a, b) => (new Date(a.position.fixTime) > new Date(b.position.fixTime)) ? 1 : -1)
+  })
+
+  return report
 }
 
 async function createIdleReportByGroup (from, to, userData, traccarInstance) {
@@ -109,13 +124,13 @@ async function createIdleReportByDevice (from, to, userData, traccarInstance) {
   return allData
 }
 
-function processDrivers (from, to, userData, routes) {
+function processDrivers (from, to, userData, data) {
   const driversResult = []
   userData.drivers.forEach(d => {
-    const route = routes.filter(p => p.attributes.driverUniqueId === d.uniqueId)
+    const route = data.route.filter(p => p.attributes.driverUniqueId === d.uniqueId)
 
     if (route.length > 0) {
-      const idleEvents = getIdleEvents(routes, d)
+      const idleEvents = getIdleEvents(data.route, d)
       const filteredEvents = idleEvents.filter(e => userData.minimumIdleMinutes ? e.idleTime > userData.minimumIdleMinutes * 60 * 1000 : true)
 
       if (filteredEvents.length) {
@@ -126,7 +141,7 @@ function processDrivers (from, to, userData, routes) {
 
         const driverData = {
           driver: d,
-          idleEvents: filteredEvents.sort((a, b) => (new Date(a.position.fixTime) > new Date(b.position.fixTime)) ? 1 : -1)
+          idleEvents: filteredEvents
         }
         driversResult.push(driverData)
       }

package/src/index.test.js

@@ -52,6 +52,21 @@ describe('Test_Reports', function () {
     assert.equal(device.trips[1].endPOIName, undefined)
     assert.equal(device.totalDistance, 339204.53999999166) // Total Kms
   }, 20000)
+  // eslint-disable-next-line no-undef
+  it('Trip by driver', async () => {
+    const report = await getReports()
+    const userData = await report.getUserData()
+    userData.byDriver = true
+    const data = await report.tripReport(new Date(2022, 1, 1, 0, 0, 0, 0),
+      new Date(2022, 1, 10, 23, 59, 59, 0),
+      userData)
+    assert.equal(data.length, 1)
+    console.log(data[0].drivers)
+    const driver = data[0].drivers.find(d => d.driver.id === 14020)
+    assert.equal(driver.trips.length, 9) // Total Trips
+    assert.equal(driver.totalDuration, 6274000)
+    assert.equal(driver.maxSpeed, 70.1944)
+  }, 20000)
   it('Trip without addresses', async () => {
     const report = await getReports()
     const userData = await report.getUserData()

package/src/speeding-report.js

@@ -80,7 +80,7 @@ async function createSpeedingReportByDevice (from, to, userData, traccarInstance
 
   let deviceCount = 0
   for (const slice of sliced) {
-    const { routes, events } = await getEvents(traccarInstance, from, to, slice, userData)
+    const { routes, events } = await getEvents(traccarInstance, from, to, slice, userData, deviceCount, devices.length)
     if (events.length > 0) {
       const devicesProcessed = await processDevices(from, to, slice, events, routes, userData)
       allData.devices.push(...devicesProcessed)
@@ -110,11 +110,11 @@ async function createSpeedingReportByDriver (from, to, userData, traccarInstance
   return { drivers: await processDrivers(from, to, events, routes, userData) }
 }
 
-async function getEvents (traccarInstance, from, to, devices, userData) {
+async function getEvents (traccarInstance, from, to, devices, userData, deviceCount, totalDevices) {
   const geofencesFeatures = userData.geofences.filter(g => g.area.startsWith('POLYGON') &&
       g.attributes.speedLimit).map(g => convertToFeature(g))
 
-  const allInOne = await traccarHelper.getAllInOne(traccarInstance, from, to, devices, true, false, false, false)
+  const allInOne = await traccarHelper.getAllInOne(traccarInstance, from, to, devices, true, false, false, false, deviceCount, totalDevices)
   const routes = allInOne.route
 
   const events = []

package/src/trip-report.js

@@ -10,6 +10,7 @@ const trips = require('./util/trips')
 const { isInsideTimetable, addNearestPOIs, isPartialInsideTimetable, calculateTrip, getTripIdleTime } = require('./util/trips')
 const { devicesToProcess } = require('./util/device')
 const { getIdleEvents } = require('./util/route')
+const { reportByDriver } = require('./util/driver')
 
 const fileName = 'TripReport'
 
@@ -114,11 +115,29 @@ async function createTripReportByDriver (from, to, userData, traccar) {
     return { drivers: [] }
   }
 
-  const allInOne = await traccarHelper.getAllInOne(traccar, from, to, devices, true, true, false, false)
-  const tripsData = allInOne.trips
-  const routeData = allInOne.route
+  const results = await reportByDriver(devices, traccar, from, to, userData, processDrivers)
 
-  return { drivers: processDrivers(from, to, userData, { trips: tripsData, route: routeData }) }
+  const report = {
+    drivers: []
+  }
+
+  results.drivers.forEach(result => {
+    const driver = report.drivers.find(d => d.driver.id === result.driver.id)
+    if (driver) {
+      driver.trips.push(...result.trips)
+    } else {
+      report.drivers.push(result)
+    }
+  })
+
+  report.drivers.forEach(d => {
+    d.totalDuration = d.trips.reduce((a, b) => a + b.duration, 0)
+    d.totalDistance = d.trips.reduce((a, b) => a + b.distance, 0)
+    d.maxSpeed = d.trips.reduce((a, b) => { return a > b.maxSpeed ? a : b.maxSpeed }, 0)
+    d.trips = d.trips.sort((a, b) => new Date(a.startTime).getTime() - new Date(b.startTime).getTime())
+  })
+
+  return report
 }
 
 function processDevices (from, to, devices, data, userData, traccar) {
@@ -195,8 +214,6 @@ function processDrivers (from, to, userData, data) {
     const trips = data.trips.filter(t => t.driverUniqueId === d.uniqueId &&
             (userData.allWeek || !userData.weekDays || isInsideTimetable(t, userData) || isPartialInsideTimetable(t, userData, route)))
 
-    trips.sort((a, b) => new Date(a.startTime).getTime() - new Date(b.startTime).getTime())
-
     const idleEvents = getIdleEvents(data.route, d)
 
     trips.forEach(function (trip, i) {
@@ -211,15 +228,11 @@ function processDrivers (from, to, userData, data) {
         driver: d,
         from,
         to,
-        totalDuration: trips.reduce((a, b) => a + b.duration, 0),
-        totalDistance: trips.reduce((a, b) => a + b.distance, 0),
-        maxSpeed: trips.reduce((a, b) => { return a > b.maxSpeed ? a : b.maxSpeed }, 0),
         trips
       }
       driversResult.push(driverData)
     }
   })
-  console.log(driversResult)
 
   return driversResult
 }

package/src/util/driver.js

@@ -1,17 +1,43 @@
-const traccar = require("./traccar");
-
-//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 = []
-    for(const d of drivers) {
-        const events = eventsData.filter(e => {
-            return e.attributes.driverUniqueId === d.uniqueId
-        })
-
-        deviceIds.push(...events.map(e => e.deviceId))
-    }
-    return devices.filter(d => deviceIds.includes(d.id))
+const traccar = require('./traccar')
+const automaticReports = require('../automaticReports')
+const traccarHelper = require('./traccar')
+
+// 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 = []
+  for (const d of drivers) {
+    const events = eventsData.filter(e => {
+      return e.attributes.driverUniqueId === d.uniqueId
+    })
+
+    deviceIds.push(...events.map(e => e.deviceId))
+  }
+  return devices.filter(d => deviceIds.includes(d.id))
+}
+
+async function reportByDriver (devices, traccar, from, to, userData, processor) {
+  const report = {
+    drivers: []
+  }
+
+  const sliced = automaticReports.sliceArray(devices, 5)
+
+  let deviceCount = 0
+  for (const slice of sliced) {
+    const allInOne = await traccarHelper.getAllInOne(traccar, from, to, slice, true, true, false, false, deviceCount, devices.length)
+    const tripsData = allInOne.trips
+    const routeData = allInOne.route
+
+    const results = processor(from, to, userData, { trips: tripsData, route: routeData })
+
+    report.drivers.push(...results)
+
+    deviceCount = deviceCount + slice.length
+  }
+
+  return report
 }
 
 exports.devicesByDriver = devicesByDriver
+exports.reportByDriver = reportByDriver