fleetmap-reports 1.0.665 → 1.0.667

package/package.json

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

package/src/zone-report.js

@@ -136,6 +136,13 @@ async function processDevices (from, to, devices, userData, data) {
               const routeDayBefore = deviceRoute.filter(p => (!zoneInOutDayData[0].inTime || new Date(p.fixTime) > new Date(zoneInOutDayData[0].inTime.fixTime)) &&
                   new Date(p.fixTime) < fromByDay)
               distanceIn = distanceIn - calculateDistance(routeDayBefore)
+            } else {
+              // Add distanceOut before the first entry
+              const routeOut = deviceRoute.filter(p =>
+                new Date(p.fixTime).getTime() < new Date(zoneInOutDayData[0].inTime.fixTime).getTime() &&
+                  new Date(p.fixTime).getTime() >= fromByDay.getTime()
+              )
+              distanceOut = distanceOut + calculateDistance(routeOut)
             }
 
             // Check if the last entry ends only on the next day
@@ -145,7 +152,9 @@ async function processDevices (from, to, devices, userData, data) {
               const routeDayAfter = deviceRoute.filter(p => new Date(p.fixTime) < outTime && new Date(p.fixTime) > toByDay)
               distanceIn = distanceIn - calculateDistance(routeDayAfter)
             } else {
-              const routeOut = deviceRoute.filter(p => (!zoneInOutDayData[zoneInOutDayData.length - 1].outTime || new Date(p.fixTime) > zoneInOutDayData[zoneInOutDayData.length - 1].outTime.fixTime) && new Date(p.fixTime) < toByDay)
+              const routeOut = deviceRoute.filter(p =>
+                new Date(p.fixTime) > new Date(zoneInOutDayData[zoneInOutDayData.length - 1].outTime.fixTime).getTime() &&
+                  new Date(p.fixTime) < toByDay.getTime())
               distanceOut = distanceOut + calculateDistance(routeOut)
             }
           }
@@ -263,17 +272,6 @@ function analyseAlertsGroupGeofences (alerts, deviceRoute, from, to) {
     })
   }
 
-  if (zoneInOutData.length > 0) {
-    if (zoneInOutData[0].inTime) {
-      // Add distanceOut before the first entry
-      const routeOut = deviceRoute.filter(p =>
-        new Date(p.fixTime).getTime() < new Date(zoneInOutData[0].inTime.fixTime).getTime() &&
-          new Date(p.fixTime).getTime() <= to.getTime()
-      )
-      zoneInOutData[0].distanceOut = calculateDistance(routeOut)
-    }
-  }
-
   return zoneInOutData
 }
 
@@ -522,6 +520,7 @@ function exportZoneReportToExcel (userData, reportData) {
   }
   const headers = userData.groupByDay
     ? [
+        { label: translations.report.vehicle, value: 'name' },
         { label: translations.report.date, value: 'date' },
         { label: translations.report.firstIn, value: 'firstIn' },
         { label: translations.report.lastOut, value: 'lastOut' },
@@ -547,6 +546,7 @@ function exportZoneReportToExcel (userData, reportData) {
       data = userData.groupByDay
         ? data.concat(d.days.map(a => {
           return {
+            name: d.device.name,
             date: convertToLocaleDateString(a.date, userData.user.attributes.lang, userData.user.attributes.timezone),
             firstIn: a.firstIn ? convertToLocaleTimeString(a.firstIn, userData.user.attributes.lang, userData.user.attributes.timezone) : '-',
             lastOut: a.lastOut ? convertToLocaleTimeString(a.lastOut, userData.user.attributes.lang, userData.user.attributes.timezone) : '-',