fleetmap-reports 2.0.154 → 2.0.156

package/package.json

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

package/src/events-report.js

@@ -240,6 +240,11 @@ async function exportSpeedingReportToPDF (userData, reportData) {
 }
 
 function getEventType (a, translations, device, userData) {
+  const result = _getEventType(a, translations, device, userData)
+  return a.attributes.info ? `${result} (${a.attributes.info})` : result
+}
+
+function _getEventType (a, translations, device, userData) {
   if (a.type === 'alarm') {
     let sensor
     if (a.attributes.alarm === 'sensor') { sensor = device.attributes.sensor1 }
@@ -248,14 +253,10 @@ function getEventType (a, translations, device, userData) {
     const result = translations.report['event_' + a.type] || a.type
     try {
       if (userData &&
-          userData.notifications &&
-          userData.notifications.length &&
-          a.type === 'maintenance' &&
-          a.attributes.notifications) {
-        const notification = userData.notifications.find(n => a.attributes.notifications.split(',').includes(n.id.toString()))
-        if (notification) {
-          return `${result} ${notification.attributes.name}`
-        }
+          userData.maintenances &&
+          a.type === 'maintenance') {
+        const maintenance = userData.maintenances.find(m => m.id === a.maintenanceId)
+        if (maintenance) { return `${result} ${maintenance.name}` }
       }
     } catch (e) {
       console.error(e)