fleetmap-reports 1.0.799 → 1.0.800
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/activity-report.js +2 -1
package/package.json
CHANGED
package/src/activity-report.js
CHANGED
|
@@ -166,6 +166,7 @@ function processDevices (from, to, devices, data, userData) {
|
|
|
166
166
|
const toByDay = new Date(date.getFullYear(), date.getMonth(), date.getDate(), 23, 59, 59)
|
|
167
167
|
|
|
168
168
|
const tripsByDay = trips.filter(t => (new Date(t.startTime) > fromByDay && new Date(t.endTime) < toByDay))
|
|
169
|
+
const routeByDay = trips.filter(p => (new Date(p.fixTime) > fromByDay && new Date(p.fixTime) < toByDay))
|
|
169
170
|
const distance = tripsByDay.reduce((a, b) => a + b.distance, 0)
|
|
170
171
|
|
|
171
172
|
if (!userData.allWeek && userData.weekDays && userData.dayHours) {
|
|
@@ -193,7 +194,7 @@ function processDevices (from, to, devices, data, userData) {
|
|
|
193
194
|
summaryCurrentDay.distance = distance
|
|
194
195
|
summaryCurrentDay.averageSpeed = distance > 0 ? ((trips.reduce((a, b) => a + (b.averageSpeed * b.distance), 0)) / distance) : 0
|
|
195
196
|
summaryCurrentDay.maxSpeed = tripsByDay.reduce((a, b) => { return a > b.maxSpeed ? a : b.maxSpeed }, 0)
|
|
196
|
-
summaryCurrentDay.convertedSpentFuel = calculateConsumption(d, { route:
|
|
197
|
+
summaryCurrentDay.convertedSpentFuel = calculateConsumption(d, { route: routeByDay })
|
|
197
198
|
summaryCurrentDay.startTime = tripsByDay.length && tripsByDay[0].startTime
|
|
198
199
|
summaryCurrentDay.startAddress = tripsByDay.length && tripsByDay[0].startAddress
|
|
199
200
|
summaryCurrentDay.endTime = tripsByDay.length && tripsByDay[tripsByDay.length - 1].endTime
|