fleetmap-reports 1.0.315 → 1.0.320

package/package.json

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

package/src/events-report.js

@@ -25,7 +25,7 @@ async function createEventsReport(from, to, userData, traccar) {
                     xpert: devices.filter(d => d.attributes.xpert).length > 0
                 }
 
-                const data = await getReportData(from, to, devices, userData.eventTypes)
+                const data = await getReportData(from, to, devices, userData.eventTypes, traccar)
 
                 devices.sort((a, b) => (a.name > b.name) ? 1 : -1)
 

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/kms-report.js

@@ -103,7 +103,7 @@ async function createKmsReportByGroup(from, to, userData, traccarInstance) {
         }
     }
 
-    const withoutGroupData = await createKmsReportByDevice(from, to)
+    const withoutGroupData = await createKmsReportByDevice(from, to, userData, traccarInstance)
     reportData.push(withoutGroupData)
 
     return reportData

package/src/speeding-report.js

@@ -63,7 +63,7 @@ async function createSpeedingReportByGroup(from, to, userData, traccarInstance){
   const groupIds = userData.groups.map(g => g.id)
   const withoutGroupDevices = userData.devices.filter(d => !groupIds.includes(d.groupId))
 
-  const withoutGroupData = await createSpeedingReportByDevice(from, to, withoutGroupDevices)
+  const withoutGroupData = await createSpeedingReportByDevice(from, to, withoutGroupDevices, userData, traccarInstance)
   reportData.push(withoutGroupData)
 
   return reportData