fleetmap-reports 1.0.418 → 1.0.419
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/src/util/trips.js +5 -6
package/package.json
CHANGED
package/src/util/trips.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
const { coordsDistance, convertFromUTC, weekDaySelected, convertFromLocal } = require('./utils')
|
|
1
|
+
const { coordsDistance, convertFromUTC, weekDaySelected, convertFromLocal, isClientSide } = require('./utils')
|
|
2
2
|
|
|
3
3
|
const minDistance = 0
|
|
4
4
|
const minAvgSpeed = 0
|
|
@@ -61,8 +61,8 @@ function isPartialInsideTimetable (t, userData, route) {
|
|
|
61
61
|
const startDateLocal = new Date(convertFromUTC(t.startTime, userData.user.attributes.timezone).toISOString().split('T')[0] + ' ' + userData.dayHours.startTime)
|
|
62
62
|
const endDateLocal = new Date(convertFromUTC(t.startTime, userData.user.attributes.timezone).toISOString().split('T')[0] + ' ' + userData.dayHours.endTime)
|
|
63
63
|
|
|
64
|
-
const startDate = convertFromLocal(startDateLocal, userData.user.attributes.timezone)
|
|
65
|
-
const endDate = convertFromLocal(endDateLocal, userData.user.attributes.timezone)
|
|
64
|
+
const startDate = isClientSide() ? startDateLocal : convertFromLocal(startDateLocal, userData.user.attributes.timezone)
|
|
65
|
+
const endDate = isClientSide() ? endDateLocal : convertFromLocal(endDateLocal, userData.user.attributes.timezone)
|
|
66
66
|
|
|
67
67
|
if (startDate.getTime() > endDate.getTime()) {
|
|
68
68
|
// Trip starts outside time period and ends inside time period
|
|
@@ -119,12 +119,11 @@ function isInsideTimetable (t, userData) {
|
|
|
119
119
|
const startDateLocal = new Date(convertFromUTC(t.startTime, userData.user.attributes.timezone).toISOString().split('T')[0] + ' ' + userData.dayHours.startTime)
|
|
120
120
|
const endDateLocal = new Date(convertFromUTC(t.startTime, userData.user.attributes.timezone).toISOString().split('T')[0] + ' ' + userData.dayHours.endTime)
|
|
121
121
|
|
|
122
|
-
const startDate = convertFromLocal(startDateLocal, userData.user.attributes.timezone)
|
|
123
|
-
const endDate = convertFromLocal(endDateLocal, userData.user.attributes.timezone)
|
|
122
|
+
const startDate = isClientSide() ? startDateLocal : convertFromLocal(startDateLocal, userData.user.attributes.timezone)
|
|
123
|
+
const endDate = isClientSide() ? endDateLocal : convertFromLocal(endDateLocal, userData.user.attributes.timezone)
|
|
124
124
|
|
|
125
125
|
// Trips inside time period
|
|
126
126
|
if (startDate.getTime() < endDate.getTime()) {
|
|
127
|
-
console.log((tripStart.getTime() > startDate.getTime() && tripEnd.getTime() < endDate.getTime()))
|
|
128
127
|
return tripStart.getTime() > startDate.getTime() && tripEnd.getTime() < endDate.getTime()
|
|
129
128
|
} else {
|
|
130
129
|
return (tripStart.getTime() < endDate.getTime() && tripEnd.getTime() < endDate.getTime()) ||
|