fleetmap-reports 2.0.289 → 2.0.291

package/package.json

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

package/src/refueling-report.js

@@ -28,32 +28,46 @@ async function createRefuelingReport (from, to, userData, traccar) {
 
   console.log('Devices:' + devices.length)
 
-  const arrayOfArrays = automaticReports.sliceArray(devices)
-  const data = []
-  for (const a of arrayOfArrays) {
-    const allInOne = await traccarHelper.getAllInOne(traccar, from, to, a, true, false, false, false)
-    data.push(...allInOne.route)
-  }
-
-  const fuelServicesData = []
-  if (devices.some(d => d.attributes.odooId)) {
-    fuelServicesData.push(...(await odoo.getOdooFuelServices(traccar, from, to)))
-  }
-
-  if (data.length === 0) {
-    return reportData
-  }
+  const slices = automaticReports.sliceArray(devices, 5)
 
   allData.totalDevices = 0
   allData.totalRefueling = 0
   allData.totalRefuelingLiters = 0
+  let deviceCount = 0
+  for (const slice of slices) {
+    const allInOne = await traccarHelper.getAllInOne(traccar, from, to, slice, true, false, false, false, deviceCount, devices.length)
+    const route = allInOne.route
+
+    const fuelServicesData = []
+    if (devices.some(d => d.attributes.odooId)) {
+      fuelServicesData.push(...(await odoo.getOdooFuelServices(traccar, from, to)))
+    }
+
+    allData.devices.push(...await processDevices(from, to, slice, route, userData, fuelServicesData))
+    deviceCount = deviceCount + slice.length
+  }
+  const refuelingPositions = allData.devices.map(d => d.refuelings).flat()
+  allData.totalDevices = allData.totalDevices + 1
+  allData.totalRefueling = allData.totalRefueling + refuelingPositions.length
+  allData.totalRefuelingLiters = allData.totalRefuelingLiters + refuelingPositions.reduce((a, b) => a + b.diff, 0)
+
+  reportData.push(allData)
+
+  return reportData
+}
+
+async function processDevices (from, to, devices, data, userData, fuelServicesData) {
+  const devicesResult = []
 
   for (const d of devices) {
     const positions = data.filter(t => t.deviceId === d.id)
     const deviceFuelServices = fuelServicesData.filter(f => Number.parseInt(d.attributes.odooId) === f.vehicle_id[0])
 
     if (positions.length > 0) {
-      const refuelingPositions = await this.calculateRefuelingPositions(userData, d, { route: positions, fuelServices: deviceFuelServices })
+      const refuelingPositions = await calculateRefuelingPositions(userData, d, {
+        route: positions,
+        fuelServices: deviceFuelServices
+      })
 
       if (userData.drivers.length > 0) {
         refuelingPositions.forEach(r => {
@@ -71,20 +85,15 @@ async function createRefuelingReport (from, to, userData, traccar) {
       }
 
       if (refuelingPositions.length > 0) {
-        allData.devices.push({
+        devicesResult.push({
           device: d,
           refuelings: refuelingPositions
         })
-        allData.totalDevices = allData.totalDevices + 1
-        allData.totalRefueling = allData.totalRefueling + refuelingPositions.length
-        allData.totalRefuelingLiters = allData.totalRefuelingLiters + refuelingPositions.reduce((a, b) => a + b.diff, 0)
       }
     }
   }
 
-  reportData.push(allData)
-
-  return reportData
+  return devicesResult
 }
 
 function findNearestPOI (position, geofences) {

package/src/trip-report.js

@@ -527,8 +527,8 @@ function exportTripReportToExcel (userData, reportData) {
       headers.unshift({ label: translations.report.driver, value: 'name' })
       headers.push({ label: translations.report.vehicle, value: 'subname' })
     } else {
+      headers.unshift({ label: translations.report.driver, value: 'subname' })
       headers.unshift({ label: translations.report.vehicle, value: 'name' })
-      headers.push({ label: translations.report.driver, value: 'subname' })
     }
 
     tripsData.forEach(d => {