fleetmap-reports 1.0.900 → 1.0.902

package/package.json

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

package/src/activity-report.js

@@ -181,7 +181,7 @@ function processDevices (from, to, devices, data, userData) {
         const fromByDay = new Date(date.getFullYear(), date.getMonth(), date.getDate(), 0, 0, 0)
         const toByDay = new Date(date.getFullYear(), date.getMonth(), date.getDate(), 23, 59, 59)
 
-        const tripsByDay = trips.filter(t => (new Date(t.startTime) > fromByDay && new Date(t.endTime) < toByDay))
+        const tripsByDay = trips.filter(t => (new Date(t.startTime) > fromByDay && new Date(t.startTime) < toByDay))
         const routeByDay = deviceRoute.filter(p => (new Date(p.fixTime) > fromByDay && new Date(p.fixTime) < toByDay))
         const distance = tripsByDay.reduce((a, b) => a + b.distance, 0)
 

package/src/partnerReports/afriquia.js

@@ -6,6 +6,11 @@ const { convertToFeature, convertPositionToFeature } = require('../util/utils')
 function calculateLastStopTime (stopTime, to, time) {
   return stopTime + (to.getTime() - new Date(time).getTime())
 }
+
+function calculateFirstStopTime (stopTime, from, time) {
+  return stopTime + (new Date(time).getTime() - from.getTime())
+}
+
 async function createActivityReport (from, to, userData, traccarInstance) {
   const unauthorizedGeofences = []
   const authorizedGeofences = []

package/src/util/timetable.js

@@ -11,13 +11,12 @@ function isInside (start, end, userData) {
     const startDate = isClientSide() ? startDateLocal : convertFromLocal(startDateLocal, userData.user.attributes.timezone)
     const endDate = isClientSide() ? endDateLocal : convertFromLocal(endDateLocal, userData.user.attributes.timezone)
 
-    // Trips inside time period
-    if (startDate.getTime() < endDate.getTime()) {
-      return tripStart.getTime() > startDate.getTime() && tripEnd.getTime() < endDate.getTime()
-    } else {
-      return (tripStart.getTime() < endDate.getTime() && tripEnd.getTime() < endDate.getTime()) ||
-                (tripStart.getTime() > startDate.getTime())
+    // next day
+    if (startDate.getTime() > endDate.getTime()) {
+      endDate.setDate(endDate.getDate() + 1)
     }
+    // Trips inside time period
+    return tripStart.getTime() > startDate.getTime() && tripEnd.getTime() < endDate.getTime()
   }
 
   return false