fleetmap-reports 1.0.634 → 1.0.636

package/lang/enGB.js

@@ -269,7 +269,8 @@ module.exports = {
     unsubscribeFuelDropReport: 'If you no longer wish to receive these emails, please go to %url% and remove the option "Fuel drop report" in the settings in the "Reports" section.',
     minimumMinutes: 'Minimum time',
     maximumSpeed: 'Maximum speed',
-    minutes: 'Minutes'
+    minutes: 'Minutes',
+    zone: 'Zone'
   },
   layout: {
     deviceOnline: 'Device Online',

package/lang/esCL.js

@@ -258,7 +258,8 @@ module.exports = {
     unsubscribeFuelDropReport: this.unsubscribeTripReport,
     minimumMinutes: 'Tiempo mínimo',
     maximumSpeed: 'Velocidad máxima',
-    minutes: 'Minutos'
+    minutes: 'Minutos',
+    zone: 'Zona'
   },
   layout: {
     deviceOnline: 'Dispositivo en línea',

package/lang/frFR.json

@@ -266,7 +266,8 @@
     "unsubscribeFuelDropReport": "Si vous ne souhaitez pas recevoir ces e-mails, veuillez accéder à %url% et supprimer le \"rapport de perte de carburant\" paramètres dans la section \"Rapports\".",
     "minimumMinutes": "Temps minimal",
     "maximumSpeed": "Vitesse maximum",
-    "minutes": "Minutes"
+    "minutes": "Minutes",
+    "zone": "Zone"
   },
   "layout": {
     "deviceOnline": "Appareil en ligne",

package/lang/ptBR.js

@@ -261,7 +261,8 @@ module.exports = {
     unsubscribeFuelDropReport: 'Se não deseja receber estes emails por favor aceda a %url% e remova a opção "Relatório de perdas de combustível" nas definições na secção "Relatórios".',
     minimumMinutes: 'Tempo mínimo',
     maximumSpeed: 'Velocidade máxima',
-    minutes: 'Minutos'
+    minutes: 'Minutos',
+    zone: 'Zona'
   },
   layout: {
     deviceOnline: 'Dispositivo Online',

package/lang/ptPT.js

@@ -270,7 +270,8 @@ module.exports = {
     unsubscribeFuelDropReport: 'Se não deseja receber estes emails por favor aceda a %url% e remova a opção "Relatório de perdas de combustível" nas definições na secção "Relatórios".',
     minimumMinutes: 'Tempo mínimo',
     maximumSpeed: 'Velocidade máxima',
-    minutes: 'Minutos'
+    minutes: 'Minutos',
+    zone: 'Zone'
   },
   layout: {
     test: 'Test Notification',

package/package.json

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

package/src/idle-report.js

@@ -49,6 +49,8 @@ async function createIdleReportByDriver (from, to, userData, traccar) {
     return { drivers: [] }
   }
 
+  await loadGroupsData(userData, traccar)
+
   const results = await reportByDriver(devices, traccar, from, to, userData, processDrivers)
 
   const report = {
@@ -116,6 +118,8 @@ async function createIdleReportByDevice (from, to, userData, traccarInstance) {
     to
   }
 
+  await loadGroupsData(userData, traccarInstance)
+
   const devices = devicesToProcess(userData)
   const sliced = automaticReports.sliceArray(devices, 5)
 
@@ -124,7 +128,7 @@ async function createIdleReportByDevice (from, to, userData, traccarInstance) {
     const { route } = await traccarHelper.getAllInOne(traccarInstance, from, to, slice, true, false, false, false, deviceCount, devices.length)
 
     if (route.length > 0) {
-      allData.devices.push(...processDevices(from, to, slice, route, userData))
+      allData.devices.push(...await processDevices(from, to, slice, route, userData))
     }
 
     deviceCount = deviceCount + slice.length
@@ -144,6 +148,7 @@ function processDrivers (from, to, userData, data) {
 
       if (filteredEvents.length) {
         filteredEvents.forEach(e => {
+          findPOIData(e, userData)
           findGeofenceData(e, userData)
 
           const device = userData.devices.find(d => d.id === e.position.deviceId)
@@ -162,22 +167,22 @@ function processDrivers (from, to, userData, data) {
   return driversResult
 }
 
-function processDevices (from, to, devices, routes, userData) {
+async function processDevices (from, to, devices, routes, userData) {
   const devicesResult = []
-
-  devices.forEach(d => {
+  for (const d of devices) {
     const route = routes.filter(p => p.deviceId === d.id)
 
     const idleEvents = getIdleEvents(route, undefined, userData.idleSpeedThreshold / 1.85200)
     const filteredEvents = idleEvents.filter(e => e.idleTime > (userData.minimumIdleMinutes ? userData.minimumIdleMinutes * 60 * 1000 : 0))
 
     if (filteredEvents.length) {
-      filteredEvents.forEach(e => {
+      for (const e of filteredEvents) {
+        findPOIData(e, userData)
         findGeofenceData(e, userData)
 
         const driver = userData.drivers.find(d => d.id === e.position.attributes.driverUniqueId)
         e.driver = driver ? driver.name : ''
-      })
+      }
 
       const deviceData = {
         device: d,
@@ -185,22 +190,32 @@ function processDevices (from, to, devices, routes, userData) {
       }
       devicesResult.push(deviceData)
     }
-  })
+  }
 
   return devicesResult
 }
 
-function findGeofenceData (event, userData) {
+function findPOIData (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
-    }
+  }
+}
+
+function findGeofenceData (event, userData) {
+  const geofence = userData.geofences.filter(g => g && g.area.startsWith('POLYGON')).find(g =>
+    insideGeofence({ latitude: event.position.latitude, longitude: event.position.longitude }, g)
+  )
+  if (geofence) {
+    const group = userData.groups.find(g => g.geofenceIds && g.geofenceIds.includes(geofence.id))
+    event.geofenceName = geofence.name
+    event.geofenceGroup = (group && group.name) || ''
+  }
+}
+
+async function loadGroupsData (userData, traccarInstance) {
+  for (const g of userData.groups) {
+    g.geofenceIds = (await traccarInstance.geofences.geofencesGet(undefined, undefined, undefined, g.id, undefined, undefined).then(r => r.data)).map(g => g.id)
   }
 }
 
@@ -218,7 +233,8 @@ async function exportIdleReportToPDF (userData, reportData) {
     translations.report.start,
     translations.report.end,
     translations.report.address,
-    translations.report.duration
+    translations.report.duration,
+    translations.report.zone
   ]
 
   if (userData.byDriver) {
@@ -262,6 +278,7 @@ async function exportIdleReportToPDF (userData, reportData) {
             getIdleEventTime(a.lastPosition, userData.user),
             a.endPOIName || a.position.address,
             convertMS(a.idleTime, true),
+            (a.geofenceName || '') + (a.geofenceGroup ? ' (' + a.geofenceGroup + ')' : ''),
             userData.byDriver ? a.deviceName : getDriver(a, userData.drivers)
           ]
           data.push(temp)
@@ -334,6 +351,7 @@ function exportIdleReportToExcel (userData, reportData) {
     { label: translations.report.end, value: 'end' },
     { label: translations.report.address, value: 'address' },
     { label: translations.report.duration, value: 'duration' },
+    { label: translations.report.zone, value: 'zone' },
     { label: userData.byDriver ? translations.report.vehicle : translations.report.driver, value: 'subname' }
   ]
 
@@ -349,7 +367,8 @@ function exportIdleReportToExcel (userData, reportData) {
           start: getIdleEventTime(a.position, userData.user),
           end: getIdleEventTime(a.lastPosition, userData.user),
           subname: userData.byDriver ? a.deviceName : getDriver(a, userData.drivers),
-          address: a.endPOIName || a.position.address
+          address: a.endPOIName || a.position.address,
+          zone: (a.geofenceName || '') + (a.geofenceGroup ? ' (' + a.geofenceGroup + ')' : '')
         }
       }))
       // Totals