fleetmap-reports 1.0.587 → 1.0.588

package/package.json

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

package/src/activity-report.js

@@ -337,7 +337,7 @@ function exportActivityReportToPDFDriver (doc, translations, reportData, userDat
       d.driver.name,
       d.summary[0].startTime ? new Date(d.summary[0].startTime).toLocaleString() : '',
       d.summary[0].endTime ? new Date(d.summary[0].endTime).toLocaleString() : '',
-      Number((d.summary[0].distance / 1000).toFixed(2)),
+      Number((d.summary[0].distance / 1000).toFixed(1)),
       Math.round(d.summary[0].averageSpeed * 1.85200),
       Math.round(d.summary[0].maxSpeed * 1.85200),
       convertMS(d.summary[0].engineHours)
@@ -381,9 +381,9 @@ function exportActivityReportToPDFVehicle (doc, translations, reportData, userDa
       group ? group.name : '',
       d.summary[0].startTime ? new Date(d.summary[0].startTime).toLocaleString() : '',
       d.summary[0].endTime ? new Date(d.summary[0].endTime).toLocaleString() : '',
-      Number((d.summary[0].distance / 1000).toFixed(2)),
-      Number((d.summary[0].startOdometer / 1000).toFixed(2)),
-      Number((d.summary[0].endOdometer / 1000).toFixed(2)),
+      Number((d.summary[0].distance / 1000).toFixed(1)),
+      Number((d.summary[0].startOdometer / 1000).toFixed(1)),
+      Number((d.summary[0].endOdometer / 1000).toFixed(1)),
       Math.round(d.summary[0].averageSpeed * 1.85200),
       Math.round(d.summary[0].maxSpeed * 1.85200),
       convertMS(d.summary[0].engineHours),
@@ -460,9 +460,9 @@ function exportActivityReportToPDFVehicleGroupByDay (doc, translations, reportDa
         new Date(s.date).toLocaleDateString() + ' - ' + weekDays[s.date.getDay()],
         s.startTime ? new Date(s.startTime).toLocaleTimeString() : '',
         s.endTime ? new Date(s.endTime).toLocaleTimeString() : '',
-        Number((s.distance / 1000).toFixed(2)),
-        Number((s.startOdometer / 1000).toFixed(2)),
-        Number((s.endOdometer / 1000).toFixed(2)),
+        Number((s.distance / 1000).toFixed(1)),
+        Number((s.startOdometer / 1000).toFixed(1)),
+        Number((s.endOdometer / 1000).toFixed(1)),
         Math.round(s.averageSpeed * 1.85200),
         Math.round(s.maxSpeed * 1.85200),
         convertMS(s.engineHours),
@@ -596,7 +596,7 @@ function exportActivityReportToPDFDriverGroupByDay (doc, translations, reportDat
         new Date(s.date).toLocaleDateString() + ' - ' + weekDays[s.date.getDay()],
         s.startTime ? new Date(s.startTime).toLocaleTimeString() : '',
         s.endTime ? new Date(s.endTime).toLocaleTimeString() : '',
-        Number((s.distance / 1000).toFixed(2)),
+        Number((s.distance / 1000).toFixed(1)),
         Math.round(s.averageSpeed * 1.85200),
         Math.round(s.maxSpeed * 1.85200),
         convertMS(s.engineHours)

package/src/fuelconsumption-report.js

@@ -144,11 +144,11 @@ function exportFuelConsumptionReportToExcel (userData, reportData) {
         return {
           name: d.device.name,
           date: r.date,
-          kms: (r.distance / 1000).toFixed(2),
+          kms: (r.distance / 1000).toFixed(1),
           consumption: r.spentFuel > 0 ? r.spentFuel : 0,
           avg_consumption: lang === 'pt-BR' ? r.avgConsumption.byLiters : r.avgConsumption.byKms,
           duration: new Date(r.duration).toLocaleTimeString(),
-          accumulated_kms: (r.endOdometer / 1000).toFixed(2),
+          accumulated_kms: (r.endOdometer / 1000).toFixed(1),
           refueling: r.refueling
         }
       }))
@@ -201,11 +201,11 @@ async function exportFuelConsumptionReportToPDF (userData, reportData) {
       d.days.forEach(r =>
         data.push([
           r.date,
-          (r.distance / 1000).toFixed(2),
+          (r.distance / 1000).toFixed(1),
           r.spentFuel > 0 ? r.spentFuel : 0,
           lang === 'pt-BR' ? r.avgConsumption.byLiters : r.avgConsumption.byKms,
           new Date(r.duration).toLocaleTimeString(),
-          (r.endOdometer / 1000).toFixed(2),
+          (r.endOdometer / 1000).toFixed(1),
           r.refueling
         ]))
       console.log(data)

package/src/trip-report.js

@@ -325,7 +325,8 @@ async function exportTripReportToPDF (userData, reportData) {
           Math.round(a.maxSpeed * 1.85200))
 
         if (withFuelData) {
-          temp.push(a.fuelConsumption.toFixed(1), a.avgFuelConsumption.toFixed(1))
+          temp.push(a.fuelConsumption && a.fuelConsumption.toFixed(1),
+            a.avgFuelConsumption && a.avgFuelConsumption.toFixed(1))
         }
 
         if (userData.byDriver) {
@@ -425,7 +426,7 @@ function exportTripReportToExcel (userData, reportData) {
           tripTime: convertMS(a.duration),
           idleTime: convertMS(a.stopEngineHours),
           stopTime: convertMS(a.stopDuration),
-          distance: Number(a.totalKms.toFixed(2)),
+          distance: Number(a.totalKms.toFixed(1)),
           averageSpeed: Math.round(a.averageSpeed * 1.85200),
           maxSpeed: Math.round(a.maxSpeed * 1.85200),
           consumption: a.fuelConsumption.toFixed(1),