fleetmap-reports 1.0.603 → 1.0.605

package/package.json

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

package/src/speeding-report.js

@@ -516,6 +516,10 @@ function exportSpeedingReportToExcel (userData, reportData) {
     userData.byDriver ? { label: translations.report.driver, value: 'driver' } : { label: translations.report.vehicle, value: 'name' },
     { label: translations.report.date, value: 'fixTime' },
     { label: translations.report.address, value: 'address' },
+    {
+      label: userData.roadSpeedLimits ? translations.report.roadSpeedLimit : translations.report.speedLimit,
+      value: 'speedLimit'
+    },
     { label: translations.report.overspeed, value: 'speed' },
     { label: translations.report.distance, value: 'distance' },
     { label: translations.report.maxSpeed, value: 'maxSpeed' },
@@ -523,10 +527,6 @@ function exportSpeedingReportToExcel (userData, reportData) {
     userData.byDriver ? { label: translations.report.vehicle, value: 'name' } : { label: translations.report.driver, value: 'driver' }
   ]
 
-  if (userData.roadSpeedLimits) {
-    headers.splice(3, 0, { label: translations.report.roadSpeedLimit, value: 'roadSpeedLimit' })
-  }
-
   let data = []
   if (overspeedData) {
     overspeedData.forEach(d => {
@@ -541,7 +541,11 @@ function exportSpeedingReportToExcel (userData, reportData) {
           fixTime: getAlertDate(a, userData.user),
           name: userData.byDriver ? a.deviceName : d.device.name,
           address: a.position.address + (a.geofenceName ? ' - ' + a.geofenceName : ''),
-          roadSpeedLimit: a.roadSpeedLimit
+          speedLimit: userData.roadSpeedLimits
+            ? a.roadSpeedLimit
+            : userData.useVehicleSpeedLimit
+              ? Math.round(d.alerts[0].attributes.speedLimit * 1.85200)
+              : userData.customSpeed
         }
       }))
     })

package/src/trip-report.js

@@ -445,7 +445,7 @@ function exportTripReportToExcel (userData, reportData) {
           averageSpeed: Math.round(a.averageSpeed * 1.85200),
           maxSpeed: Math.round(a.maxSpeed * 1.85200),
           consumption: a.fuelConsumption && a.fuelConsumption.toFixed(1),
-          avgConsumption: a.avgFuelConsumption.toFixed(1),
+          avgConsumption: a.avgFuelConsumption && a.avgFuelConsumption.toFixed(1),
           subname: userData.byDriver ? a.deviceName : getDriverName(userData.drivers, a.driverUniqueId)
         }
       }))