fleetmap-reports 2.0.294 → 2.0.296

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 CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "fleetmap-reports",
3
- "version": "2.0.294",
3
+ "version": "2.0.296",
4
4
  "description": "",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
@@ -173,6 +173,7 @@ async function processDevices (from, to, devices, data, userData, traccar) {
173
173
  const stops = data.stops.filter(s => s.deviceId === d.id)
174
174
 
175
175
  trips.forEach(trip => {
176
+ trip.model = d.model
176
177
  const stop = getStop(new Date(trip.startTime), stops)
177
178
 
178
179
  trip.totalKms = getTripTotalKms(trip, stop, deviceRoute)
@@ -527,7 +528,7 @@ function exportTripReportToExcel (userData, reportData) {
527
528
  headers.unshift({ label: translations.report.driver, value: 'name' })
528
529
  headers.push({ label: translations.report.vehicle, value: 'subname' })
529
530
  } else {
530
- headers.unshift({ label: translations.report.model, value: 'model' })
531
+ headers.unshift({ label: translations.settings.vehicle_model, value: 'model' })
531
532
  headers.unshift({ label: translations.report.group, value: 'group' })
532
533
  headers.unshift({ label: translations.report.driver, value: 'subname' })
533
534
  headers.unshift({ label: translations.report.vehicle, value: 'name' })