fleetmap-reports 1.0.319 → 1.0.320
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.idea/aws.xml +17 -0
- package/{fleetmap-reports.iml → .idea/fleetmap-reports.iml} +2 -1
- package/.idea/modules.xml +1 -1
- package/.idea/runConfigurations.xml +10 -0
- package/.idea/vcs.xml +1 -1
- package/package.json +1 -1
- package/src/events-report.js +1 -1
- package/src/kms-report.js +1 -1
- package/src/speeding-report.js +1 -1
- package/.idea/codeStyles/codeStyleConfig.xml +0 -5
- package/.idea/inspectionProfiles/Project_Default.xml +0 -6
- package/.idea/jsLibraryMappings.xml +0 -6
package/.idea/aws.xml
ADDED
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
<?xml version="1.0" encoding="UTF-8"?>
|
|
2
|
+
<project version="4">
|
|
3
|
+
<component name="accountSettings">
|
|
4
|
+
<option name="activeProfile" value="profile:default" />
|
|
5
|
+
<option name="activeRegion" value="us-east-1" />
|
|
6
|
+
<option name="recentlyUsedProfiles">
|
|
7
|
+
<list>
|
|
8
|
+
<option value="profile:default" />
|
|
9
|
+
</list>
|
|
10
|
+
</option>
|
|
11
|
+
<option name="recentlyUsedRegions">
|
|
12
|
+
<list>
|
|
13
|
+
<option value="us-east-1" />
|
|
14
|
+
</list>
|
|
15
|
+
</option>
|
|
16
|
+
</component>
|
|
17
|
+
</project>
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
<?xml version="1.0" encoding="UTF-8"?>
|
|
2
|
-
<module type="
|
|
2
|
+
<module type="JAVA_MODULE" version="4">
|
|
3
3
|
<component name="NewModuleRootManager" inherit-compiler-output="true">
|
|
4
4
|
<exclude-output />
|
|
5
5
|
<content url="file://$MODULE_DIR$" />
|
|
6
|
+
<orderEntry type="inheritedJdk" />
|
|
6
7
|
<orderEntry type="sourceFolder" forTests="false" />
|
|
7
8
|
</component>
|
|
8
9
|
</module>
|
package/.idea/modules.xml
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
<project version="4">
|
|
3
3
|
<component name="ProjectModuleManager">
|
|
4
4
|
<modules>
|
|
5
|
-
<module fileurl="file://$PROJECT_DIR
|
|
5
|
+
<module fileurl="file://$PROJECT_DIR$/.idea/fleetmap-reports.iml" filepath="$PROJECT_DIR$/.idea/fleetmap-reports.iml" />
|
|
6
6
|
</modules>
|
|
7
7
|
</component>
|
|
8
8
|
</project>
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
<?xml version="1.0" encoding="UTF-8"?>
|
|
2
|
+
<project version="4">
|
|
3
|
+
<component name="RunConfigurationProducerService">
|
|
4
|
+
<option name="ignoredProducers">
|
|
5
|
+
<set>
|
|
6
|
+
<option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
|
|
7
|
+
</set>
|
|
8
|
+
</option>
|
|
9
|
+
</component>
|
|
10
|
+
</project>
|
package/.idea/vcs.xml
CHANGED
package/package.json
CHANGED
package/src/events-report.js
CHANGED
|
@@ -25,7 +25,7 @@ async function createEventsReport(from, to, userData, traccar) {
|
|
|
25
25
|
xpert: devices.filter(d => d.attributes.xpert).length > 0
|
|
26
26
|
}
|
|
27
27
|
|
|
28
|
-
const data = await getReportData(from, to, devices, userData.eventTypes)
|
|
28
|
+
const data = await getReportData(from, to, devices, userData.eventTypes, traccar)
|
|
29
29
|
|
|
30
30
|
devices.sort((a, b) => (a.name > b.name) ? 1 : -1)
|
|
31
31
|
|
package/src/kms-report.js
CHANGED
|
@@ -103,7 +103,7 @@ async function createKmsReportByGroup(from, to, userData, traccarInstance) {
|
|
|
103
103
|
}
|
|
104
104
|
}
|
|
105
105
|
|
|
106
|
-
const withoutGroupData = await createKmsReportByDevice(from, to)
|
|
106
|
+
const withoutGroupData = await createKmsReportByDevice(from, to, userData, traccarInstance)
|
|
107
107
|
reportData.push(withoutGroupData)
|
|
108
108
|
|
|
109
109
|
return reportData
|
package/src/speeding-report.js
CHANGED
|
@@ -63,7 +63,7 @@ async function createSpeedingReportByGroup(from, to, userData, traccarInstance){
|
|
|
63
63
|
const groupIds = userData.groups.map(g => g.id)
|
|
64
64
|
const withoutGroupDevices = userData.devices.filter(d => !groupIds.includes(d.groupId))
|
|
65
65
|
|
|
66
|
-
const withoutGroupData = await createSpeedingReportByDevice(from, to, withoutGroupDevices)
|
|
66
|
+
const withoutGroupData = await createSpeedingReportByDevice(from, to, withoutGroupDevices, userData, traccarInstance)
|
|
67
67
|
reportData.push(withoutGroupData)
|
|
68
68
|
|
|
69
69
|
return reportData
|