fleetmap-reports 1.0.416 → 1.0.417
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 +16 -8
package/package.json
CHANGED
package/src/util/trips.js
CHANGED
|
@@ -58,8 +58,13 @@ function isPartialInsideTimetable (t, userData, route) {
|
|
|
58
58
|
let isPartialInside = false
|
|
59
59
|
|
|
60
60
|
if (weekDaySelected(tripStart, userData.weekDays)) {
|
|
61
|
-
const
|
|
62
|
-
const
|
|
61
|
+
const startDateLocal = new Date(convertFromUTC(t.startTime, userData.user.attributes.timezone).toISOString().split('T')[0] + ' ' + userData.dayHours.startTime)
|
|
62
|
+
const endDateLocal = new Date(convertFromUTC(t.startTime, userData.user.attributes.timezone).toISOString().split('T')[0] + ' ' + userData.dayHours.endTime)
|
|
63
|
+
|
|
64
|
+
const startDate = convertFromLocal(startDateLocal, userData.user.attributes.timezone)
|
|
65
|
+
const endDate = convertFromLocal(endDateLocal, userData.user.attributes.timezone)
|
|
66
|
+
|
|
67
|
+
console.log(startDate, endDate)
|
|
63
68
|
|
|
64
69
|
if (startDate.getTime() > endDate.getTime()) {
|
|
65
70
|
// Trip starts outside time period and ends inside time period
|
|
@@ -68,7 +73,7 @@ function isPartialInsideTimetable (t, userData, route) {
|
|
|
68
73
|
// Trip starts inside time period and ends outside time period
|
|
69
74
|
const routeInside = route.filter(p => new Date(p.fixTime).getTime() < new Date(endDate.toUTCString()).getTime() && new Date(p.fixTime).getTime() > new Date(t.startTime).getTime() && t.deviceId === p.deviceId)
|
|
70
75
|
updateTrip(t, routeInside)
|
|
71
|
-
t.endTime =
|
|
76
|
+
t.endTime = endDate.toISOString().replace('Z', '+0000')
|
|
72
77
|
t.endTimeIsOut = true
|
|
73
78
|
isPartialInside = true
|
|
74
79
|
}
|
|
@@ -78,7 +83,7 @@ function isPartialInsideTimetable (t, userData, route) {
|
|
|
78
83
|
// Trip starts outside time period and ends inside time period
|
|
79
84
|
const routeInside = route.filter(p => new Date(p.fixTime).getTime() > startDate.getTime() && new Date(p.fixTime).getTime() < new Date(t.endTime).getTime() && t.deviceId === p.deviceId)
|
|
80
85
|
updateTrip(t, routeInside)
|
|
81
|
-
t.startTime =
|
|
86
|
+
t.startTime = startDate.toISOString().replace('Z', '+0000')
|
|
82
87
|
t.startTimeIsOut = true
|
|
83
88
|
isPartialInside = true
|
|
84
89
|
}
|
|
@@ -88,7 +93,7 @@ function isPartialInsideTimetable (t, userData, route) {
|
|
|
88
93
|
// Trip starts outside time period and ends inside time period
|
|
89
94
|
const routeInside = route.filter(p => new Date(p.fixTime).getTime() > new Date(startDate.toUTCString()).getTime() && new Date(p.fixTime).getTime() < new Date(t.endTime).getTime() && t.deviceId === p.deviceId)
|
|
90
95
|
updateTrip(t, routeInside)
|
|
91
|
-
t.startTime =
|
|
96
|
+
t.startTime = startDate.toISOString().replace('Z', '+0000')
|
|
92
97
|
t.startTimeIsOut = true
|
|
93
98
|
isPartialInside = true
|
|
94
99
|
}
|
|
@@ -98,7 +103,7 @@ function isPartialInsideTimetable (t, userData, route) {
|
|
|
98
103
|
// Trip starts inside time period and ends outside time period
|
|
99
104
|
const routeInside = route.filter(p => new Date(p.fixTime).getTime() < endDate.getTime() && new Date(p.fixTime).getTime() > new Date(t.startTime).getTime() && t.deviceId === p.deviceId)
|
|
100
105
|
updateTrip(t, routeInside)
|
|
101
|
-
t.endTime =
|
|
106
|
+
t.endTime = endDate.toISOString().replace('Z', '+0000')
|
|
102
107
|
t.endTimeIsOut = true
|
|
103
108
|
isPartialInside = true
|
|
104
109
|
}
|
|
@@ -113,8 +118,11 @@ function isInsideTimetable (t, userData) {
|
|
|
113
118
|
const tripEnd = new Date(t.endTime)
|
|
114
119
|
|
|
115
120
|
if (weekDaySelected(tripStart, userData.weekDays)) {
|
|
116
|
-
const
|
|
117
|
-
const
|
|
121
|
+
const startDateLocal = new Date(convertFromUTC(t.startTime, userData.user.attributes.timezone).toISOString().split('T')[0] + ' ' + userData.dayHours.startTime)
|
|
122
|
+
const endDateLocal = new Date(convertFromUTC(t.startTime, userData.user.attributes.timezone).toISOString().split('T')[0] + ' ' + userData.dayHours.endTime)
|
|
123
|
+
|
|
124
|
+
const startDate = convertFromLocal(startDateLocal, userData.user.attributes.timezone)
|
|
125
|
+
const endDate = convertFromLocal(endDateLocal, userData.user.attributes.timezone)
|
|
118
126
|
|
|
119
127
|
// Trips inside time period
|
|
120
128
|
if (startDate.getTime() < endDate.getTime()) {
|