fleetmap-reports 1.0.628 → 1.0.630

package/package.json

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

package/src/idle-report.js

@@ -1,6 +1,6 @@
 const jsPDF = require('jspdf')
 const { headerFromUser, AmiriRegular } = require('./util/pdfDocument')
-const { convertToLocaleString, convertMS, getTranslations, getLanguage } = require('./util/utils')
+const { convertToLocaleString, convertMS, getTranslations, getLanguage, convertToLocaleDateString, convertToLocaleTimeString } = require('./util/utils')
 const { getStyle } = require('./reportStyle')
 const { getUserPartner } = require('fleetmap-partners')
 const { devicesToProcess } = require('./util/device')
@@ -8,6 +8,7 @@ const automaticReports = require('./automaticReports')
 const traccarHelper = require('./util/traccar')
 const { getIdleEvents } = require('./util/route')
 const { reportByDriver } = require('./util/driver')
+const { getNearestPOIs, insideGeofence } = require('./util/geofence')
 
 const fileName = 'IdleReport'
 
@@ -143,6 +144,8 @@ function processDrivers (from, to, userData, data) {
 
       if (filteredEvents.length) {
         filteredEvents.forEach(e => {
+          findGeofenceData(e, userData)
+
           const device = userData.devices.find(d => d.id === e.position.deviceId)
           e.deviceName = device ? device.name : ''
         })
@@ -170,6 +173,8 @@ function processDevices (from, to, devices, routes, userData) {
 
     if (filteredEvents.length) {
       filteredEvents.forEach(e => {
+        findGeofenceData(e, userData)
+
         const driver = userData.drivers.find(d => d.id === e.position.attributes.driverUniqueId)
         e.driver = driver ? driver.name : ''
       })
@@ -185,6 +190,20 @@ function processDevices (from, to, devices, routes, userData) {
   return devicesResult
 }
 
+function findGeofenceData (event, userData) {
+  const nearestPOIs = getNearestPOIs(event.position.longitude, event.position.latitude, userData.geofences)
+  if (nearestPOIs.length > 0) {
+    event.endPOIName = nearestPOIs[0].p.name
+  } else {
+    const geofence = userData.geofences.filter(g => g && g.area.startsWith('POLYGON')).some(g =>
+      insideGeofence({ latitude: event.position.latitude, longitude: event.position.longitude }, g)
+    )
+    if (geofence) {
+      event.endPOIName = geofence.name
+    }
+  }
+}
+
 async function exportIdleReportToPDF (userData, reportData) {
   console.log('Export to PDF')
 
@@ -195,6 +214,7 @@ async function exportIdleReportToPDF (userData, reportData) {
   const idleData = userData.byDriver ? reportData.drivers : reportData.devices
 
   const headers = [
+    translations.report.date,
     translations.report.start,
     translations.report.end,
     translations.report.address,
@@ -236,7 +256,8 @@ async function exportIdleReportToPDF (userData, reportData) {
         d.idleEvents.forEach(a => {
           const temp = [
             getIdleEventDate(a.position, userData.user),
-            getIdleEventDate(a.lastPosition, userData.user),
+            getIdleEventTime(a.position, userData.user),
+            getIdleEventTime(a.lastPosition, userData.user),
             a.position.address,
             convertMS(a.idleTime, true),
             userData.byDriver ? a.deviceName : getDriver(a, userData.drivers)
@@ -246,7 +267,7 @@ async function exportIdleReportToPDF (userData, reportData) {
 
         const footValues = [
           'Total:' + d.idleEvents.length,
-          '',
+          '', '', '',
           convertMS(d.idleEvents.reduce((a, b) => a + b.idleTime, 0), true)
         ]
 
@@ -306,6 +327,7 @@ function exportIdleReportToExcel (userData, reportData) {
   }
   const headers = [
     { label: userData.byDriver ? translations.report.driver : translations.report.vehicle, value: 'name' },
+    { label: translations.report.date, value: 'date' },
     { label: translations.report.start, value: 'start' },
     { label: translations.report.end, value: 'end' },
     { label: translations.report.address, value: 'address' },
@@ -321,8 +343,9 @@ function exportIdleReportToExcel (userData, reportData) {
         return {
           name: userData.byDriver ? d.driver.name : d.device.name,
           duration: convertMS(a.idleTime, true),
-          start: getIdleEventDate(a.position, userData.user),
-          end: getIdleEventDate(a.lastPosition, userData.user),
+          date: getIdleEventDate(a.position, userData.user),
+          start: getIdleEventTime(a.position, userData.user),
+          end: getIdleEventTime(a.lastPosition, userData.user),
           subname: userData.byDriver ? a.deviceName : getDriver(a, userData.drivers),
           address: a.position.address + (a.geofenceName ? ' - ' + a.geofenceName : '')
         }
@@ -348,7 +371,11 @@ function deviceName (device) {
 }
 
 function getIdleEventDate (position, user) {
-  return convertToLocaleString(position.fixTime, user.attributes.lang, user.attributes.timezone)
+  return convertToLocaleDateString(position.fixTime, user.attributes.lang, user.attributes.timezone)
+}
+
+function getIdleEventTime (position, user) {
+  return convertToLocaleTimeString(position.fixTime, user.attributes.lang, user.attributes.timezone)
 }
 
 exports.createIdleReport = createIdleReport