fleetmap-reports 1.0.453 → 1.0.456
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 -2
package/package.json
CHANGED
package/src/activity-report.js
CHANGED
|
@@ -2,7 +2,6 @@ const automaticReports = require('./automaticReports')
|
|
|
2
2
|
const { convertMS, getDates, getTranslations, weekDaySelected } = require('./util/utils')
|
|
3
3
|
const jsPDF = require('jspdf')
|
|
4
4
|
require('jspdf-autotable')
|
|
5
|
-
const drivers = require('./util/driver')
|
|
6
5
|
const { headerFromUser, addTable } = require('./util/pdfDocument')
|
|
7
6
|
const { getStyle } = require('./reportStyle')
|
|
8
7
|
const { getUserPartner } = require('fleetmap-partners')
|
|
@@ -126,7 +125,7 @@ async function createActivityReportByDevice (from, to, userData, traccarInstance
|
|
|
126
125
|
}
|
|
127
126
|
|
|
128
127
|
async function createActivityReportByDriver (from, to, userData, traccarInstance) {
|
|
129
|
-
const devices = await
|
|
128
|
+
const devices = await traccarInstance.devices.devicesGet().then(d => d.data)
|
|
130
129
|
|
|
131
130
|
let tripsData = []
|
|
132
131
|
let routeData = []
|
|
@@ -253,6 +252,7 @@ function processDrivers (from, to, drivers, data, userData) {
|
|
|
253
252
|
drivers.forEach(d => {
|
|
254
253
|
const route = data.route.filter(p => p.attributes.driverUniqueId === d.uniqueId)
|
|
255
254
|
const trips = data.trips.filter(t => t.driverUniqueId === d.uniqueId)
|
|
255
|
+
trips.sort((a, b) => new Date(a.startTime).getTime() - new Date(b.startTime).getTime())
|
|
256
256
|
if (trips.length > 0) {
|
|
257
257
|
const driverData = {
|
|
258
258
|
driver: d,
|