fleetmap-reports 1.0.313 → 1.0.317

package/package.json

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

package/src/activity-report.js

@@ -348,7 +348,7 @@ function exportActivityReportToPDF_Vehicle(doc, translations, reportData, userDa
         getSumAvgSpeed(reportData.devices, userData),
         getSumMaxSpeed(reportData.devices, userData),
         convertMS(reportData.devices.reduce((a, b) => a + b.summary[0].engineHours, 0)),
-        getSumSpentFuel(reportData.devices, userdata)]
+        getSumSpentFuel(reportData.devices, userData)]
 
     const style = getStyle(getUserPartner(userData.user))
     addTable(doc, headers, data, footValues, style, 35)

package/src/idle-report.js

@@ -45,7 +45,7 @@ async function createTripReportByGroup(from, to, userData, traccarInstance) {
 
             if (routes.length > 0) {
                 console.log('Routes:' + routes.length)
-                groupData.devices = processDevices(from, to, devices, routes)
+                groupData.devices = processDevices(from, to, devices, routes, userData)
 
                 reportData.push(groupData)
             }
@@ -76,13 +76,13 @@ async function createTripReportByDevice(from, to, devices, userData, traccarInst
     console.log('Route:' + route.length)
 
     if (route.length > 0) {
-        allData.devices = processDevices(from, to, devices, route)
+        allData.devices = processDevices(from, to, devices, route, userData)
     }
 
     return allData
 }
 
-function processDevices(from, to, devices, routes) {
+function processDevices(from, to, devices, routes, userData) {
     const devicesResult = []
 
     devices.forEach(d => {
@@ -107,10 +107,12 @@ function processDevices(from, to, devices, routes) {
             }
         })
 
-        if(idleEvents.length) {
+        const filteredEvents = idleEvents.filter(e => userData.minimumIdleMinutes ? e.idleTime > userData.minimumIdleMinutes*60*1000 : true)
+
+        if(filteredEvents.length) {
             const deviceData = {
                 device: d,
-                idleEvents: idleEvents
+                idleEvents: filteredEvents
             }
             devicesResult.push(deviceData)
         }

package/src/speeding-report.js

@@ -54,7 +54,7 @@ async function createSpeedingReportByGroup(from, to, userData, traccarInstance){
       devices.sort((a, b) => (a.name > b.name) ? 1 : -1)
 
       if (events.length > 0) {
-        groupData.devices = await processDevices(from, to, devices, events, routes)
+        groupData.devices = await processDevices(from, to, devices, events, routes, userData)
         reportData.push(groupData)
       }
     }
@@ -90,7 +90,7 @@ async function createSpeedingReportByDevice(from, to, devices, userData, traccar
   }
 
   return {
-    devices: await processDevices(from, to, devices, events, routes),
+    devices: await processDevices(from, to, devices, events, routes, userData),
     xpert: devices.filter(d => d && d.attributes && d.attributes.xpert).length > 0
   }
 }