fleetmap-reports 2.0.353 → 2.0.354

package/package.json

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

package/src/fuel-consumption-report.js

@@ -29,7 +29,7 @@ async function createFuelConsumptionReport (from, to, userData, traccar) {
 
   if (isClientSide() && (devices.length > 50 || ((new Date(to).getTime() - new Date(from).getTime()) > (1000 * 60 * 60 * 24 * 15)))) {
     const sliced = automaticReports.sliceArray(devices, 1)
-    allData.devices = await executeServerSide('fuel-consumption-report', sliced, from, to, userData, devices.length, traccar)
+    allData.devices = await executeServerSide('fuel-consumption-report', sliced, from, to, userData, devices.length, traccar, 5)
     allData.totalDevices = allData.devices.length
     reportData.push(allData)
     return reportData
@@ -153,7 +153,7 @@ function exportFuelConsumptionReportToExcel (userData, reportData) {
       data = data.concat(d.days.map((r) => {
         return {
           name: d.device.name,
-          date: r.date.toLocaleDateString(),
+          date: new Date(r.date).toLocaleDateString(),
           kms: formatNumber(r.distance / 1000),
           consumption: r.spentFuel > 0 ? formatNumber(r.spentFuel) : 0,
           avg_consumption: formatNumber(lang === 'pt-BR' ? r.avgConsumption.byLiters : r.avgConsumption.byKms),
@@ -220,7 +220,7 @@ async function exportFuelConsumptionReportToPDF (userData, reportData) {
 
       d.days.forEach(r =>
         data.push([
-          r.date.toLocaleDateString(),
+          new Date(r.date).toLocaleDateString(),
           formatNumber(r.distance / 1000),
           r.spentFuel > 0 ? formatNumber(r.spentFuel) : 0,
           formatNumber(lang === 'pt-BR' ? r.avgConsumption.byLiters : r.avgConsumption.byKms),

package/src/util/utils.js

@@ -259,7 +259,10 @@ async function executeServerSide (type, sliced, from, to, userData, totalItems,
               },
           cookie
         }, { withCredentials: true }).then(d => {
-          reportData.push(...(userData.byDriver ? d.data[0].drivers : d.data[0].devices))
+          const result = d.data[0]
+          if (result) {
+            reportData.push(...((userData.byDriver ? result.drivers : result.devices) || []))
+          }
         })
         itemsCount = itemsCount + items.length
       } catch (e) {