fleetmap-reports 1.0.595 → 1.0.597

package/package.json

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

package/src/fuelconsumption-report.js

@@ -204,7 +204,7 @@ async function exportFuelConsumptionReportToPDF (userData, reportData) {
           r.date,
           (r.distance / 1000).toFixed(1),
           r.spentFuel > 0 ? r.spentFuel : 0,
-          lang === 'pt-BR' ? r.avgConsumption.byLiters : r.avgConsumption.byKms,
+          lang === 'pt-BR' ? (r.avgConsumption.byLiters).toFixed(1) : (r.avgConsumption.byKms).toFixed(1),
           new Date(r.duration).toLocaleTimeString(),
           (r.endOdometer / 1000).toFixed(1),
           r.refueling

package/src/refueling-report.js

@@ -32,7 +32,7 @@ async function createRefuelingReport (from, to, userData, traccar) {
   }
 
   const fuelServicesData = []
-  if (userData.withOdooServices) {
+  if (devices.some(d => d.attributes.odooId)) {
     fuelServicesData.push(...(await odoo.getOdooFuelServices(traccar, from, to)))
   }
 
@@ -122,7 +122,7 @@ function coordsDistance (lon1, lat1, lon2, lat2) {
 async function calculateRefuelingPositions (userData, d, data) {
   const refuelingPositions = []
 
-  if (userData.withOdooServices && d.attributes.odooId) {
+  if (d.attributes.odooId && !data.route[0].attributes.fuel) {
     console.log(data.fuelServices)
     data.fuelServices.forEach(s => {
       const serviceDate = new Date(s.date)
@@ -133,7 +133,7 @@ async function calculateRefuelingPositions (userData, d, data) {
       const quantity = s.liter
 
       if (routeBeforeService.length) {
-        refuelingPositions.push({ date: s.date, diff: Number.parseFloat(quantity), cost: s.amount })
+        refuelingPositions.push({ position: routeBeforeService.slice(-1)[0], date: s.date, diff: Number.parseFloat(quantity), cost: s.amount })
       }
     })
   } else {