fleetmap-reports 1.0.451 → 1.0.454
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/lang/index.js +3 -0
- package/package.json +1 -1
- package/src/activity-report.js +1 -2
- package/src/idle-report.js +1 -2
package/lang/index.js
CHANGED
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 traccar.devices.devicesGet().then(d => d.data)
|
|
130
129
|
|
|
131
130
|
let tripsData = []
|
|
132
131
|
let routeData = []
|
package/src/idle-report.js
CHANGED
|
@@ -166,8 +166,7 @@ function processDevices (from, to, devices, routes, userData) {
|
|
|
166
166
|
const route = routes.filter(p => p.deviceId === d.id)
|
|
167
167
|
|
|
168
168
|
const idleEvents = getIdleEvents(route)
|
|
169
|
-
|
|
170
|
-
const filteredEvents = idleEvents.filter(e => userData.minimumIdleMinutes ? e.idleTime > userData.minimumIdleMinutes * 60 * 1000 : true)
|
|
169
|
+
const filteredEvents = idleEvents.filter(e => e.idleTime > (userData.minimumIdleMinutes ? userData.minimumIdleMinutes * 60 * 1000 : 0))
|
|
171
170
|
|
|
172
171
|
if (filteredEvents.length) {
|
|
173
172
|
filteredEvents.forEach(e => {
|