fleetmap-reports 1.0.358 → 1.0.361

package/package.json

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

package/src/location-report.js

@@ -54,7 +54,9 @@ async function createLocationReport(from, to, userData, traccar) {
 
     const arrayOfArrays = automaticReports.sliceArray(devicesToSlice)
     let data = []
+    let i = 0
     for (const a of arrayOfArrays) {
+        console.log(`PROGRESS_PERC:${++i/arrayOfArrays.length*100}`)
         const response = await traccar.reports.reportsRouteGet(from, to, a.map(d => d.id))
         data = data.concat(response.data)
     }

package/src/trip-report.js

@@ -117,7 +117,7 @@ async function createTripReportByDriver(from, to, userData, traccar){
 function processDevices(from, to, devices, data, userData) {
     const devicesResult = []
 
-    devices.forEach(d => {
+    devices.forEach((d, index) => {
         const route = data.route.filter(t => t.deviceId === d.id)
         const trips = data.trips.filter(t => t.deviceId === d.id
             && (userData.allWeek || !userData.weekDays || isInsideTimetable(t, userData) || isPartialInsideTimetable(t, userData, route)))

package/src/util/traccar.js

@@ -75,9 +75,11 @@ async function getAllInOne(traccar, from, to, devices, getRoutes, getTrips, getS
     console.log('LOADING_MESSAGE:' + devices.map(d => d.name).join(', '))
 
     const sliced = automaticReports.sliceArray(devices)
+    let deviceCount = 0
     const requests = sliced.map(a =>
         traccar.axios.get(url + '&' + a.map(d => `deviceId=${d.id}`).join('&')).then(r => r.data).then(x => {
             console.log('LOADING_MESSAGE:' + a.map(d => d.name).join(', '))
+            console.log(`PROGRESS_PERC:${++deviceCount/sliced.length*100}`)
             return x
         }))
     const result = await Promise.all(requests)