fleetmap-reports 1.0.607 → 1.0.608

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.
Files changed (4) hide show
  1. package/package.json +1 -1
  2. package/src/speeding-report.js +1 -1
  3. package/src/tests/speeding.test.js +1 -1
  4. package/src/trip-report.js +3 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "fleetmap-reports",
3
- "version": "1.0.607",
3
+ "version": "1.0.608",
4
4
  "description": "",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
package/src/speeding-report.js CHANGED
@@ -135,7 +135,7 @@ async function getEvents (traccarInstance, from, to, devices, userData, deviceCo
135
135
 
136
136
  const events = []
137
137
  if (userData.roadSpeedLimits) {
138
- const hereResults = await getHereEvents(devices, routes, userData.maxSpeedThreshold, userData.minimumIdleMinutes)
138
+ const hereResults = await getHereEvents(devices, routes, userData.maxSpeedThreshold, userData.minimumIdleTime)
139
139
  console.log('got', hereResults.length, 'from here')
140
140
  events.push(...hereResults)
141
141
  } else if (!userData.useVehicleSpeedLimit && userData.customSpeed) {
package/src/tests/speeding.test.js CHANGED
@@ -23,7 +23,7 @@ describe('speeding tests', function () {
23
23
  assert.equal(device.alerts.length, 104) // Total Alerts
24
24
  console.log(device.alerts)
25
25
 
26
- userData.minimumIdleMinutes = 1
26
+ userData.minimumIdleTime = 1
27
27
  const r = await getSpeedingReport(report, userData)
28
28
  r.device.alerts.forEach(a => assert.equal(true, a.eventTime >= 60000))
29
29
  assert.equal(r.device.alerts.length, 6) // Total Alerts
package/src/trip-report.js CHANGED
@@ -292,7 +292,9 @@ async function exportTripReportToPDF (userData, reportData) {
292
292
 
293
293
  tripsData.forEach(function (d, index) {
294
294
  const data = []
295
- const name = userData.byDriver ? d.driver.name : deviceName(d.device)
295
+ const name = userData.byDriver
296
+ ? d.driver.name + ((d.driver.attributes && d.driver.attributes.notes) || '')
297
+ : deviceName(d.device)
296
298
  const group = userData.byDriver ? userData.groups.find(g => g.drivers && g.drivers.includes(d.id)) : userData.groups.find(g => d.device.groupId === g.id)
297
299
 
298
300
  const space = index === 0 ? 8 : 0