fleetmap-reports 1.0.962 → 1.0.963

package/package.json

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

package/src/zone-report.js

@@ -110,6 +110,8 @@ async function processDevices (from, to, devices, userData, data) {
           const startDate = isClientSide() ? startDateLocal : convertFromLocal(startDateLocal, userData.user.attributes.timezone)
           const endDate = isClientSide() ? endDateLocal : convertFromLocal(endDateLocal, userData.user.attributes.timezone)
 
+          console.log(startDate, endDate)
+
           const { routeByDay, zoneInOutDayData } = await getDataByDay(d, date, { route: deviceRoute, zoneInOutData: filteredByGeofence }, userData)
 
           const firstIn = zoneInOutDayData.find(z => z.inTime && new Date(z.inTime.fixTime) > startDate)
@@ -145,6 +147,8 @@ async function processDevices (from, to, devices, userData, data) {
           const startDate = isClientSide() ? startDateLocal : convertFromLocal(startDateLocal, userData.user.attributes.timezone)
           const endDate = isClientSide() ? endDateLocal : convertFromLocal(endDateLocal, userData.user.attributes.timezone)
 
+          console.log(startDate, endDate)
+
           const { routeByDay, zoneInOutDayData } = await getDataByDay(d, date, { route: deviceRoute, zoneInOutData }, userData)
 
           const distanceOut = calculateDistanceOut(zoneInOutDayData, routeByDay, startDate, endDate, 'distanceOutAny', d)
@@ -307,33 +311,33 @@ function calculateDistanceIn (zoneInOutDayData, deviceRoute, dayRoute, fromByDay
   return distanceIn
 }
 
-function calculateDistanceOut (zoneInOutDayData, dayRoute, fromByDay, toByDay, field, device) {
+function calculateDistanceOut (zoneInOutDayData, dayRoute, from, to, field, device) {
   if (zoneInOutDayData.length) {
-    const dataInsideDay = zoneInOutDayData.filter(z => z.outTime && new Date(z.outTime.fixTime) < toByDay)
+    const dataInsideDay = zoneInOutDayData.filter(z => z.outTime && new Date(z.outTime.fixTime) < to)
     let distanceOut = dataInsideDay.reduce((a, b) => a + (b[field] || 0), 0)
 
-    if (zoneInOutDayData[0].inTime && new Date(zoneInOutDayData[0].inTime.fixTime) > fromByDay && (field !== 'distanceOutAny' || zoneInOutDayData[0].anyLastExit)) {
+    if (zoneInOutDayData[0].inTime && new Date(zoneInOutDayData[0].inTime.fixTime) > from && (field !== 'distanceOutAny' || zoneInOutDayData[0].anyLastExit)) {
       // Add distanceOut before the first entry
       const routeOut = dayRoute.filter(p =>
         new Date(p.fixTime).getTime() < new Date(zoneInOutDayData[0].inTime.fixTime).getTime() &&
-          new Date(p.fixTime).getTime() >= fromByDay.getTime()
+          new Date(p.fixTime).getTime() >= from.getTime()
       )
       distanceOut = distanceOut + calculateDistance(routeOut, device.attributes['report.ignoreOdometer'])
     }
 
-    if (zoneInOutDayData[zoneInOutDayData.length - 1].outTime && new Date(zoneInOutDayData[zoneInOutDayData.length - 1].outTime.fixTime) < toByDay && (field !== 'distanceOutAny' || zoneInOutDayData[zoneInOutDayData.length - 1].anyNextIn)) {
+    if (zoneInOutDayData[zoneInOutDayData.length - 1].outTime && new Date(zoneInOutDayData[zoneInOutDayData.length - 1].outTime.fixTime) < to && (field !== 'distanceOutAny' || zoneInOutDayData[zoneInOutDayData.length - 1].anyNextIn)) {
       // Add distanceOut after last exit
       distanceOut = distanceOut - zoneInOutDayData[zoneInOutDayData.length - 1][field]
       const routeOut = dayRoute.filter(p =>
         new Date(p.fixTime) >= new Date(zoneInOutDayData[zoneInOutDayData.length - 1].outTime.fixTime).getTime() &&
-          new Date(p.fixTime) < toByDay.getTime())
+          new Date(p.fixTime) < to.getTime())
       distanceOut = distanceOut + calculateDistance(routeOut, device.attributes['report.ignoreOdometer'])
     }
 
     return distanceOut
   }
 
-  return calculateDistance(dayRoute.filter(p => new Date(p.fixTime) >= fromByDay && new Date(p.fixTime) < toByDay), device.attributes['report.ignoreOdometer'])
+  return calculateDistance(dayRoute.filter(p => new Date(p.fixTime) >= from && new Date(p.fixTime) < to), device.attributes['report.ignoreOdometer'])
 }
 
 function analyseAlerts (alerts, deviceRoute, userData, from, to, device) {