fleetmap-reports 2.0.318 → 2.0.320

package/package.json

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

package/src/sensor-report.js

@@ -14,7 +14,7 @@ function processDevices (from, to, devices, data, userData) {
   const result = []
 
   for (const d of devices) {
-    const positions = data.route.filter(t => t.deviceId === d.id).filter(t => t.attributes.motion)
+    const positions = data.route.filter(t => t.deviceId === d.id)
 
     const statusPeriodBySensor = computeSensorPeriods(positions, userData.sensors, d, userData)
 

package/src/speeding-report.js

@@ -566,12 +566,14 @@ function exportSpeedingReportToExcel (userData, reportData) {
   const translations = getTranslations(userData)
   const overspeedData = userData.byDriver ? reportData.drivers : reportData.devices
 
-  const settings = {
+
+    const settings = {
     sheetName: translations.report.titleSpeedingReport.substring(0, 31), // The name of the sheet
     fileName // The name of the spreadsheet
   }
   const headers = [
     userData.byDriver ? { label: translations.report.driver, value: 'driver' } : { label: translations.report.vehicle, value: 'name' },
+    userData.byDriver ? { label: translations.report.group, value: 'groupName' } : { label: translations.report.group, value: 'groupName' },
     { label: translations.report.date, value: 'fixTime' },
     { label: translations.report.address, value: 'address' },
     {
@@ -595,7 +597,9 @@ function exportSpeedingReportToExcel (userData, reportData) {
     overspeedData.forEach(d => {
       data = data.concat([{}])
       data = data.concat(d.alerts.map(a => {
+        const group = userData.groups.find(g => g.id === a.groupId)
         return {
+          groupName: group ? group.name : '',
           driver: userData.byDriver ? d.driver.name : a.driver,
           speed: Math.round(a.attributes.speed * 1.85200),
           distance: a.distance && new Intl.NumberFormat(lang, { maximumSignificantDigits: 1 }).format(a.distance),