fleetmap-reports 1.0.560 → 1.0.562

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fleetmap-reports",
-  "version": "1.0.560",
+  "version": "1.0.562",
   "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)
       })
@@ -228,7 +229,9 @@ function exportSpeedingReportToExcel (userData, reportData) {
     { label: translations.report.date, value: 'fixTime' },
     { label: translations.report.address, value: 'address' },
     { label: translations.report.driver, value: 'driver' },
-    { label: translations.report.info, value: 'info' }
+    { label: translations.report.info, value: 'info' },
+    { label: 'Latitude', value: 'latitude' },
+    { label: 'Longitude', value: 'longitude' }
   ]
   let data = []
   if (reportData.devices) {
@@ -240,7 +243,9 @@ function exportSpeedingReportToExcel (userData, reportData) {
           fixTime: getAlertDate(userData.user, a),
           address: a.geofenceName || (a.position ? a.position.address : ''),
           info: getAlertInfo(userData.drivers, a),
-          driver: a.driver
+          driver: a.driver,
+          latitude: a.position && a.position.latitude,
+          longitude: a.position && a.position.longitude
         }
       }))
     })
@@ -264,7 +269,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

@@ -107,7 +107,7 @@ async function createLocationReportByDevice (from, to, userData, traccar) {
   return allData
 }
 
-function processDevices (from, to, devices, data, userData) {
+function processDevices (from, to, devices, data) {
   const devicesResult = []
 
   for (const d of devices) {
@@ -313,7 +313,7 @@ function getDigitalPort2Label (row, translations) {
   return row.attributes.door2 || translations.report.digital_ports2
 }
 
-function getDigitalPortValue (row, index, translations, dAttributes) {
+export function getDigitalPortValue (row, index, translations, dAttributes) {
   switch (index) {
     case 1:
       if (row.attributes && row.attributes.door1 !== undefined) {