fleetmap-reports 1.0.944 → 1.0.946
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 -2
- package/src/util/trips.js +5 -2
package/package.json
CHANGED
package/src/kms-report.js
CHANGED
|
@@ -7,7 +7,7 @@ const {
|
|
|
7
7
|
} = require('./util/pdfDocument')
|
|
8
8
|
const { getUserPartner } = require('fleetmap-partners')
|
|
9
9
|
const traccar = require('./util/traccar')
|
|
10
|
-
const { getDates, getTranslations, isClientSide, executeServerSide
|
|
10
|
+
const { getDates, getTranslations, isClientSide, executeServerSide } = require('./util/utils')
|
|
11
11
|
const drivers = require('./util/driver')
|
|
12
12
|
const { isInsideTimetable, isPartialInsideTimetable, calculateTrip, getDataByDay, checkTripsKms, getKms } = require('./util/trips')
|
|
13
13
|
const traccarHelper = require('./util/traccar')
|
|
@@ -178,7 +178,6 @@ async function processDevices (from, to, devices, data, userData, traccarInstanc
|
|
|
178
178
|
const dates = getDates(from, to, userData.user.attributes.timezone || getUserPartner(userData.user).timezone)
|
|
179
179
|
const days = await Promise.all(dates.map(async date => {
|
|
180
180
|
const { tripsByDay } = await getDataByDay(d, date, { trips }, userData, traccarInstance)
|
|
181
|
-
console.log(date, tripsByDay.length)
|
|
182
181
|
return {
|
|
183
182
|
date,
|
|
184
183
|
kms: getKms(tripsByDay)
|
package/src/util/trips.js
CHANGED
|
@@ -113,10 +113,13 @@ function isPartialInsideTimetable (t, userData, route) {
|
|
|
113
113
|
async function getDataByDay (device, date, data, userData, traccarInstance) {
|
|
114
114
|
const fromByDay = new Date(date.getFullYear(), date.getMonth(), date.getDate(), 0, 0, 0)
|
|
115
115
|
const toByDay = new Date(date.getFullYear(), date.getMonth(), date.getDate(), 23, 59, 59)
|
|
116
|
-
const
|
|
116
|
+
const convertedFromByDay = isClientSide() ? fromByDay : convertFromLocal(fromByDay, userData.user.attributes.timezone)
|
|
117
|
+
const convertedToByDay = isClientSide() ? toByDay : convertFromLocal(toByDay, userData.user.attributes.timezone)
|
|
118
|
+
console.log(fromByDay, toByDay)
|
|
119
|
+
const tripsByDay = data.trips.filter(t => new Date(t.endTime) > convertedFromByDay && new Date(t.startTime) < convertedToByDay).map(t => {
|
|
117
120
|
return { ...t }
|
|
118
121
|
})
|
|
119
|
-
|
|
122
|
+
console.log(date, tripsByDay.length)
|
|
120
123
|
const startDateLocal = new Date(convertFromUTC(date, userData.user.attributes.timezone).toISOString().split('T')[0] + ' ' + userData.dayHours.startTime)
|
|
121
124
|
const endDateLocal = new Date(convertFromUTC(date, userData.user.attributes.timezone).toISOString().split('T')[0] + ' ' + userData.dayHours.endTime)
|
|
122
125
|
const startDate = isClientSide() ? startDateLocal : convertFromLocal(startDateLocal, userData.user.attributes.timezone)
|