fleetmap-reports 1.0.559 → 1.0.561

package/package.json

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

package/src/events-report.js

@@ -7,6 +7,7 @@ const { getUserPartner } = require('fleetmap-partners')
 const { convertToLocaleString, getTranslations } = require('./util/utils')
 const { devicesToProcess } = require('./util/device')
 const { isInside } = require('./util/timetable')
+const { getDigitalPortValue } = require('./location-report')
 
 const fileName = 'EventReport'
 
@@ -175,7 +176,7 @@ async function exportSpeedingReportToPDF (userData, reportData) {
           a.type === 'alarm' ? translations.report['event_' + a.attributes.alarm] : translations.report['event_' + a.type],
           getAlertDate(userData.user, a),
           a.geofenceName || (a.position ? a.position.address : ''),
-          getAlertInfo(userData.drivers, a)
+          getAlertInfo(userData.drivers, a, d.device, translations)
         ]
         data.push(temp)
       })
@@ -264,7 +265,10 @@ function deviceName (device) {
   return device.name + (device.attributes.license_plate ? ', ' + device.attributes.license_plate : '') + (device.model ? ', ' + device.model : '')
 }
 
-function getAlertInfo (drivers, alert) {
+function getAlertInfo (drivers, alert, device, translations) {
+  if (alert.type === 'alarm' && alert.position) {
+    getDigitalPortValue(alert.position, 1, translations, device.attributes)
+  }
   if (alert.type === 'deviceOverspeed') {
     return Math.round(alert.attributes.speed * 1.85200) + ' Km/h'
   }

package/src/location-report.js

@@ -313,8 +313,7 @@ function getDigitalPort2Label (row, translations) {
   return row.attributes.door2 || translations.report.digital_ports2
 }
 
-function getDigitalPortValue (row, index, translations, dAttributes) {
-  console.log('getDigitalPortValue', row, index, dAttributes)
+export function getDigitalPortValue (row, index, translations, dAttributes) {
   switch (index) {
     case 1:
       if (row.attributes && row.attributes.door1 !== undefined) {
@@ -394,8 +393,8 @@ function exportLocationReportToExcel (userData, reportData) {
           ignition: a.attributes.ignition ? translations.report.ignitionOn : translations.report.ignitionOff,
           driver: userData.byDriver ? d.driver.name : getDriverName(a, userData.drivers),
           temperature: getTempValue(a),
-          digitalport1: getDigitalPortValue(a, 1, translations),
-          digitalport2: getDigitalPortValue(a, 2, translations),
+          digitalport1: getDigitalPortValue(a, 1, translations, d.device.attributes),
+          digitalport2: getDigitalPortValue(a, 2, translations, d.device.attributes),
           latitude: a.latitude,
           longitude: a.longitude
         }