fleetmap-reports 1.0.588 → 1.0.590

package/package.json

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

package/src/fuelconsumption-report.js

@@ -167,6 +167,7 @@ async function exportFuelConsumptionReportToPDF (userData, reportData) {
   const translations = getTranslations(userData)
   const lang = getLanguage(userData)
 
+  // eslint-disable-next-line new-cap
   const doc = new jsPDF.jsPDF('l')
   await headerFromUser(doc, translations.report.titleFuelConsumptionReport, userData.user)
 

package/src/trip-report.js

@@ -262,7 +262,7 @@ async function exportTripReportToPDF (userData, reportData) {
   ]
 
   if (tripsData) {
-    const withFuelData = tripsData.reduce((a, b) => a || b.totalFuelConsumption !== undefined)
+    const withFuelData = tripsData.find(t => t.totalFuelConsumption !== undefined)
 
     if (withFuelData) {
       headers.push(translations.report.consumption,
@@ -320,7 +320,7 @@ async function exportTripReportToPDF (userData, reportData) {
 
         temp.push(convertMS(a.stopEngineHours),
           convertMS(a.stopDuration),
-          Intl.NumberFormat(userData.user.attributes.lang, { maximumFractionDigits: 2 }).format(a.totalKms),
+          Intl.NumberFormat(userData.user.attributes.lang, { maximumFractionDigits: 1 }).format(a.totalKms),
           Math.round(a.averageSpeed * 1.85200),
           Math.round(a.maxSpeed * 1.85200))
 
@@ -364,8 +364,12 @@ async function exportTripReportToPDF (userData, reportData) {
           7: { halign: 'right' },
           8: { halign: 'right' },
           9: { halign: 'right' },
-          10: { halign: 'right' },
-          11: { halign: 'right' }
+          ...(withFuelData
+            ? {
+                10: { halign: 'right' },
+                11: { halign: 'right' }
+              }
+            : {})
         })
     })
     return doc
@@ -399,7 +403,7 @@ function exportTripReportToExcel (userData, reportData) {
 
   let data = []
   if (tripsData) {
-    const withFuelData = tripsData.reduce((a, b) => a || b.totalFuelConsumption !== undefined)
+    const withFuelData = tripsData.find(b => b.totalFuelConsumption !== undefined)
 
     if (withFuelData) {
       headers.push({ label: translations.report.consumption, value: 'consumption' },
@@ -486,7 +490,7 @@ function getSumTotalKms (user, data) {
   const values = data.map(item => {
     return item.totalKms ? parseFloat(item.totalKms) : 0
   })
-  return Intl.NumberFormat(user.attributes.lang, { maximumFractionDigits: 2 }).format(values.reduce((a, b) => a + b, 0))
+  return Intl.NumberFormat(user.attributes.lang, { maximumFractionDigits: 1 }).format(values.reduce((a, b) => a + b, 0))
 }
 
 function getSumAvgSpeed (data) {