fleetmap-reports 2.0.151 → 2.0.153

package/package.json

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

package/src/events-report.js

@@ -196,7 +196,7 @@ async function exportSpeedingReportToPDF (userData, reportData) {
       })
       d.alerts.forEach(a => {
         const temp = [
-          getEventType(a, translations, d.device),
+          getEventType(a, translations, d.device, userData),
           getAlertDate(userData.user, a.position),
           getAlertDate(userData.user, a.endPosition),
           a.geofenceName || (a.position ? a.position.address : ''),
@@ -239,13 +239,28 @@ async function exportSpeedingReportToPDF (userData, reportData) {
   }
 }
 
-function getEventType (a, translations, device) {
+function getEventType (a, translations, device, userData) {
   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] || a.type
+    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))
+        if (notification) {
+          return `${result} ${notification.attributes.name}`
+        }
+      }
+    } catch (e) {
+      console.error(e)
+    }
+    return result
   }
 }
 

package/src/speeding-report.js

@@ -310,7 +310,6 @@ async function getCustomSpeedLimitEvents (devices, routes, customSpeed) {
 async function getRoadSpeedLimits (devices, routes, threshold, minimumMinutes = 0) {
   const position = routes.find(p => getCountry(p))
   const country = position && getCountry(position)
-  console.log('getRoadSpeedLimits', position.address, country)
   const config = {
     Chile: getOSMSpeedingEvents,
     CL: getOSMSpeedingEvents,