fleetmap-reports 1.0.414 → 1.0.415

package/package.json

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

package/src/idle-report.js

@@ -42,7 +42,11 @@ async function createIdleReportByDriver (from, to, userData, traccarInstance) {
 
   const { route } = await traccarHelper.getAllInOne(traccarInstance, from, to, devices, true, false, false, false)
 
-  return { drivers: processDrivers(from, to, userData, route) }
+  return {
+    drivers: processDrivers(from, to, userData, route),
+    from,
+    to
+  }
 }
 
 async function createIdleReportByGroup (from, to, userData, traccarInstance) {
@@ -108,17 +112,21 @@ async function createIdleReportByDevice (from, to, userData, traccarInstance) {
 function processDrivers (from, to, userData, routes) {
   const driversResult = []
   userData.drivers.forEach(d => {
-    const route = routes.filter(p => p.attributes.driverUniqueId === d.uniqueId || !p.attributes.ignition)
+    const route = routes.filter(p => p.attributes.driverUniqueId === d.uniqueId)
 
-    const idleEvents = getIdleEvents(route)
-    console.log(idleEvents)
     if (route.length > 0) {
+      const idleEvents = getIdleEvents(routes, d)
       const filteredEvents = idleEvents.filter(e => userData.minimumIdleMinutes ? e.idleTime > userData.minimumIdleMinutes * 60 * 1000 : true)
 
       if (filteredEvents.length) {
+        filteredEvents.forEach(e => {
+          const device = userData.devices.find(d => d.id === e.position.deviceId)
+          e.deviceName = device ? device.name : ''
+        })
+
         const driverData = {
           driver: d,
-          idleEvents: filteredEvents
+          idleEvents: filteredEvents.sort((a, b) => (new Date(a.position.fixTime) > new Date(b.position.fixTime)) ? 1 : -1)
         }
         driversResult.push(driverData)
       }

package/src/index.test.js

@@ -208,8 +208,8 @@ describe('Test_Reports', function () {
     assert.equal(data.length, 1)
     const driver = data[0].drivers.find(d => d.driver.id === 14020)
     const totalIdleTime = driver.idleEvents.reduce((a, b) => a + b.idleTime, 0)
-    assert.equal(driver.idleEvents.length, 12) // Total Alerts
-    assert.equal(totalIdleTime, 30785000) // Total Duration
+    assert.equal(driver.idleEvents.length, 1) // Total Alerts
+    assert.equal(totalIdleTime, 8267000) // Total Duration
   }, 20000)
   // eslint-disable-next-line no-undef
   it('Activity by device', async () => {

package/src/trip-report.js

@@ -193,7 +193,7 @@ function processDrivers (from, to, userData, data) {
 
     trips.sort((a, b) => new Date(a.startTime).getTime() - new Date(b.startTime).getTime())
 
-    const idleEvents = getIdleEvents(data.route.filter(p => p.attributes.driverUniqueId === d.uniqueId || !p.attributes.ignition))
+    const idleEvents = getIdleEvents(data.route, d)
 
     trips.forEach(function (trip, i) {
       trip.stopEngineHours = getTripIdleTime(trip, idleEvents)

package/src/util/route.js

@@ -1,4 +1,4 @@
-function getIdleEvents (route) {
+function getIdleEvents (route, driver) {
   const idleEvents = []
 
   const routeByDevice = route.reduce(function (a, x) {
@@ -9,7 +9,7 @@ function getIdleEvents (route) {
   Object.keys(routeByDevice).forEach(function (key) {
     let inIdle = false
     routeByDevice[key].forEach(p => {
-      if (p.attributes.ignition && p.speed === 0) {
+      if (p.attributes.ignition && p.speed === 0 && (!driver || p.attributes.driverUniqueId === driver.uniqueId)) {
         if (!inIdle) {
           const idleEvent = {
             position: p,
@@ -21,6 +21,7 @@ function getIdleEvents (route) {
           if (!idleEvents[idleEvents.length - 1].position.attributes.driverUniqueId) {
             idleEvents[idleEvents.length - 1].position.attributes.driverUniqueId = p.attributes.driverUniqueId
           }
+
           if (p.attributes.idleTime) {
             idleEvents[idleEvents.length - 1].idleTime = p.attributes.idleTime
           }