fleetmap-reports 2.0.298 → 2.0.300

package/package.json

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

package/src/events-report.js

@@ -330,7 +330,10 @@ function getAlertInfo (drivers, alert, device, translations) {
   if (alert.type === 'alarm' && alert.attributes.alarm === 'sensor') {
     return device ? device.attributes.sensor1on : ''
   }
-  if (alert.type === 'alarm' && alert.position && !alert.attributes.alarm.startsWith('hard')) {
+  if (alert.attributes.alarm && alert.attributes.alarm.startsWith('hard')) {
+    return ''
+  }
+  if (alert.type === 'alarm' && alert.position) {
     return getDigitalPortValue(alert.position, 1, translations, device.attributes)
   }
   if (alert.type === 'deviceOverspeed') {

package/src/sensor-report.js

@@ -14,7 +14,7 @@ function processDevices (from, to, devices, data, userData) {
   const result = []
 
   for (const d of devices) {
-    const positions = data.route.filter(t => t.deviceId === d.id)
+    const positions = data.route.filter(t => t.deviceId === d.id).filter(t => t.attributes.motion)
 
     const rows = []
     const currentStatus = {}