fleetmap-reports 1.0.939 → 1.0.941
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/kms-report.js +1 -0
- package/src/util/trips.js +4 -0
package/package.json
CHANGED
package/src/kms-report.js
CHANGED
|
@@ -173,6 +173,7 @@ async function processDevices (from, to, devices, data, userData, traccarInstanc
|
|
|
173
173
|
const trips = deviceTrips.filter(t => userData.allWeek || !userData.weekDays || isInsideTimetable(t, userData) || isPartialInsideTimetable(t, userData, deviceRoute))
|
|
174
174
|
|
|
175
175
|
if (userData.groupByDay) {
|
|
176
|
+
console.log('process device groupByDay')
|
|
176
177
|
if (trips.length > 0) {
|
|
177
178
|
const trips = deviceTrips.filter(t => userData.allWeek || !userData.weekDays || isInsideTimetable(t, userData) || isPartialInsideTimetable(t, userData, deviceRoute))
|
|
178
179
|
const dates = getDates(from, to, userData.user.attributes.timezone || getUserPartner(userData.user).timezone)
|
package/src/util/trips.js
CHANGED
|
@@ -36,6 +36,8 @@ async function calculatePartialTrip (device, startDate, endDate, route, t, tracc
|
|
|
36
36
|
const tripStart = new Date(t.startTime)
|
|
37
37
|
const tripEnd = new Date(t.endTime)
|
|
38
38
|
|
|
39
|
+
console.log('calculatePartialTrip', tripStart, tripEnd)
|
|
40
|
+
|
|
39
41
|
if (startDate.getTime() > endDate.getTime()) {
|
|
40
42
|
if (tripStart.getTime() < endDate.getTime() &&
|
|
41
43
|
tripEnd.getTime() > endDate.getTime()) {
|
|
@@ -148,6 +150,8 @@ function updateTrip (device, t, route) {
|
|
|
148
150
|
t.averageSpeed = distance > 0 ? ((route.reduce((a, b) => a + b.speed, 0)) / route.length) : 0
|
|
149
151
|
t.startOdometer = !device.attributes['report.ignoreOdometer'] && route[0].attributes.odometer ? route[0].attributes.odometer : route[0].attributes.totalDistance
|
|
150
152
|
t.endOdometer = !device.attributes['report.ignoreOdometer'] && route[route.length - 1].attributes.odometer ? route[route.length - 1].attributes.odometer : route[route.length - 1].attributes.totalDistance
|
|
153
|
+
console.log('startOdometer', t.startOdometer)
|
|
154
|
+
console.log('endOdometer', t.endOdometer)
|
|
151
155
|
}
|
|
152
156
|
|
|
153
157
|
function getUncompletedTrip (device, deviceRoute, deviceTrips) {
|