fleetmap-reports 2.0.56 → 2.0.58

package/package.json

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

package/src/activity-report.js

@@ -173,9 +173,15 @@ async function processDevices (from, to, devices, data, userData, traccarInstanc
     if (userData.groupByDay) {
       const trips = []
       for (const t of deviceTrips) {
-        const isInside = isInsideTimetable(t, userData)
-        const isPartialInside = await isPartialInsideTimetable(t, userData, deviceRoute)
-        if (userData.allWeek || !userData.weekDays || isInside || isPartialInside) {
+        if (userData.allWeek || !userData.weekDays) {
+          trips.push(t)
+          continue
+        }
+        if (isInsideTimetable(t, userData)) {
+          trips.push(t)
+          continue
+        }
+        if (await isPartialInsideTimetable(t, userData, deviceRoute)) {
           trips.push(t)
         }
       }

package/src/util/traccar.js

@@ -136,15 +136,17 @@ async function getSummaryByDay (dates, userData, traccarInstance, allDevices, ig
     let startDateLocal = new Date(convertFromUTC(date, userData.user.attributes.timezone).toISOString().split('T')[0] + ' ' + userData.dayHours.startTime)
     if (index === 0) {
       const _startDateLocal = new Date(convertFromUTC(date, userData.user.attributes.timezone).toISOString().split('T')[0] + ' ' + (isClientSide() ? from.toTimeString().slice(0, 8) : convertFromUTC(from, userData.user.attributes.timezone).toTimeString().slice(0, 8)))
+      console.log(_startDateLocal)
       startDateLocal = startDateLocal.getTime() > _startDateLocal.getTime() ? startDateLocal : _startDateLocal
     }
 
     let endDateLocal = new Date(convertFromUTC(date, userData.user.attributes.timezone).toISOString().split('T')[0] + ' ' + userData.dayHours.endTime)
     if (index === dates.length - 1) {
       const _endDateLocal = new Date(convertFromUTC(date, userData.user.attributes.timezone).toISOString().split('T')[0] + ' ' + (isClientSide() ? to.toTimeString().slice(0, 8) : convertFromUTC(to, userData.user.attributes.timezone).toTimeString().slice(0, 8)))
+      console.log(_endDateLocal)
       endDateLocal = endDateLocal.getTime() < _endDateLocal.getTime() ? endDateLocal : _endDateLocal
     }
-
+    console.log(date, startDateLocal, endDateLocal)
     const startDate = isClientSide() ? startDateLocal : convertFromLocal(startDateLocal, userData.user.attributes.timezone)
     const endDate = isClientSide() ? endDateLocal : convertFromLocal(endDateLocal, userData.user.attributes.timezone)