fleetmap-reports 2.0.352 → 2.0.354

package/package.json

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

package/src/fuel-consumption-report.js

@@ -1,8 +1,9 @@
 const refuelingReport = require('./refueling-report')
 const traccarHelper = require('./util/traccar')
 const odoo = require('./util/odoo')
+const automaticReports = require('./automaticReports')
 const { devicesToProcess } = require('./util/device')
-const { getTranslations, convertToLocaleString, getLanguage, convertMS, formatNumber, getDates } = require('./util/utils')
+const { getTranslations, convertToLocaleString, getLanguage, convertMS, formatNumber, getDates, isClientSide, executeServerSide } = require('./util/utils')
 const { getStyle } = require('./reportStyle')
 const { getUserPartner } = require('fleetmap-partners')
 const { addTable, headerFromUser } = require('./util/pdfDocument')
@@ -24,6 +25,16 @@ async function createFuelConsumptionReport (from, to, userData, traccar) {
 
   const devices = devicesToProcess(userData)
 
+  allData.totalDevices = 0
+
+  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, 5)
+    allData.totalDevices = allData.devices.length
+    reportData.push(allData)
+    return reportData
+  }
+
   const allInOne = await traccarHelper.getAllInOne(traccar, from, to, devices, true, true, true, false)
   const dates = getDates(from, to, userData.user.attributes.timezone || getUserPartner(userData.user).timezone)
   const summary = await getSummaryByDay(dates, userData, traccar, devices, true, from, to)
@@ -37,8 +48,6 @@ async function createFuelConsumptionReport (from, to, userData, traccar) {
     return reportData
   }
 
-  allData.totalDevices = 0
-
   for (const d of devices) {
     const stops = allInOne.stops.filter(t => t.deviceId === d.id)
     const trips = allInOne.trips.filter(t => t.deviceId === d.id)
@@ -144,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),
@@ -211,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/pdfDocument.js

@@ -43,10 +43,6 @@ async function header (doc, title, hostname, style, orientation) {
   doc.setFont('helvetica', 'bold')
   doc.text(title, 15, 15)
 
-  doc.setFontSize(8)
-  doc.setFont('helvetica', 'normal')
-  doc.text(new Date().toLocaleString(), 15, 21)
-
   if (style.imgWidth && style.imgHeight) {
     try {
       const image = await getImgFromUrl(hostname)

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) {

package/.claude/settings.local.json

@@ -1,9 +0,0 @@
-{
-  "permissions": {
-    "allow": [
-      "Bash(git add *)",
-      "Bash(git commit -m ' *)",
-      "Bash(npm publish *)"
-    ]
-  }
-}