fleetmap-reports 1.0.723 → 1.0.724

package/package.json

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

package/src/zone-report.js

@@ -398,6 +398,9 @@ async function exportZoneReportToPDF (userData, reportData) {
             g.days.reduce((a, b) => a + (b.distanceOut ? b.distanceOut : 0), 0).toLocaleString(lang, { maximumFractionDigits: 2 })
           ]
           addTable(doc, headers, data, footer, style, space + 40, {
+            0: { halign: 'right' },
+            1: { halign: 'right' },
+            2: { halign: 'right' },
             3: { halign: 'right' },
             4: { halign: 'right' },
             5: { halign: 'right' },
@@ -477,7 +480,7 @@ function exportZoneReportToExcel (userData, reportData) {
         })
       } else {
         data = data.concat(d.geofences.map(a => {
-          return getColumns(d, a, userData, translations)
+          return getColumns(d, a, userData, translations, true)
         }))
         data = data.concat([{}])
       }
@@ -511,7 +514,7 @@ function reportHeader (first, doc, translations, device, lang, timezone, userDat
   return space
 }
 
-function getColumns (device, data, userData, translations) {
+function getColumns (device, data, userData, translations, excel) {
   return {
     ...data,
     name: device.device.name,
@@ -521,8 +524,12 @@ function getColumns (device, data, userData, translations) {
     date: convertToLocaleDateString(data.date, userData.user.attributes.lang, userData.user.attributes.timezone),
     firstIn: data.firstIn ? convertToLocaleTimeString(data.firstIn, userData.user.attributes.lang, userData.user.attributes.timezone) : '-',
     lastOut: data.lastOut ? convertToLocaleTimeString(data.lastOut, userData.user.attributes.lang, userData.user.attributes.timezone) : '-',
-    distanceIn: data.distanceIn ? data.distanceIn.toLocaleString(userData.user.attributes.lang, { maximumFractionDigits: 2 }) : 0,
-    distanceOut: data.distanceOut ? data.distanceOut.toLocaleString(userData.user.attributes.lang, { maximumFractionDigits: 2 }) : 0,
+    distanceIn: excel
+      ? data.distanceIn || 0
+      : (data.distanceIn && data.distanceIn.toLocaleString(userData.user.attributes.lang, { maximumFractionDigits: 2 })) || 0,
+    distanceOut: excel
+      ? data.distanceOut || 0
+      : (data.distanceOut && data.distanceOut.toLocaleString(userData.user.attributes.lang, { maximumFractionDigits: 2 })) || 0,
     totalInTime: convertMS(data.totalInTime, !userData.groupByDay),
     totalOutTime: convertMS(data.totalOutTime, !userData.groupByDay),
     zone: data.geofenceName,