fleetmap-reports 1.0.250 → 1.0.251
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/workspace.xml +13 -5
- package/package.json +1 -1
- package/src/speeding-report.js +4 -4
package/.idea/workspace.xml
CHANGED
|
@@ -1,9 +1,8 @@
|
|
|
1
1
|
<?xml version="1.0" encoding="UTF-8"?>
|
|
2
2
|
<project version="4">
|
|
3
3
|
<component name="ChangeListManager">
|
|
4
|
-
<list default="true" id="eb665c86-c893-4333-bd2a-721dc27980b9" name="Changes" comment="
|
|
4
|
+
<list default="true" id="eb665c86-c893-4333-bd2a-721dc27980b9" name="Changes" comment="speeding report with customSpeed">
|
|
5
5
|
<change beforePath="$PROJECT_DIR$/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/package.json" afterDir="false" />
|
|
6
|
-
<change beforePath="$PROJECT_DIR$/src/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/index.js" afterDir="false" />
|
|
7
6
|
<change beforePath="$PROJECT_DIR$/src/index.test.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/index.test.js" afterDir="false" />
|
|
8
7
|
<change beforePath="$PROJECT_DIR$/src/speeding-report.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/speeding-report.js" afterDir="false" />
|
|
9
8
|
</list>
|
|
@@ -196,7 +195,8 @@
|
|
|
196
195
|
<workItem from="1639074912454" duration="257000" />
|
|
197
196
|
<workItem from="1639090037682" duration="2514000" />
|
|
198
197
|
<workItem from="1639135460686" duration="3092000" />
|
|
199
|
-
<workItem from="1639151097761" duration="
|
|
198
|
+
<workItem from="1639151097761" duration="13703000" />
|
|
199
|
+
<workItem from="1639246310204" duration="628000" />
|
|
200
200
|
</task>
|
|
201
201
|
<task id="LOCAL-00001" summary="Fix getStyle">
|
|
202
202
|
<created>1636983717385</created>
|
|
@@ -275,7 +275,14 @@
|
|
|
275
275
|
<option name="project" value="LOCAL" />
|
|
276
276
|
<updated>1639139696408</updated>
|
|
277
277
|
</task>
|
|
278
|
-
<
|
|
278
|
+
<task id="LOCAL-00012" summary="speeding report with customSpeed">
|
|
279
|
+
<created>1639238286381</created>
|
|
280
|
+
<option name="number" value="00012" />
|
|
281
|
+
<option name="presentableId" value="LOCAL-00012" />
|
|
282
|
+
<option name="project" value="LOCAL" />
|
|
283
|
+
<updated>1639238286382</updated>
|
|
284
|
+
</task>
|
|
285
|
+
<option name="localTasksCounter" value="13" />
|
|
279
286
|
<servers />
|
|
280
287
|
</component>
|
|
281
288
|
<component name="TypeScriptGeneratedFilesManager">
|
|
@@ -305,6 +312,7 @@
|
|
|
305
312
|
<MESSAGE value="refactor speeding and trip report" />
|
|
306
313
|
<MESSAGE value="Kms report with time period" />
|
|
307
314
|
<MESSAGE value="kms report - show every selected day" />
|
|
308
|
-
<
|
|
315
|
+
<MESSAGE value="speeding report with customSpeed" />
|
|
316
|
+
<option name="LAST_COMMIT_MESSAGE" value="speeding report with customSpeed" />
|
|
309
317
|
</component>
|
|
310
318
|
</project>
|
package/package.json
CHANGED
package/src/speeding-report.js
CHANGED
|
@@ -331,7 +331,7 @@ async function exportSpeedingReportToPDF(userData, reportData) {
|
|
|
331
331
|
translations.report.duration,
|
|
332
332
|
]
|
|
333
333
|
|
|
334
|
-
if(userData.
|
|
334
|
+
if(userData.roadSpeedLimits) {
|
|
335
335
|
headers.splice(2, 0, translations.report.roadSpeedLimit)
|
|
336
336
|
}
|
|
337
337
|
|
|
@@ -379,7 +379,7 @@ async function exportSpeedingReportToPDF(userData, reportData) {
|
|
|
379
379
|
userData.byDriver ? a.deviceName : a.driver
|
|
380
380
|
]
|
|
381
381
|
|
|
382
|
-
if(userData.
|
|
382
|
+
if(userData.roadSpeedLimits){
|
|
383
383
|
temp.splice(2, 0, a.roadSpeedLimit)
|
|
384
384
|
}
|
|
385
385
|
|
|
@@ -395,7 +395,7 @@ async function exportSpeedingReportToPDF(userData, reportData) {
|
|
|
395
395
|
convertMS(d.alerts.reduce((a, b) => a + b.eventTime, 0), true)
|
|
396
396
|
]
|
|
397
397
|
|
|
398
|
-
if(userData.
|
|
398
|
+
if(userData.roadSpeedLimits){
|
|
399
399
|
footValues.splice(2, 0, '')
|
|
400
400
|
}
|
|
401
401
|
|
|
@@ -454,7 +454,7 @@ function exportSpeedingReportToExcel(userData, reportData) {
|
|
|
454
454
|
userData.byDriver ? {label: translations.report.vehicle, value:'name'} : {label: translations.report.driver, value:'driver'}
|
|
455
455
|
]
|
|
456
456
|
|
|
457
|
-
if (userData.
|
|
457
|
+
if (userData.roadSpeedLimits){
|
|
458
458
|
headers.splice(3, 0, {label: translations.report.roadSpeedLimit, value:'roadSpeedLimit'})
|
|
459
459
|
}
|
|
460
460
|
|