fleetmap-reports 1.0.869 → 1.0.870

package/package.json

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

package/src/events-report.js

@@ -4,7 +4,7 @@ require('jspdf-autotable')
 const { getStyle } = require('./reportStyle')
 const { headerFromUser } = require('./util/pdfDocument')
 const { getUserPartner } = require('fleetmap-partners')
-const { convertToLocaleString, getTranslations } = require('./util/utils')
+const { convertToLocaleString, getTranslations, convertMS } = require('./util/utils')
 const { devicesToProcess } = require('./util/device')
 const { isInside } = require('./util/timetable')
 const { getDigitalPortValue } = require('./location-report')
@@ -139,8 +139,10 @@ async function exportSpeedingReportToPDF (userData, reportData) {
 
   const headers = [
     translations.report.eventType,
-    translations.report.date,
+    translations.report.start,
+    translations.report.end,
     translations.report.address,
+    translations.report.duration,
     translations.report.info
   ]
   if (reportData.devices) {
@@ -192,8 +194,10 @@ async function exportSpeedingReportToPDF (userData, reportData) {
       d.alerts.forEach(a => {
         const temp = [
           getEventType(a, translations, d.device),
-          getAlertDate(userData.user, a),
+          getAlertDate(userData.user, a.position),
+          getAlertDate(userData.user, a.endPosition),
           a.geofenceName || (a.position ? a.position.address : ''),
+          a.position && a.endPosition ? convertMS(new Date(a.endPosition.fixTime).getTime() - new Date(a.position.fixTime).getTime()) : '',
           getAlertInfo(userData.drivers, a, d.device, translations)
         ]
         data.push(temp)
@@ -254,8 +258,10 @@ function exportSpeedingReportToExcel (userData, reportData) {
   const headers = [
     { label: translations.report.vehicle, value: 'name' },
     { label: translations.report.eventType, value: 'eventType' },
-    { label: translations.report.date, value: 'fixTime' },
+    { label: translations.report.start, value: 'fixTime' },
+    { label: translations.report.end, value: 'endFixTime' },
     { label: translations.report.address, value: 'address' },
+    { label: translations.report.duration, value: 'duration' },
     { label: translations.report.zone, value: 'geofenceName' },
     { label: translations.report.driver, value: 'driver' },
     { label: translations.report.info, value: 'info' },
@@ -269,8 +275,10 @@ function exportSpeedingReportToExcel (userData, reportData) {
         return {
           name: d.device.name,
           eventType: getEventType(a, translations, d.device),
-          fixTime: getAlertDate(userData.user, a),
+          fixTime: getAlertDate(userData.user, a.position),
+          endFixTime: getAlertDate(userData.user, a.endPosition),
           address: a.position && a.position.address,
+          duration: a.position && a.endPosition ? convertMS(new Date(a.endPosition.fixTime).getTime() - new Date(a.position.fixTime).getTime()) : '',
           geofenceName: a.geofenceName,
           info: getAlertInfo(userData.drivers, a, d.device, translations),
           driver: a.driver,
@@ -316,9 +324,9 @@ function getAlertInfo (drivers, alert, device, translations) {
   return ''
 }
 
-function getAlertDate (user, alert) {
-  if (alert.position) {
-    return convertToLocaleString(alert.position.fixTime, user.attributes.lang, user.attributes.timezone)
+function getAlertDate (user, position) {
+  if (position) {
+    return convertToLocaleString(position.fixTime, user.attributes.lang, user.attributes.timezone)
   }
 }