fleetmap-reports 1.0.381 → 1.0.384

package/package.json

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

package/src/activity-report.js

@@ -1,5 +1,5 @@
 const automaticReports = require("./automaticReports")
-const {convertMS, getDates, getTranslations} = require("./util/utils")
+const {convertMS, getDates, getTranslations, weekDaySelected} = require("./util/utils")
 const jsPDF = require('jspdf')
 require('jspdf-autotable')
 const drivers = require("./util/driver")
@@ -9,6 +9,7 @@ const {getUserPartner} = require("fleetmap-partners")
 const traccar = require("./util/traccar")
 const {isInsideTimetable, isPartialInsideTimetable, calculateTrip} = require("./util/trips");
 const tripHelper = require("./util/trips");
+const {devicesToProcess} = require("./util/device");
 
 const fileName = 'ActivityReport'
 
@@ -71,27 +72,23 @@ async function createActivityReportByGroup(from, to, userData, traccarInstance){
 }
 
 async function createActivityReportByDevice(from, to, userData, traccarInstance){
-    const groupIds = userData.groups.map(g => g.id)
-    const devicesToProcess = userData.byGroup ? userData.devices.filter(d => !groupIds.includes(d.groupId)) : userData.devices
+    const devices = devicesToProcess(userData)
 
     const allData = {
         devices: [],
-        xpert: devicesToProcess.filter(d => d.attributes.xpert).length > 0,
+        xpert: devices.filter(d => d.attributes.xpert).length > 0,
         from: from,
         to: to
     }
 
-    //Get report data from traccar
-    devicesToProcess.sort((a, b) => (a.name > b.name) ? 1 : -1)
-
     let summaries = []
-    const {trips, route, summary}  = await traccar.getAllInOne(traccarInstance, from, to, devicesToProcess, true, true, false, !userData.groupByDay)
+    const {trips, route, summary}  = await traccar.getAllInOne(traccarInstance, from, to, devices, true, true, false, !userData.groupByDay)
 
     if(userData.groupByDay) {
         console.log('trips:' + trips.length)
 
         if (trips.length) {
-            tripHelper.checkTripsKms(traccarInstance, from, to, devicesToProcess, {trips, route})
+            tripHelper.checkTripsKms(traccarInstance, from, to, devices, {trips, route})
         }
 
         const dates = getDates(from, to)
@@ -100,7 +97,7 @@ async function createActivityReportByDevice(from, to, userData, traccarInstance)
                 const fromByDay = new Date(date.getFullYear(), date.getMonth(), date.getDate(), 0, 0, 0)
                 const toByDay = new Date(date.getFullYear(), date.getMonth(), date.getDate(), 23, 59, 59)
 
-                const summary = await traccar.getSummary(traccarInstance, fromByDay, toByDay, devicesToProcess)
+                const summary = await traccar.getSummary(traccarInstance, fromByDay, toByDay, devices)
                 summary.forEach(s => s.date = date)
                 summaries = summaries.concat(summary)
             }
@@ -113,7 +110,7 @@ async function createActivityReportByDevice(from, to, userData, traccarInstance)
 
     //Process report data
     if (summaries.length || trips.length) {
-        allData.devices = processDevices(from, to, devicesToProcess, {summaries: summaries, trips, route}, userData)
+        allData.devices = processDevices(from, to, devices, {summaries: summaries, trips, route}, userData)
     }
 
     return allData
@@ -169,20 +166,22 @@ function processDevices(from, to, devices, data, userData) {
                 const distance = tripsByDay.reduce((a, b) => a + b.distance, 0)
 
                 if(!userData.allWeek && userData.weekDays && userData.dayHours) {
-                    summary.push({
-                        date: date,
-                        deviceId: d.id,
-                        averageSpeed: distance > 0 ? ((tripsByDay.reduce((a, b) => a + (b.averageSpeed * b.distance), 0)) / distance) : 0,
-                        distance: distance,
-                        engineHours: tripsByDay.reduce((a, b) => a + b.duration, 0),
-                        maxSpeed: tripsByDay.reduce((a, b) => {
-                            return a > b.maxSpeed ? a : b.maxSpeed
-                        }, 0),
-                        endOdometer: 0,
-                        startOdometer: 0,
-                        startTime: tripsByDay.length && tripsByDay[0].startTime,
-                        endTime: tripsByDay.length && tripsByDay[tripsByDay.length-1].endTime
-                    })
+                    if(weekDaySelected(date, userData.weekDays)) {
+                        summary.push({
+                            date: date,
+                            deviceId: d.id,
+                            averageSpeed: distance > 0 ? ((tripsByDay.reduce((a, b) => a + (b.averageSpeed * b.distance), 0)) / distance) : 0,
+                            distance: distance,
+                            engineHours: tripsByDay.reduce((a, b) => a + b.duration, 0),
+                            maxSpeed: tripsByDay.reduce((a, b) => {
+                                return a > b.maxSpeed ? a : b.maxSpeed
+                            }, 0),
+                            endOdometer: 0,
+                            startOdometer: 0,
+                            startTime: tripsByDay.length && tripsByDay[0].startTime,
+                            endTime: tripsByDay.length && tripsByDay[tripsByDay.length - 1].endTime
+                        })
+                    }
                 } else {
                     const summaryCurrentDay = data.summaries.find(s => {
                         return  s.deviceId === d.id && s.date.getTime() === date.getTime()})

package/src/events-report.js

@@ -5,6 +5,7 @@ const {getStyle} = require("./reportStyle");
 const {headerFromUser} = require("./util/pdfDocument");
 const {getUserPartner} = require("fleetmap-partners");
 const {convertToLocaleString, getTranslations} = require("./util/utils");
+const {devicesToProcess} = require("./util/device");
 
 const fileName = 'EventReport'
 
@@ -36,17 +37,14 @@ async function createEventsReport(from, to, userData, traccar) {
         }
     }
 
-    const groupIds = userData.groups.map(g => g.id)
-    const withoutGroupDevices = userData.byGroup ? userData.devices.filter(d => !groupIds.includes(d.groupId)) : userData.devices
+    const devices = devicesToProcess(userData)
 
-    withoutGroupDevices.sort((a, b) => (a.name > b.name) ? 1 : -1)
-
-    const data = await getReportData(from, to, withoutGroupDevices, userData.eventTypes, traccar)
+    const data = await getReportData(from, to, devices, userData.eventTypes, traccar)
 
     if(data.length > 0) {
         reportData.push({
-            devices: await processDevices(from, to, withoutGroupDevices, userData.geofences, userData.drivers, data, traccar),
-            xpert: withoutGroupDevices.filter(d => d.attributes.xpert).length > 0
+            devices: await processDevices(from, to, devices, userData.geofences, userData.drivers, data, traccar),
+            xpert: devices.filter(d => d.attributes.xpert).length > 0
         })
     }
 

package/src/fuelconsumption-report.js

@@ -2,6 +2,7 @@ const automaticReports = require("./automaticReports")
 const refuelingReport = require("./refueling-report")
 const traccarHelper = require("./util/traccar")
 const odoo = require("./util/odoo")
+const {devicesToProcess} = require("./util/device");
 
 
 
@@ -16,9 +17,9 @@ async function createFuelConsumptionReport(from, to, userData, traccar) {
         to: to
     }
 
-    userData.devices.sort((a, b) => (a.name > b.name) ? 1 : -1)
+    const devices = devicesToProcess(userData)
 
-    const allInOne =  await traccarHelper.getAllInOne(traccar, from, to, userData.devices, true, true, false, false)
+    const allInOne =  await traccarHelper.getAllInOne(traccar, from, to, devices, true, true, false, false)
     const tripsData = allInOne.trips
     const routeData = allInOne.route
 
@@ -33,7 +34,7 @@ async function createFuelConsumptionReport(from, to, userData, traccar) {
 
     allData.totalDevices = 0
 
-    for (const d of userData.devices) {
+    for (const d of devices) {
         const trips = tripsData.filter(t => t.deviceId===d.id)
         const route = routeData.filter(r => r.deviceId===d.id)
         const deviceFuelServices = fuelServicesData.filter(f => d.attributes.odooId === f.vehicle_id[0])

package/src/fueldrop-report.js

@@ -1,4 +1,5 @@
 const automaticReports = require("./automaticReports");
+const {devicesToProcess} = require("./util/device");
 
 function calculateFuelDrop(position, positions) {
     const index = positions.indexOf(position)
@@ -28,9 +29,9 @@ async function createFuelDropReport(from, to, userData, traccar) {
         to: to
     }
 
-    userData.devices.sort((a, b) => (a.name > b.name) ? 1 : -1)
+    const devices = devicesToProcess(userData)
 
-    const arrayOfArrays = automaticReports.sliceArray(userData.devices)
+    const arrayOfArrays = automaticReports.sliceArray(devices)
     let data = []
     const types = ['deviceFuelDrop']
 
@@ -48,7 +49,7 @@ async function createFuelDropReport(from, to, userData, traccar) {
     allData.totalFuelDrops = 0
     allData.totalFuelDropLiters = 0
 
-    for (const d of userData.devices) {
+    for (const d of devices) {
         const alerts = data.filter(t => t.deviceId===d.id)
 
         if(alerts.length > 0) {
@@ -67,13 +68,19 @@ async function createFuelDropReport(from, to, userData, traccar) {
                 }
             }
 
-            allData.devices.push({
-                device: d,
-                alerts: alerts
-            })
-            allData.totalDevices = allData.totalDevices+1
-            allData.totalFuelDrops = allData.totalFuelDrops + alerts.length
-            allData.totalFuelDropLiters = allData.totalFuelDropLiters + alerts.reduce((a, b) => a + b.fuelDropLiters, 0)
+            //Filter wrong fuel drop values
+            const filteredAlerts = alerts.filter(a => a.fuelDropLiters < d.attributes.fuel_tank_capacity && a.fuelDropLiters > 0)
+
+            if(filteredAlerts.length > 0) {
+                allData.devices.push({
+                    device: d,
+                    alerts: filteredAlerts
+                })
+
+                allData.totalDevices = allData.totalDevices + 1
+                allData.totalFuelDrops = allData.totalFuelDrops + filteredAlerts.length
+                allData.totalFuelDropLiters = allData.totalFuelDropLiters + filteredAlerts.reduce((a, b) => a + b.fuelDropLiters, 0)
+            }
         }
     }
 

package/src/idle-report.js

@@ -4,6 +4,7 @@ const {headerFromUser, AmiriRegular} = require("./util/pdfDocument");
 const {convertToLocaleString, convertMS, getTranslations} = require("./util/utils");
 const {getStyle} = require("./reportStyle");
 const {getUserPartner} = require("fleetmap-partners");
+const {devicesToProcess} = require("./util/device");
 
 const fileName = 'IdleReport'
 
@@ -17,7 +18,7 @@ async function createIdleReport(from, to, userData, traccarInstance) {
         reportData.push(...allData)
     } else {
         console.log("ByDevice")
-        const report = await createTripReportByDevice(from, to, userData.devices, userData, traccarInstance)
+        const report = await createTripReportByDevice(from, to, userData, traccarInstance)
         reportData.push(report)
     }
 
@@ -60,17 +61,16 @@ async function createTripReportByGroup(from, to, userData, traccarInstance) {
     return reportData
 }
 
-async function createTripReportByDevice(from, to, devices, userData, traccarInstance) {
+async function createTripReportByDevice(from, to, userData, traccarInstance) {
     const allData = {
         devices: [],
         from: from,
         to: to
     }
 
-    devices.sort((a, b) => (a.name > b.name) ? 1 : -1)
+    const devices = devicesToProcess(userData)
 
-    const devicesToSlice = devices.slice()
-    const route = await traccar.getRoute(traccarInstance, from, to, devicesToSlice)
+    const route = await traccar.getRoute(traccarInstance, from, to, devices)
 
     console.log('Route:' + route.length)
 

package/src/kms-report.js

@@ -10,6 +10,7 @@ const trips = require("./util/trips")
 const drivers = require("./util/driver")
 const { isInsideTimetable, isPartialInsideTimetable, calculateTrip} = require("./util/trips")
 const traccarHelper = require("./util/traccar");
+const {devicesToProcess} = require("./util/device");
 
 const fileName = 'KmsReport'
 
@@ -37,8 +38,7 @@ async function createKmsReport(from, to, userData, traccarInstance) {
 }
 
 async function createKmsReportByDevice(from, to, userData, traccarInstance) {
-    const groupIds = userData.groups.map(g => g.id)
-    const devicesToProcess = userData.byGroup ? userData.devices.filter(d => !groupIds.includes(d.groupId)) : userData.devices
+    const devices = devicesToProcess(userData)
 
     const allData = {
         devices: [],
@@ -46,16 +46,15 @@ async function createKmsReportByDevice(from, to, userData, traccarInstance) {
         to: to
     }
 
-    devicesToProcess.sort((a, b) => (a.name > b.name) ? 1 : -1)
-    const allInOne =  await traccarHelper.getAllInOne(traccarInstance, from, to, devicesToProcess, true, true, false, false)
+    const allInOne =  await traccarHelper.getAllInOne(traccarInstance, from, to, devices, true, true, false, false)
     const tripsData = allInOne.trips
     const routeData = allInOne.route
 
     console.log('trips:' + tripsData.length)
 
     if (tripsData.length > 0) {
-        trips.checkTripsKms(traccarInstance, from, to, devicesToProcess, {trips: tripsData, route: routeData})
-        allData.devices = processDevices(from, to, devicesToProcess, {trips: tripsData, route: routeData}, userData)
+        trips.checkTripsKms(traccarInstance, from, to, devices, {trips: tripsData, route: routeData})
+        allData.devices = processDevices(from, to, devices, {trips: tripsData, route: routeData}, userData)
     }
 
     return allData

package/src/location-report.js

@@ -5,6 +5,7 @@ const {getStyle} = require("./reportStyle")
 const {getUserPartner} = require("fleetmap-partners");
 const {convertToLocaleString, getTranslations} = require("./util/utils");
 const traccarHelper = require("./util/traccar");
+const {devicesToProcess} = require("./util/device");
 
 const fileName = 'LocationReport'
 
@@ -79,23 +80,20 @@ async function createLocationReportByGroup(from, to, userData, traccar) {
 }
 
 async function createLocationReportByDevice(from, to, userData, traccar) {
-    const groupIds = userData.groups.map(g => g.id)
-    const withoutGroupDevices = userData.byGroup ? userData.devices.filter(d => !groupIds.includes(d.groupId)) : userData.devices
+    const devices = devicesToProcess(userData)
 
     const allData = {
         devices: [],
-        xpert: withoutGroupDevices.filter(d => d.attributes.xpert).length > 0
+        xpert: devices.filter(d => d.attributes.xpert).length > 0
     }
 
-    withoutGroupDevices.sort((a, b) => (a.name > b.name) ? 1 : -1)
-    const devicesToSlice = withoutGroupDevices.slice()
-    const allInOne = await traccarHelper.getAllInOne(traccar, from, to, devicesToSlice, true, false, false, false)
+    const allInOne = await traccarHelper.getAllInOne(traccar, from, to, devices, true, false, false, false)
     const routeData = allInOne.route
 
     console.log('Locations:'+routeData.length)
 
     if(routeData.length > 0) {
-        allData.devices = processDevices(from, to, withoutGroupDevices, userData.drivers, routeData)
+        allData.devices = processDevices(from, to, devices, userData.drivers, routeData)
     }
 
     return allData

package/src/refueling-report.js

@@ -1,5 +1,6 @@
 const helpers = require("turf")
 const automaticReports = require("./automaticReports")
+const {devicesToProcess} = require("./util/device");
 
 const positionsToCheck = 15
 
@@ -14,12 +15,11 @@ async function createRefuelingReport(from, to, userData, traccar) {
         to: to
     }
 
-    userData.devices.sort((a, b) => (a.name > b.name) ? 1 : -1)
+    const devices = devicesToProcess(userData).filter(d => automaticReports.deviceWithFuelInfo(d))
 
-    const devicesToSlice = userData.devices.filter(d => automaticReports.deviceWithFuelInfo(d)).slice()
-    console.log('Devices:'+devicesToSlice.length)
+    console.log('Devices:'+devices.length)
 
-    const arrayOfArrays = automaticReports.sliceArray(devicesToSlice)
+    const arrayOfArrays = automaticReports.sliceArray(devices)
     let data = []
     for (const a of arrayOfArrays) {
         const response = await traccar.reports.reportsRouteGet(from, to, a.map(d => d.id))
@@ -36,7 +36,7 @@ async function createRefuelingReport(from, to, userData, traccar) {
     allData.totalRefueling = 0
     allData.totalRefuelingLiters = 0
 
-    for (const d of userData.devices) {
+    for (const d of devices) {
         const positions = data.filter(t => t.deviceId===d.id)
 
         if(positions.length > 0) {

package/src/speeding-report.js

@@ -11,6 +11,7 @@ const {distance, point} = require('turf')
 const here = require('./here')
 const {getUserPartner} = require("fleetmap-partners");
 const traccarHelper = require("./util/traccar");
+const {devicesToProcess} = require("./util/device");
 
 const fileName = 'SpeedingReport'
 const eventTypes = ['deviceOverspeed']
@@ -67,10 +68,7 @@ async function createSpeedingReportByGroup(from, to, userData, traccarInstance){
 }
 
 async function createSpeedingReportByDevice(from, to, userData, traccarInstance) {
-  const groupIds = userData.groups.map(g => g.id)
-  const devices = userData.byGroup ? userData.devices.filter(d => !groupIds.includes(d.groupId)) : userData.devices
-
-  devices.sort((a, b) => (a.name > b.name) ? 1 : -1)
+  const devices = devicesToProcess(userData)
 
   const allInOne = await traccarHelper.getAllInOne(traccarInstance, from, to, devices, true, false, false, false)
   const routes = allInOne.route
@@ -471,7 +469,7 @@ function exportSpeedingReportToExcel(userData, reportData) {
           distance: a.distance && new Intl.NumberFormat(lang, {maximumSignificantDigits: 1}).format(a.distance),
           maxSpeed: a.attributes.maxSpeed ? Math.round(a.attributes.maxSpeed * 1.85200) : Math.round(a.attributes.speed * 1.85200),
           duration:  convertMS(a.eventTime, true),
-          fixTime: new Date(a.position.fixTime).toLocaleString(),
+          fixTime: getAlertDate(a, userData.user),
           name: userData.byDriver ? a.deviceName : d.device.name,
           address: a.position.address + (a.geofenceName ? ' - ' + a.geofenceName : ''),
           roadSpeedLimit: a.roadSpeedLimit

package/src/trip-report.js

@@ -8,6 +8,7 @@ const {getStyle} = require("./reportStyle")
 const traccarHelper = require("./util/traccar")
 const trips = require("./util/trips");
 const {isInsideTimetable, addNearestPOIs, isPartialInsideTimetable, calculateTrip} = require("./util/trips")
+const {devicesToProcess} = require("./util/device");
 
 const fileName = 'TripReport'
 
@@ -34,20 +35,15 @@ async function createTripReport(from, to, userData, traccar) {
 }
 
 async function createTripReportByDevice(from, to, userData, traccar) {
-    const groupIds = userData.groups.map(g => g.id)
-    const devices = userData.byGroup ? userData.devices.filter(d => !groupIds.includes(d.groupId)) : userData.devices
+    const devices = devicesToProcess(userData)
 
     const allData = {
         devices: [],
         xpert: devices.filter(d => d.attributes.xpert).length > 0
     }
 
-    devices.sort((a, b) => (a.name > b.name) ? 1 : -1)
+    const sliced = automaticReports.sliceArray(devices, 5)
 
-    const devicesToSlice = devices.slice()
-    const sliced = automaticReports.sliceArray(devicesToSlice, 5)
-
-    console.log('LOADING_MESSAGE:' + devices.map(d => d.name).join(', '))
     let deviceCount = 0
     for(const slice of sliced) {
         const allInOne = await traccarHelper.getAllInOne(traccar, from, to, slice, true, true, true, false)

package/src/util/device.js

@@ -0,0 +1,10 @@
+function devicesToProcess(userData) {
+    const groupIds = userData.groups.map(g => g.id)
+    const devices = userData.byGroup ? userData.devices.filter(d => !groupIds.includes(d.groupId)) : userData.devices
+    devices.sort((a, b) => (a.name > b.name) ? 1 : -1)
+
+    console.log('LOADING_MESSAGE:' + devices.map(d => d.name).join(', '))
+    return devices
+}
+
+exports.devicesToProcess = devicesToProcess

package/src/util/trips.js

@@ -1,4 +1,4 @@
-const {coordsDistance, convertFromUTC} = require("./utils");
+const {coordsDistance, convertFromUTC, weekDaySelected} = require("./utils");
 
 const minDistance = 0
 const minAvgSpeed = 0
@@ -57,13 +57,7 @@ function isPartialInsideTimetable(t, userData, route){
 
     let isPartialInside = false
 
-    if((tripStart.getDay() === 0 && userData.weekDays.sunday) ||
-        (tripStart.getDay() === 1 && userData.weekDays.monday) ||
-        (tripStart.getDay() === 2 && userData.weekDays.tuesday) ||
-        (tripStart.getDay() === 3 && userData.weekDays.wednesday)  ||
-        (tripStart.getDay() === 4 && userData.weekDays.thursday) ||
-        (tripStart.getDay() === 5 && userData.weekDays.friday) ||
-        (tripStart.getDay() === 6 && userData.weekDays.saturday)) {
+    if(weekDaySelected(tripStart, userData.weekDays)) {
 
         const startDate = new Date(convertFromUTC(t.startTime, userData.user.attributes.timezone).toISOString().split('T')[0] + ' '+userData.dayHours.startTime)
         const endDate = new Date(convertFromUTC(t.startTime, userData.user.attributes.timezone).toISOString().split('T')[0] + ' '+userData.dayHours.endTime)
@@ -122,14 +116,7 @@ function isInsideTimetable(t, userData){
     const tripStart = new Date(t.startTime)
     const tripEnd = new Date(t.endTime)
 
-    if((tripStart.getDay() === 0 && userData.weekDays.sunday) ||
-        (tripStart.getDay() === 1 && userData.weekDays.monday) ||
-        (tripStart.getDay() === 2 && userData.weekDays.tuesday) ||
-        (tripStart.getDay() === 3 && userData.weekDays.wednesday)  ||
-        (tripStart.getDay() === 4 && userData.weekDays.thursday) ||
-        (tripStart.getDay() === 5 && userData.weekDays.friday) ||
-        (tripStart.getDay() === 6 && userData.weekDays.saturday)) {
-
+    if(weekDaySelected(tripStart, userData.weekDays)) {
         const startDate = new Date(convertFromUTC(t.startTime, userData.user.attributes.timezone).toISOString().split('T')[0] + ' '+userData.dayHours.startTime)
         const endDate = new Date(convertFromUTC(t.startTime, userData.user.attributes.timezone).toISOString().split('T')[0] + ' '+userData.dayHours.endTime)
 

package/src/util/utils.js

@@ -130,6 +130,16 @@ function convertFromUTC(value, timezone) {
     return valueDate
 }
 
+function weekDaySelected(date, weekDays){
+    return (date.getDay() === 0 && weekDays.sunday) ||
+    (date.getDay() === 1 && weekDays.monday) ||
+    (date.getDay() === 2 && weekDays.tuesday) ||
+    (date.getDay() === 3 && weekDays.wednesday)  ||
+    (date.getDay() === 4 && weekDays.thursday) ||
+    (date.getDay() === 5 && weekDays.friday) ||
+    (date.getDay() === 6 && weekDays.saturday)
+}
+
 exports.getImgFromUrl = getImgFromUrl
 exports.convertMS = convertMS
 exports.coordsDistance = coordsDistance
@@ -140,6 +150,7 @@ exports.convertToLocaleTimeString = convertToLocaleTimeString
 exports.isClientSide = isClientSide
 exports.getTimezoneOffset = getTimezoneOffset
 exports.convertFromUTC = convertFromUTC
+exports.weekDaySelected = weekDaySelected
 exports.getLogo = (user) => {
     const host = window ? window.location.hostname : getUserPartner(user).host
     return getImage(getLogoUrl(host))

package/src/zone-report.js

@@ -6,6 +6,7 @@ require('jspdf-autotable')
 const {headerFromUser} = require("./util/pdfDocument");
 const {getStyle} = require("./reportStyle")
 const {getUserPartner} = require("fleetmap-partners");
+const {devicesToProcess} = require("./util/device");
 
 const fileName = 'ZoneReport'
 
@@ -42,17 +43,15 @@ async function createZoneReport(from, to, userData, traccar) {
         }
     }
 
-    const groupIds = userData.groups.map(g => g.id)
-    const withoutGroupDevices = userData.byGroup ? userData.devices.filter(d => !groupIds.includes(d.groupId)) : userData.devices
+    const devices = devicesToProcess(userData)
 
     const allData = {
         devices: [],
-        xpert: withoutGroupDevices.filter(d => d.attributes.xpert).length > 0
+        xpert: devices.filter(d => d.attributes.xpert).length > 0
     }
 
-    withoutGroupDevices.sort((a, b) => (a.name > b.name) ? 1 : -1)
 
-    const arrayOfArrays = automaticReports.sliceArray(withoutGroupDevices)
+    const arrayOfArrays = automaticReports.sliceArray(devices)
     let data = []
     for (const a of arrayOfArrays) {
         const response = await traccar.reports.reportsEventsGet(from, to, a.map(d => d.id), null, types)
@@ -65,7 +64,7 @@ async function createZoneReport(from, to, userData, traccar) {
         return reportData
     }
 
-    allData.devices = await processDevices(from, to, withoutGroupDevices, userData.drivers, userData.geofences, data, traccar)
+    allData.devices = await processDevices(from, to, devices, userData.drivers, userData.geofences, data, traccar)
 
     reportData.push(allData)