fleetmap-reports 1.0.611 → 1.0.613

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fleetmap-reports",
-  "version": "1.0.611",
+  "version": "1.0.613",
   "description": "",
   "main": "src/index.js",
   "scripts": {

package/src/events-report.js

@@ -152,19 +152,20 @@ async function exportSpeedingReportToPDF (userData, reportData) {
       doc.text(group, 200, space + 20)
       doc.text(convertToLocaleString(d.from, lang, timezone) + ' - ' + convertToLocaleString(d.to, lang, timezone), 20, space + 25)
 
+      const headerEventTypes = []
+      userData.eventTypes.forEach(e => {
+        const data = e.startsWith('alarm') ? { type: 'alarm', attributes: { alarm: e.slice(6) } } : { type: e }
+        const value = e.startsWith('alarm') ? d.alerts.filter(a => a.attributes.alarm === data.attributes.alarm).length : d.alerts.filter(a => a.type === e).length
+        headerEventTypes.push([getEventType(data, translations, d.device), value])
+      })
+
       doc.autoTable({
         head: ['', '', '', '', ''],
         body: [
-          [translations.report.event_ignitionOn, translations.report.event_ignitionOff, translations.report.event_geofenceEnter,
-            translations.report.event_geofenceExit, translations.report.event_deviceOverspeed],
-          [d.alerts.filter(a => a.type === 'ignitionOn').length, d.alerts.filter(a => a.type === 'ignitionOff').length,
-            d.alerts.filter(a => a.type === 'geofenceEnter').length, d.alerts.filter(a => a.type === 'geofenceExit').length,
-            d.alerts.filter(a => a.type === 'deviceOverspeed').length],
-          [translations.report.event_driverChanged, translations.report.event_powerOn, translations.report.event_sos,
-            translations.report.event_deviceFuelDrop, translations.report.eve],
-          [d.alerts.filter(a => a.type === 'driverChanged').length, d.alerts.filter(a => a.type === 'powerOn').length,
-            d.alerts.filter(a => a.type === 'sos').length, d.alerts.filter(a => a.type === 'deviceFuelDrop').length,
-            d.alerts.filter(a => a.type === 'powerCut').length]
+          headerEventTypes.slice(0, 6).map(a => a[0]),
+          headerEventTypes.slice(0, 6).map(a => a[1]),
+          headerEventTypes.slice(7).map(a => a[0]),
+          headerEventTypes.slice(7).map(a => a[1])
         ],
         startY: space + 30,
         showHead: false,
@@ -173,9 +174,7 @@ async function exportSpeedingReportToPDF (userData, reportData) {
       })
       d.alerts.forEach(a => {
         const temp = [
-          a.type === 'alarm'
-            ? getEventType(a, translations, d.device)
-            : translations.report['event_' + a.type],
+          getEventType(a, translations, d.device),
           getAlertDate(userData.user, a),
           a.geofenceName || (a.position ? a.position.address : ''),
           getAlertInfo(userData.drivers, a, d.device, translations)
@@ -217,9 +216,13 @@ async function exportSpeedingReportToPDF (userData, reportData) {
 }
 
 function getEventType (a, translations, device) {
-  let sensor
-  if (a.attributes.alarm === 'sensor') { sensor = device.attributes.sensor1 }
-  return sensor || translations.report['event_' + a.attributes.alarm] || a.attributes.alarm
+  if (a.type === 'alarm') {
+    let sensor
+    if (a.attributes.alarm === 'sensor') { sensor = device.attributes.sensor1 }
+    return sensor || translations.report['event_' + a.attributes.alarm] || a.attributes.alarm
+  } else {
+    return translations.report['event_' + a.type]
+  }
 }
 
 function exportSpeedingReportToExcel (userData, reportData) {
@@ -247,9 +250,7 @@ function exportSpeedingReportToExcel (userData, reportData) {
       data = data.concat(d.alerts.map(a => {
         return {
           name: d.device.name,
-          eventType: a.type === 'alarm'
-            ? getEventType(a, translations, d.device)
-            : translations.report['event_' + a.type],
+          eventType: getEventType(a, translations, d.device),
           fixTime: getAlertDate(userData.user, a),
           address: a.geofenceName || (a.position ? a.position.address : ''),
           info: getAlertInfo(userData.drivers, a, d.device, translations),

package/src/speeding-report.js

@@ -135,7 +135,7 @@ async function getEvents (traccarInstance, from, to, devices, userData, deviceCo
 
     const events = []
     if (userData.roadSpeedLimits) {
-      const hereResults = await getHereEvents(devices, routes, userData.maxSpeedThreshold, userData.minimumIdleTime)
+      const hereResults = await getHereEvents(devices, routes, userData.maxSpeedThreshold, userData.minimumIdleMinutes)
       console.log('got', hereResults.length, 'from here')
       events.push(...hereResults)
     } else if (!userData.useVehicleSpeedLimit && userData.customSpeed) {

package/src/tests/index.test.js

@@ -5,7 +5,6 @@ const utils = require('../util/utils')
 
 // eslint-disable-next-line no-undef
 describe('Test_Reports', function () {
-  this.timeout(5000000)
   it('converts to pdf', async () => {
     const report = await getReports()
     const userData = await report.getUserData()

package/src/tests/speeding.test.js

@@ -23,7 +23,7 @@ describe('speeding tests', function () {
     assert.equal(device.alerts.length, 104) // Total Alerts
     console.log(device.alerts)
 
-    userData.minimumIdleTime = 1
+    userData.minimumIdleMinutes = 1
     const r = await getSpeedingReport(report, userData)
     r.device.alerts.forEach(a => assert.equal(true, a.eventTime >= 60000))
     assert.equal(r.device.alerts.length, 6) // Total Alerts