fleetmap-reports 2.0.330 → 2.0.331
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/package.json +1 -1
- package/src/speeding-report.js +1 -1
- package/src/trip-report.js +3 -1
package/package.json
CHANGED
package/src/speeding-report.js
CHANGED
|
@@ -597,7 +597,7 @@ function exportSpeedingReportToExcel (userData, reportData) {
|
|
|
597
597
|
overspeedData.forEach(d => {
|
|
598
598
|
data = data.concat([{}])
|
|
599
599
|
data = data.concat(d.alerts.map(a => {
|
|
600
|
-
const group = userData.groups.find(g => g.id ===
|
|
600
|
+
const group = userData.groups.find(g => g.id === a.device.groupId)
|
|
601
601
|
return {
|
|
602
602
|
groupName: group ? group.name : '',
|
|
603
603
|
driver: userData.byDriver ? d.driver.name : a.driver,
|
package/src/trip-report.js
CHANGED
|
@@ -535,6 +535,7 @@ function exportTripReportToExcel (userData, reportData) {
|
|
|
535
535
|
}
|
|
536
536
|
|
|
537
537
|
tripsData.forEach(d => {
|
|
538
|
+
const group = userData.groups.find(g => g.id === d.device.groupId)
|
|
538
539
|
data = data.concat([{}])
|
|
539
540
|
data = data.concat(d.trips.map(a => {
|
|
540
541
|
return {
|
|
@@ -555,7 +556,8 @@ function exportTripReportToExcel (userData, reportData) {
|
|
|
555
556
|
maxTemp: a.maxTemp,
|
|
556
557
|
minTemp: a.minTemp,
|
|
557
558
|
avgTemp: a.avgTemp && Number(a.avgTemp.toFixed(1)),
|
|
558
|
-
model:
|
|
559
|
+
model: d.device.model,
|
|
560
|
+
group: group && group.name
|
|
559
561
|
}
|
|
560
562
|
}))
|
|
561
563
|
// Totals
|