fleetmap-reports 1.0.643 → 1.0.645

package/package.json

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

package/src/partnerReports/afriquia.js

@@ -34,6 +34,7 @@ async function createActivityReport (from, to, userData, traccarInstance) {
     let unauthorizedStops = 0
     let authorizedStops = 0
     let otherStops = 0
+    let authorizedStopsTime = 0
 
     stops.forEach(s => {
       const unauthorized = unauthorizedGeofences.find(g => insideGeofence({ latitude: s.latitude, longitude: s.longitude }, g))
@@ -45,6 +46,7 @@ async function createActivityReport (from, to, userData, traccarInstance) {
 
         if (authorized) {
           authorizedStops = authorizedStops + 1
+          authorizedStopsTime = authorizedStopsTime + (s.duration > s.engineHours ? (s.duration - s.engineHours) : 0)
         } else {
           otherStops = otherStops + 1
         }
@@ -102,7 +104,7 @@ async function createActivityReport (from, to, userData, traccarInstance) {
       otherStops,
       authorizedStops,
       unauthorizedStops,
-      authorizedStopsTime: unauthorizedStops.reduce((a, b) => a + (b.duration > b.engineHours ? (b.duration - b.engineHours) : 0), 0),
+      authorizedStopsTime,
       averageSpeed: totalDistance > 0 ? ((trips.reduce((a, b) => a + (b.averageSpeed * b.distance), 0)) / totalDistance) : 0,
       maxSpeed: trips.reduce((a, b) => {
         return a > b.maxSpeed ? a : b.maxSpeed

package/src/stop-report.js

@@ -57,13 +57,15 @@ function processDevices (from, to, devices, data, userData) {
       const nearestPOIs = getNearestPOIs(stop.longitude, stop.latitude, userData.geofences)
       if (nearestPOIs.length > 0) {
         stop.endPOIName = nearestPOIs[0].p.name
-      } else {
-        const geofence = userData.geofences.filter(g => g && g.area.startsWith('POLYGON')).some(g =>
-          insideGeofence({ latitude: stop.latitude, longitude: stop.longitude }, g)
-        )
-        if (geofence) {
-          stop.endPOIName = geofence.name
-        }
+      }
+
+      const geofence = userData.geofences.filter(g => g && g.area.startsWith('POLYGON')).some(g =>
+        insideGeofence({ latitude: stop.latitude, longitude: stop.longitude }, g)
+      )
+      if (geofence) {
+        const group = userData.groups.find(g => g.geofenceIds && g.geofenceIds.includes(geofence.id))
+        stop.geofenceName = geofence.name
+        stop.geofenceGroup = (group && group.name) || ''
       }
 
       const totalStopTime = new Date(stop.endTime) - new Date(stop.startTime)
@@ -75,7 +77,7 @@ function processDevices (from, to, devices, data, userData) {
         device: d,
         from,
         to,
-        stops: deviceStops
+        stops: deviceStops.filter(s => s.stopDuration > (userData.minimumStopMinutes ? userData.minimumStopMinutes * 60 * 1000 : 0))
       }
 
       devicesResult.push(deviceData)
@@ -99,7 +101,8 @@ async function exportStopReportToPDF (userData, reportData) {
     translations.report.end,
     translations.report.address,
     translations.report.idleTime,
-    translations.report.event_ignitionOff
+    translations.report.event_ignitionOff,
+    translations.report.zone
   ]
 
   if (stopsData) {
@@ -122,6 +125,7 @@ async function exportStopReportToPDF (userData, reportData) {
       doc.setFontSize(11)
       doc.text(group ? translations.report.group + ': ' + group.name : '', 200, space + 20)
       doc.text(convertToLocaleString(d.from, lang, timezone) + ' - ' + convertToLocaleString(d.to, lang, timezone), 20, space + 25)
+      doc.text(translations.report.minimumMinutes + ': ' + userData.minimumStopMinutes + ' ' + translations.report.minutes, 20, space + 35)
 
       d.stops.forEach(a => {
         data.push([
@@ -130,7 +134,8 @@ async function exportStopReportToPDF (userData, reportData) {
           getStopEnd(userData.user, a),
           a.endPOIName || a.address,
           convertMS(a.engineHours, true),
-          convertMS(a.stopDuration, true)
+          convertMS(a.stopDuration, true),
+          (a.geofenceName || '') + (a.geofenceGroup ? ' (' + a.geofenceGroup + ')' : '')
         ])
       })
 
@@ -143,7 +148,7 @@ async function exportStopReportToPDF (userData, reportData) {
       const style = getStyle(getUserPartner(userData.user))
       addTable(doc,
         headers, data, footValues, style,
-        space + 40,
+        space + 45,
         {
           4: { halign: 'right' },
           5: { halign: 'right' }
@@ -169,7 +174,8 @@ function exportStopReportToExcel (userData, reportData) {
     { label: translations.report.end, value: 'end' },
     { label: translations.report.address, value: 'address' },
     { label: translations.report.idleTime, value: 'idleTime' },
-    { label: translations.report.event_ignitionOff, value: 'stopTime' }
+    { label: translations.report.event_ignitionOff, value: 'stopTime' },
+    { label: translations.report.zone, value: 'zone' }
   ]
 
   let data = []
@@ -184,7 +190,8 @@ function exportStopReportToExcel (userData, reportData) {
           end: getStopEnd(userData.user, a),
           address: a.endPOIName || a.address,
           idleTime: convertMS(a.engineHours, true),
-          stopTime: convertMS(a.stopDuration, true)
+          stopTime: convertMS(a.stopDuration, true),
+          zone: (a.geofenceName || '') + (a.geofenceGroup ? ' (' + a.geofenceGroup + ')' : '')
         }
       }))
       // Totals