fleetmap-reports 2.0.143 → 2.0.144

package/package.json

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

package/src/partnerReports/driverranking-report.js

@@ -2,7 +2,7 @@ const traccarHelper = require('../util/traccar')
 const { getDriverData } = require('../util/driver')
 const { getCanDriverStyleMessages, parseCanDriverStyleMessage } = require('../util/xpert')
 const { calculateRPMSections } = require('./performance-report')
-const { getTranslations, isClientSide, convertToLocaleString } = require('../util/utils')
+const { getTranslations, isClientSide, convertToLocaleString, convertMS } = require('../util/utils')
 const jsPDF = require('jspdf')
 const { headerFromUser, addTable } = require('../util/pdfDocument')
 const { getStyle } = require('../reportStyle')
@@ -200,7 +200,7 @@ async function exportToExcel (userData, reportData) {
         name: row.name,
         distance: Number(row.distance.toFixed(1)),
         avgFuelConsumption: Number(row.avgFuelConsumption.toFixed(2)),
-        highEngineRPM: row.highEngineRPM,
+        highEngineRPM: convertMS(row.highEngineRPM, false),
         hardBraking: row.hardBraking,
         hardAcceleration: row.hardAcceleration,
         hardCornering: row.hardCornering,
@@ -257,9 +257,9 @@ async function exportToPDF (userData, reportData) {
     reportDataRows.forEach(function (row) {
       const temp = [
         row.name,
-        row.distance,
-        row.avgFuelConsumption,
-        row.highEngineRPM,
+        row.distance.toFixed(1),
+        row.avgFuelConsumption.toFixed(2),
+        convertMS(row.highEngineRPM, false),
         row.hardBraking,
         row.hardAcceleration,
         row.hardCornering,
@@ -268,7 +268,7 @@ async function exportToPDF (userData, reportData) {
         row.continuesDrivingAlarm,
         row.reverseAlarm,
         row.otherAlarm,
-        row.score
+        row.score.toFixed(2)
       ]
       data.push(temp)
     })
@@ -276,7 +276,20 @@ async function exportToPDF (userData, reportData) {
 
     const style = getStyle(getUserPartner(userData.user))
 
-    addTable(doc, headers, data, footValues, style, 40)
+    addTable(doc, headers, data, footValues, style, 40, {
+      1: { halign: 'right' },
+      2: { halign: 'right' },
+      3: { halign: 'right' },
+      4: { halign: 'right' },
+      5: { halign: 'right' },
+      6: { halign: 'right' },
+      7: { halign: 'right' },
+      8: { halign: 'right' },
+      9: { halign: 'right' },
+      10: { halign: 'right' },
+      11: { halign: 'right' },
+      12: { halign: 'right' }
+    })
     return doc
   }
 }