fleetmap-reports 1.0.526 → 1.0.528

package/lang/enGB.js

@@ -221,6 +221,9 @@ module.exports = {
     vehicles: 'Vehicles',
     vehicle: 'Vehicle',
     licensePlate: 'License Plate',
+    consumption: 'Consumption (L)',
+    avg_consumption: 'Avg. Consumption (L/100)',
+    avg_consumption_by_liters: 'Avg. Consumption (Kms/L)',
     odometer: 'Odometer',
     startOdometer: 'Start (Km)',
     endOdometer: 'End (Km)',

package/lang/esCL.js

@@ -210,6 +210,9 @@ module.exports = {
     duration: 'Duracción',
     vehicles: 'Vehículos',
     vehicle: 'Vehículo',
+    consumption: 'Consumo (L)',
+    avg_consumption: 'Consumo (L/100)',
+    avg_consumption_by_liters: 'Consumo (Kms/L)',
     odometer: 'Km',
     startOdometer: 'Start (Km)',
     endOdometer: 'End (Km)',

package/lang/ptBR.js

@@ -212,6 +212,9 @@ module.exports = {
     duration: 'Duração',
     vehicles: 'Veículos',
     vehicle: 'Veículo',
+    consumption: 'Consumo (L)',
+    avg_consumption: 'Consumo (L/100)',
+    avg_consumption_by_liters: 'Consumo (Kms/L)',
     licensePlate: 'Placa',
     odometer: 'Conta-Quilómetros',
     startOdometer: 'Início (Km)',

package/lang/ptPT.js

@@ -218,6 +218,9 @@ module.exports = {
     duration: 'Duração',
     vehicles: 'Veículos',
     vehicle: 'Veículo',
+    consumption: 'Consumo (L)',
+    avg_consumption: 'Consumo (L/100)',
+    avg_consumption_by_liters: 'Consumo (Kms/L)',
     licensePlate: 'Matrícula',
     odometer: 'Conta-Quilómetros',
     startOdometer: 'Início (Km)',

package/package.json

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

package/src/fuelconsumption-report.js

@@ -3,7 +3,11 @@ const refuelingReport = require('./refueling-report')
 const traccarHelper = require('./util/traccar')
 const odoo = require('./util/odoo')
 const { devicesToProcess } = require('./util/device')
-const { getTranslations } = require('./util/utils')
+const { getTranslations, convertToLocaleString, getLanguage } = require('./util/utils')
+const { getStyle } = require('./reportStyle')
+const { getUserPartner } = require('fleetmap-partners')
+const { addTable, headerFromUser } = require('./util/pdfDocument')
+const jsPDF = require('jspdf')
 
 async function createFuelConsumptionReport (from, to, userData, traccar) {
   console.log('Create FuelConsumption Report')
@@ -66,7 +70,7 @@ async function createFuelConsumptionReport (from, to, userData, traccar) {
           date: day,
           distance,
           spentFuel,
-          avgConsumption: userData.withOdooServices ? odooAvgConsumption : getCanAvgConsumption(userData, odooAvgConsumption, distance, spentFuel),
+          avgConsumption: userData.withOdooServices ? odooAvgConsumption : getCanAvgConsumption(distance, spentFuel),
           endOdometer: dayTrips.slice(-1)[0].endOdometer,
           duration: dayTrips.reduce((a, b) => a + b.duration, 0),
           refueling: (dayRefueling && dayRefueling.length > 0) ? dayRefueling.reduce((a, b) => a + b.diff, 0) : 0
@@ -99,7 +103,7 @@ function getOdooAvgConsumption (refuelingPositions, trips) {
   return { byKms: odooTotalfuel * 100 / (totalKms / 1000), byLiters: (totalKms / 1000) / odooTotalfuel }
 }
 
-function getCanAvgConsumption (userData, distance, spentFuel) {
+function getCanAvgConsumption (distance, spentFuel) {
   if (distance === 0 || spentFuel === 0) { return { byKms: 0, byLiters: 0 } }
 
   return { byKms: Math.round(spentFuel * 100 / (distance / 1000)), byLiters: Math.round((distance / 1000) / spentFuel) }
@@ -117,19 +121,20 @@ function calculateConsumption (userData, d, day, avgConsumption, data) {
 
 function exportFuelConsumptionReportToExcel (userData, reportData) {
   const translations = getTranslations(userData)
+  const lang = getLanguage(userData)
 
   const settings = {
     sheetName: 'FuelConsumptionReport', // The name of the sheet
     fileName: 'FuelConsumptionReport' // The name of the spreadsheet
   }
   const headers = [
-    { label: translations.report.name, value: 'name' },
+    { label: translations.report.vehicle, value: 'name' },
     { label: translations.report.date, value: 'date' },
-    { label: translations.report.kms, value: 'kms' },
+    { label: translations.report.distance, value: 'kms' },
     { label: translations.report.consumption, value: 'consumption' },
     { label: translations.report.avg_consumption, value: 'avg_consumption' },
     { label: translations.report.duration, value: 'duration' },
-    { label: translations.report.accumulated_kms, value: 'accumulated_kms' },
+    { label: translations.report.odometer, value: 'accumulated_kms' },
     { label: translations.report.refueling, value: 'refueling' }
   ]
   let data = []
@@ -141,7 +146,7 @@ function exportFuelConsumptionReportToExcel (userData, reportData) {
           date: r.date,
           kms: (r.distance / 1000).toFixed(2),
           consumption: r.spentFuel > 0 ? r.spentFuel : 0,
-          avg_consumption: r.avgConsumption,
+          avg_consumption: lang === 'pt-BR' ? r.avgConsumption.byLiters : r.avgConsumption.byKms,
           duration: new Date(r.duration).toLocaleTimeString(),
           accumulated_kms: (r.endOdometer / 1000).toFixed(2),
           refueling: r.refueling
@@ -156,8 +161,69 @@ function exportFuelConsumptionReportToExcel (userData, reportData) {
   }
 }
 
-function exportFuelConsumptionReportToPDF (userData, reportData) {
+async function exportFuelConsumptionReportToPDF (userData, reportData) {
   console.log('Export to PDF')
+  const timezone = userData.user.attributes.timezone
+  const translations = getTranslations(userData)
+  const lang = getLanguage(userData)
+
+  const doc = new jsPDF.jsPDF('l')
+  await headerFromUser(doc, translations.report.titleFuelConsumptionReport, userData.user)
+
+  const headers = [
+    translations.report.date,
+    translations.report.distance,
+    translations.report.consumption,
+    translations.report.avg_consumption,
+    translations.report.duration,
+    translations.report.odometer,
+    translations.report.refueling
+  ]
+
+  if (reportData.devices) {
+    reportData.devices.forEach((d, index) => {
+      const data = []
+      const name = deviceName(d.device)
+      const group = userData.groups.find(g => d.device.groupId === g.id)
+
+      const space = index === 0 ? 8 : 0
+      if (index) {
+        doc.addPage()
+      }
+
+      doc.setFontSize(13)
+      doc.text(name, 20, space + 20)
+      doc.setFontSize(11)
+      doc.text(group ? translations.report.group + ': ' + group.name : '', 200, space + 20)
+      doc.text(convertToLocaleString(reportData.from, lang, timezone) + ' - ' + convertToLocaleString(reportData.to, lang, timezone), 20, space + 25)
+
+      console.log(d.days)
+      d.days.forEach(r =>
+        data.push([
+          r.date,
+          (r.distance / 1000).toFixed(2),
+          r.spentFuel > 0 ? r.spentFuel : 0,
+          lang === 'pt-BR' ? r.avgConsumption.byLiters : r.avgConsumption.byKms,
+          new Date(r.duration).toLocaleTimeString(),
+          (r.endOdometer / 1000).toFixed(2),
+          r.refueling
+        ]))
+      console.log(data)
+      const footValues = [
+        'Total:' + d.days.length,
+        '', '', '', '', '', '', ''
+      ]
+
+      const style = getStyle(getUserPartner(userData.user))
+      addTable(doc, headers, data, footValues, style, space + (userData.allWeek ? 40 : 45))
+    })
+
+    return doc
+  }
+}
+
+function deviceName (device) {
+  return device.name + (device.attributes.license_plate ? ', ' + device.attributes.license_plate : '') + (device.model ? ', ' + device.model : '')
 }
 
 exports.createFuelConsumptionReport = createFuelConsumptionReport

package/src/kms-report.js

@@ -375,7 +375,7 @@ function exportKmsReportToExcel (userData, reportData) {
   if (userData.groupByDay) {
     headers.push(
       { label: translations.report.vehicle, value: 'name' },
-      { label: translations.report.licensePlate, value: 'licenseplate' },
+      { label: translations.settings.vehicle_licenseplate, value: 'licenseplate' },
       { label: translations.report.group, value: 'group' },
       { label: translations.report.date, value: 'date' },
       { label: translations.report.weekDay, value: 'weekday' },