fleetmap-reports 1.0.902 → 1.0.905

package/lang/enGB.js

@@ -277,7 +277,8 @@ module.exports = {
     timeOut: 'Time Out',
     maxTemp: 'Max Temp',
     minTemp: 'Min Temp',
-    avgTemp: 'Avg Temp'
+    avgTemp: 'Avg Temp',
+    total: 'Total'
   },
   layout: {
     deviceOnline: 'Device Online',

package/lang/esCL.js

@@ -266,7 +266,8 @@ module.exports = {
     timeOut: 'Tempo Afuera',
     maxTemp: 'Temp.Max',
     minTemp: 'Temp.Min',
-    avgTemp: 'Temp.Média'
+    avgTemp: 'Temp.Média',
+    total: 'Total'
   },
   layout: {
     deviceOnline: 'Dispositivo en línea',

package/lang/frFR.json

@@ -275,7 +275,8 @@
     "zone": "Zone",
     "maxTemp": "Temp.Max",
     "minTemp": "Temp.Min",
-    "avgTemp": "Temp.Moyenne"
+    "avgTemp": "Temp.Moyenne",
+    "total": "Total"
   },
   "layout": {
     "deviceOnline": "Appareil en ligne",

package/lang/ptBR.js

@@ -271,7 +271,8 @@ module.exports = {
     timeOut: 'Tempo Fora',
     maxTemp: 'Temp.Máx',
     minTemp: 'Temp.Min',
-    avgTemp: 'Temp.Média'
+    avgTemp: 'Temp.Média',
+    total: 'Total'
   },
   layout: {
     deviceOnline: 'Dispositivo Online',

package/lang/ptPT.js

@@ -280,7 +280,8 @@ module.exports = {
     timeOut: 'Tempo Fora',
     maxTemp: 'Temp.Máx',
     minTemp: 'Temp.Min',
-    avgTemp: 'Temp.Média'
+    avgTemp: 'Temp.Média',
+    total: 'Total'
   },
   layout: {
     test: 'Test Notification',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fleetmap-reports",
-  "version": "1.0.902",
+  "version": "1.0.905",
   "description": "",
   "main": "src/index.js",
   "scripts": {

package/src/kms-report.js

@@ -332,31 +332,26 @@ function exportKmsReportToExcel (userData, reportData) {
 
   const translations = getTranslations(userData)
 
-  const weekDays = [
-    translations.report.sunday,
-    translations.report.monday,
-    translations.report.tuesday,
-    translations.report.wednesday,
-    translations.report.thursday,
-    translations.report.friday,
-    translations.report.saturday
-  ]
-
   const settings = {
     sheetName: translations.report.titleKmsReport, // The name of the sheet
     fileName // The name of the spreadsheet
   }
 
   const headers = []
+  const info = userData.byDriver ? reportData.drivers : reportData.devices
 
   if (userData.groupByDay) {
     headers.push(
       { label: translations.report.vehicle, value: 'name' },
       { label: translations.settings.vehicle_licenseplate, value: 'licenseplate' },
-      { label: translations.report.group, value: 'group' },
-      { label: translations.report.date, value: 'date' },
-      { label: translations.report.weekDay, value: 'weekday' },
-      { label: translations.report.distance, value: 'distance' })
+      { label: translations.report.group, value: 'group' })
+
+    const days = info[0].days
+    days.forEach((day, index) => {
+      headers.push({ label: new Date(day.date).toLocaleDateString(), value: 'day' + index })
+    })
+
+    headers.push({ label: translations.report.total, value: 'total' })
   } else if (userData.byDriver) {
     headers.push(
       { label: translations.report.driver, value: 'name' },
@@ -371,7 +366,7 @@ function exportKmsReportToExcel (userData, reportData) {
   }
 
   let data = []
-  const info = userData.byDriver ? reportData.drivers : reportData.devices
+
   info.forEach(d => {
     const group = userData.byDriver
       ? userData.groups.find(g => g.drivers && g.drivers.includes(d.driver.id))
@@ -379,17 +374,19 @@ function exportKmsReportToExcel (userData, reportData) {
 
     if (userData.groupByDay) {
       if (d.days) {
-        data = data.concat([{}])
-        data = data.concat(d.days.map(a => {
-          return {
-            name: d.device.name,
-            group: group ? group.name : '',
-            licenseplate: d.device.attributes.license_plate,
-            date: a.date,
-            weekday: weekDays[a.date.getDay()],
-            distance: Number((a.kms / 1000).toFixed(0))
-          }
-        }))
+        const vehicle = {
+          name: d.device.name,
+          group: group ? group.name : '',
+          licenseplate: d.device.attributes.license_plate
+        }
+
+        d.days.forEach((day, index) => {
+          vehicle['day' + index] = Number((day.kms / 1000).toFixed(0))
+        })
+
+        vehicle.total = Number(d.days.reduce((a, b) => a + (b.kms / 1000), 0).toFixed(0))
+
+        data = data.concat([vehicle])
       }
     } else {
       data = data.concat([{
@@ -402,7 +399,7 @@ function exportKmsReportToExcel (userData, reportData) {
   })
 
   // add total
-  if (data.length) {
+  if (data.length && !userData.groupByDay) {
     data = data.concat({
       name: '',
       group: '',

package/src/zone-report.js

@@ -655,7 +655,7 @@ function exportZoneReportToExcel (userData, reportData) {
       { label: translations.report.date, value: 'date' }
     ])
     reportData.devices[0].days[0].geofences.forEach(g =>
-      headers.push({ label: g.geofenceName, value: g.geofenceId })
+      headers.push({ label: g.geofenceName, value: '' + g.geofenceId })
     )
     headers.push({ label: translations.report.distanceOut || 'Kms Afuera', value: 'distanceOut', format: '0' })
   } else if (userData.tripsBetweenZones) {