fleetmap-reports 1.0.626 → 1.0.628

package/package.json

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

package/src/idle-report.js

@@ -195,7 +195,8 @@ 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,
     translations.report.duration
   ]
@@ -234,7 +235,8 @@ async function exportIdleReportToPDF (userData, reportData) {
 
         d.idleEvents.forEach(a => {
           const temp = [
-            getIdleEventDate(a, userData.user),
+            getIdleEventDate(a.position, userData.user),
+            getIdleEventDate(a.lastPosition, userData.user),
             a.position.address,
             convertMS(a.idleTime, true),
             userData.byDriver ? a.deviceName : getDriver(a, userData.drivers)
@@ -304,7 +306,8 @@ function exportIdleReportToExcel (userData, reportData) {
   }
   const headers = [
     { label: userData.byDriver ? translations.report.driver : translations.report.vehicle, value: 'name' },
-    { label: translations.report.date, value: 'fixTime' },
+    { label: translations.report.start, value: 'start' },
+    { label: translations.report.end, value: 'end' },
     { label: translations.report.address, value: 'address' },
     { label: translations.report.duration, value: 'duration' },
     { label: userData.byDriver ? translations.report.vehicle : translations.report.driver, value: 'subname' }
@@ -318,7 +321,8 @@ function exportIdleReportToExcel (userData, reportData) {
         return {
           name: userData.byDriver ? d.driver.name : d.device.name,
           duration: convertMS(a.idleTime, true),
-          fixTime: getIdleEventDate(a, userData.user),
+          start: getIdleEventDate(a.position, userData.user),
+          end: getIdleEventDate(a.lastPosition, userData.user),
           subname: userData.byDriver ? a.deviceName : getDriver(a, userData.drivers),
           address: a.position.address + (a.geofenceName ? ' - ' + a.geofenceName : '')
         }
@@ -343,8 +347,8 @@ function deviceName (device) {
   return device.name + (device.attributes.license_plate ? ', ' + device.attributes.license_plate : '') + (device.model ? ', ' + device.model : '')
 }
 
-function getIdleEventDate (row, user) {
-  return convertToLocaleString(row.position.fixTime, user.attributes.lang, user.attributes.timezone)
+function getIdleEventDate (position, user) {
+  return convertToLocaleString(position.fixTime, user.attributes.lang, user.attributes.timezone)
 }
 
 exports.createIdleReport = createIdleReport

package/src/partnerReports/afriquia.js

@@ -1,6 +1,6 @@
 const traccar = require('../util/traccar')
 const { getIdleEvents } = require('../util/route')
-const { insideGeofence } = require('../util/geofence')
+const { insideGeofence, getNearestPOIs } = require('../util/geofence')
 
 async function createActivityReport (from, to, userData, traccarInstance) {
   const notAuthGroup = userData.groups.find(g => g.name === 'Zones Non Autorisées')
@@ -42,13 +42,19 @@ async function createActivityReport (from, to, userData, traccarInstance) {
 
     const idleTimeArray = idleEvents.map(e => e.idleTime).filter(a => a > 0)
 
+    const startTrip = trips.length ? trips[0] : undefined
+    const endTrip = trips.length ? trips[trips.length - 1] : undefined
+
+    const startNearestPOIs = startTrip ? getNearestPOIs(startTrip.startLon, startTrip.startLat, userData.geofences) : []
+    const endNearestPOIs = endTrip ? getNearestPOIs(endTrip.endLon, endTrip.endLat, userData.geofences) : []
+
     const deviceData = {
       device: d.name,
       group: group ? group.name : '',
-      startAddress: trips.length ? trips[0].startAddress : '',
-      startTime: trips.length ? trips[0].startTime : '',
-      endAddress: trips.length ? trips[trips.length - 1].endAddress : '',
-      endTime: trips.length ? trips[trips.length - 1].endTime : '',
+      startAddress: startNearestPOIs.length > 0 ? startNearestPOIs[0].p.name : (startTrip ? startTrip.startAddress : ''),
+      startTime: startTrip ? startTrip.startTime : '',
+      endAddress: endNearestPOIs.length > 0 ? endNearestPOIs[0].p.name : (endTrip ? endTrip.endAddress : ''),
+      endTime: endTrip ? endTrip.endTime : '',
       drivingTime,
       stopTime,
       idleTime: idleEvents.reduce((a, b) => a + b.idleTime, 0),

package/src/util/route.js

@@ -29,6 +29,7 @@ function getIdleEvents (route, driver) {
       } else if (inIdle) {
         const currentIdleEvent = idleEvents[idleEvents.length - 1]
         currentIdleEvent.idleTime = new Date(last.fixTime) - new Date(currentIdleEvent.position.fixTime)
+        currentIdleEvent.lastPosition = last
         inIdle = false
       }
     })