fleetmap-reports 1.0.893 → 1.0.896

package/package.json

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

package/src/activity-report.js

@@ -399,7 +399,7 @@ function exportActivityReportToPDFVehicle (doc, translations, reportData, userDa
     translations.report.spentFuel]
 
   doc.setFontSize(10)
-  doc.text(convertToLocaleString(reportData.from, lang, timezone) + ' - ' + convertToLocaleString(reportData.to, lang, timezone), 20, 30)
+  doc.text(convertToLocaleString(reportData.from, lang, timezone, userData.user) + ' - ' + convertToLocaleString(reportData.to, lang, timezone, userData.user), 20, 30)
 
   const data = []
   reportData.devices.forEach(d => {

package/src/zone-report.js

@@ -132,7 +132,7 @@ async function processDevices (from, to, devices, userData, data) {
         geofencesData.push({
           geofenceId: geofence.id,
           geofenceName: geofence.name,
-          days: userData.onlyWithKmsOut ? dataByDay.filter(d => d.distanceOut >= 0.5) : dataByDay
+          days: filterResult(dataByDay, userData)
         })
       }
 
@@ -207,7 +207,7 @@ async function processDevices (from, to, devices, userData, data) {
               from,
               to,
               tripsBetweenZones: true,
-              geofences: userData.onlyWithKmsOut ? tripsBetweenZones.filter(a => a.distanceOut) : tripsBetweenZones
+              geofences: filterResult(tripsBetweenZones, userData)
             })
           }
         } else {
@@ -215,7 +215,7 @@ async function processDevices (from, to, devices, userData, data) {
             device: d,
             from,
             to,
-            geofences: userData.onlyWithKmsOut ? zoneInOutData.filter(a => a.distanceOut) : zoneInOutData
+            geofences: filterResult(zoneInOutData, userData)
           })
         }
       }
@@ -225,6 +225,11 @@ async function processDevices (from, to, devices, userData, data) {
   return devicesResult
 }
 
+function filterResult (result, userData) {
+  result = userData.onlyWithKmsOut ? result.filter(a => a.distanceOut >= 0.5) : result
+  return userData.onlyWithKmsIn ? result.filter(a => a.distanceIn === undefined || a.distanceIn >= 0.5) : result
+}
+
 function calculateTimeIn (zoneInOutDayData, fromByDay, from, toByDay, to) {
   let timeIn = zoneInOutDayData.length ? zoneInOutDayData.reduce((a, b) => a + (b.totalInTime || 0), 0) : 0