fleetmap-reports 1.0.229 → 1.0.230

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": "1.0.229",
3
+ "version": "1.0.230",
4
4
  "description": "",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
package/src/kms-report.js CHANGED
@@ -240,11 +240,16 @@ function exportKmsReportToExcel(userData, reportData) {
240
240
  if(userData.groupByDay){
241
241
  headers.push(
242
242
  {label: translations.report.vehicle, value: 'name'},
243
- {label: translations.settings.vehicle_licenseplate, value: 'licenseplate'},
243
+
244
244
  {label: translations.report.group, value: 'group'},
245
245
  {label: translations.report.date, value: 'date'},
246
246
  {label: translations.report.distance, value: 'distance'})
247
247
  } else if(userData.byDriver) {
248
+ headers.push(
249
+ {label: translations.report.driver, value: 'name'},
250
+ {label: translations.report.group, value: 'group'},
251
+ {label: translations.report.distance, value: 'distance'})
252
+ } else {
248
253
  headers.push(
249
254
  {label: translations.report.driver, value: 'name'},
250
255
  {label: translations.settings.vehicle_licenseplate, value: 'licenseplate'},
@@ -258,7 +263,7 @@ function exportKmsReportToExcel(userData, reportData) {
258
263
  const group = userData.byDriver ? userData.groups.find(g => g.drivers.includes(d.driver.id)) :
259
264
  userData.groups.find(g => d.device.groupId === g.id)
260
265
 
261
- if(userData.groupByDay) {
266
+ if (userData.groupByDay) {
262
267
  data = data.concat([{}])
263
268
  data = data.concat(d.days.map(a => {
264
269
  return {