fleetmap-reports 1.0.427 → 1.0.428

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fleetmap-reports",
-  "version": "1.0.427",
+  "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/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,40 +115,29 @@ async function createTripReportByDriver (from, to, userData, traccar) {
     return { drivers: [] }
   }
 
-  const allData = {
+  const results = await reportByDriver(devices, traccar, from, to, userData, processDrivers)
+
+  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 = processDrivers(from, to, userData, { trips: tripsData, route: routeData })
-
-    results.forEach(result => {
-      const driver = allData.drivers.find(d => d.driver.id === result.driver.id)
-      if (driver) {
-        driver.trips.push(...result.trips)
-      } else {
-        allData.drivers.push(result)
-      }
-    })
-
-    deviceCount = deviceCount + slice.length
-  }
+  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)
+    }
+  })
 
-  allData.drivers.forEach(d => {
+  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 allData
+  return report
 }
 
 function processDevices (from, to, devices, data, userData, traccar) {

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