fleetmap-reports 1.0.457 → 1.0.458
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/trip-report.js +4 -2
package/package.json
CHANGED
package/src/trip-report.js
CHANGED
|
@@ -134,6 +134,10 @@ async function createTripReportByDriver (from, to, userData, traccar) {
|
|
|
134
134
|
d.totalDuration = d.trips.reduce((a, b) => a + b.duration, 0)
|
|
135
135
|
d.totalDistance = d.trips.reduce((a, b) => a + b.distance, 0)
|
|
136
136
|
d.maxSpeed = d.trips.reduce((a, b) => { return a > b.maxSpeed ? a : b.maxSpeed }, 0)
|
|
137
|
+
d.trips = d.trips.sort((a, b) => new Date(a.startTime).getTime() - new Date(b.startTime).getTime())
|
|
138
|
+
d.trips.forEach(function (trip, i) {
|
|
139
|
+
trip.stopDuration = i !== d.trips.length - 1 ? (new Date(d.trips[i + 1].startTime) - new Date(trip.endTime)) : 0
|
|
140
|
+
})
|
|
137
141
|
})
|
|
138
142
|
|
|
139
143
|
return report
|
|
@@ -214,8 +218,6 @@ function processDrivers (from, to, userData, data) {
|
|
|
214
218
|
const trips = data.trips.filter(t => t.driverUniqueId === d.uniqueId &&
|
|
215
219
|
(userData.allWeek || !userData.weekDays || isInsideTimetable(t, userData) || isPartialInsideTimetable(t, userData, route)))
|
|
216
220
|
|
|
217
|
-
trips.sort((a, b) => new Date(a.startTime).getTime() - new Date(b.startTime).getTime())
|
|
218
|
-
|
|
219
221
|
const idleEvents = getIdleEvents(data.route, d)
|
|
220
222
|
|
|
221
223
|
trips.forEach(function (trip, i) {
|