fleetmap-reports 1.0.314 → 1.0.319

package/.idea/codeStyles/codeStyleConfig.xml

@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
+  </state>
+</component>

package/.idea/inspectionProfiles/Project_Default.xml

@@ -0,0 +1,6 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
+  </profile>
+</component>

package/.idea/jsLibraryMappings.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="JavaScriptLibraryMappings">
+    <includedPredefinedLibrary name="Node.js Core" />
+  </component>
+</project>

package/.idea/modules.xml

@@ -2,7 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/fleetmap-reports.iml" filepath="$PROJECT_DIR$/.idea/fleetmap-reports.iml" />
+      <module fileurl="file://$PROJECT_DIR$/fleetmap-reports.iml" filepath="$PROJECT_DIR$/fleetmap-reports.iml" />
     </modules>
   </component>
 </project>

package/.idea/vcs.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
 </project>

package/{.idea/fleetmap-reports.iml → fleetmap-reports.iml}

@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
+<module type="WEB_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fleetmap-reports",
-  "version": "1.0.314",
+  "version": "1.0.319",
   "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/.idea/aws.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="accountSettings">
-    <option name="activeProfile" value="profile:default" />
-    <option name="activeRegion" value="us-east-1" />
-    <option name="recentlyUsedProfiles">
-      <list>
-        <option value="profile:default" />
-      </list>
-    </option>
-    <option name="recentlyUsedRegions">
-      <list>
-        <option value="us-east-1" />
-      </list>
-    </option>
-  </component>
-</project>

package/.idea/runConfigurations.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>