fleetmap-reports 1.0.684 → 1.0.686

package/package.json

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

package/src/fuelconsumption-report.js

@@ -55,12 +55,11 @@ async function createFuelConsumptionReport (from, to, userData, traccar) {
         new Map()
       )
 
-      const odooAvgConsumption = useOdooFuelData(d, route) ? getOdooAvgConsumption(refuelingPositions, trips) : 0
-
       const days = []
       const keys = Array.from(groupedTripsByDay.keys())
 
       keys.forEach(day => {
+        const odooAvgConsumption = useOdooFuelData(d, route) ? getOdooAvgConsumption(day, refuelingPositions, trips) : 0
         const dayTrips = groupedTripsByDay.get(day)
         const dayRefueling = groupedRefuelingsByDay.get(day)
         const distance = dayTrips.reduce((a, b) => a + b.distance, 0)
@@ -94,13 +93,21 @@ async function createFuelConsumptionReport (from, to, userData, traccar) {
   return reportData
 }
 
-function getOdooAvgConsumption (refuelingPositions, trips) {
-  const odooTotalfuel = refuelingPositions.reduce((a, b) => a + b.diff, 0)
-  const totalKms = trips.reduce((a, b) => a + b.distance, 0)
+function getOdooAvgConsumption (day, allRefuelingPositions, trips) {
+  const refuelingData = allRefuelingPositions.filter(r => new Date(r.date).getTime() > new Date(day).getTime())
+  let odooFuel
+  let kms
+  if (!refuelingData.length) {
+    odooFuel = allRefuelingPositions.reduce((a, b) => a + b.diff, 0)
+    kms = trips.reduce((a, b) => a + b.distance, 0)
+  } else {
+    odooFuel = allRefuelingPositions.filter(r => new Date(r.date).getTime() <= new Date(refuelingData[0].date).getTime()).reduce((a, b) => a + b.diff, 0)
+    kms = trips.filter(t => new Date(t.startDate).getTime() < new Date(refuelingData[0].date).getTime()).reduce((a, b) => a + b.distance, 0)
+  }
 
-  if (totalKms === 0 || odooTotalfuel === 0) { return { byKms: 0, byLiters: 0 } }
+  if (kms === 0 || odooFuel === 0) { return { byKms: 0, byLiters: 0 } }
 
-  return calculateAvgConsumption(odooTotalfuel, totalKms)
+  return calculateAvgConsumption(odooFuel, kms)
 }
 
 function getCanAvgConsumption (distance, spentFuel) {
@@ -110,7 +117,7 @@ function getCanAvgConsumption (distance, spentFuel) {
 }
 
 function calculateAvgConsumption (fuel, distance) {
-  return { byKms: Math.round(fuel * 100 / (distance / 1000)), byLiters: Math.round((distance / 1000) / fuel) }
+  return { byKms: fuel * 100 / (distance / 1000), byLiters: (distance / 1000) / fuel }
 }
 
 function calculateConsumption (userData, d, day, avgConsumption, data) {
@@ -118,7 +125,7 @@ function calculateConsumption (userData, d, day, avgConsumption, data) {
     return automaticReports.calculateXpertSpentFuel(day, data.route)
   }
   if (useOdooFuelData(d, data.route)) {
-    return Math.round((avgConsumption.byKms * (data.trips.reduce((a, b) => a + b.distance, 0) / 1000)) / 100)
+    return (avgConsumption.byKms * (data.trips.reduce((a, b) => a + b.distance, 0) / 1000) / 100)
   }
   return automaticReports.calculateSpentFuel(data.trips.reduce((a, b) => a + b.spentFuel, 0), d)
 }
@@ -136,7 +143,7 @@ function exportFuelConsumptionReportToExcel (userData, reportData) {
     { label: translations.report.date, value: 'date' },
     { label: translations.report.distance, value: 'kms' },
     { label: translations.report.consumption, value: 'consumption' },
-    { label: translations.report.avg_consumption, value: 'avg_consumption' },
+    { label: (lang === 'pt-BR' ? translations.report.avg_consumption_by_liters : translations.report.avg_consumption), value: 'avg_consumption' },
     { label: translations.report.duration, value: 'duration' },
     { label: translations.report.odometer, value: 'accumulated_kms' },
     { label: translations.report.refueling, value: 'refueling' }
@@ -152,7 +159,7 @@ function exportFuelConsumptionReportToExcel (userData, reportData) {
           consumption: r.spentFuel > 0 ? formatNumber(r.spentFuel, lang) : 0,
           avg_consumption: formatNumber(lang === 'pt-BR' ? r.avgConsumption.byLiters : r.avgConsumption.byKms, lang),
           duration: convertMS(r.duration),
-          accumulated_kms: (r.endOdometer / 100).toFixed(1),
+          accumulated_kms: formatNumber((r.endOdometer / 100), lang),
           refueling: formatNumber(r.refueling, lang)
         }
       }))
@@ -189,7 +196,7 @@ async function exportFuelConsumptionReportToPDF (userData, reportData) {
     translations.report.date,
     translations.report.distance,
     translations.report.consumption,
-    translations.report.avg_consumption,
+    (lang === 'pt-BR' ? translations.report.avg_consumption_by_liters : translations.report.avg_consumption),
     translations.report.duration,
     translations.report.odometer,
     translations.report.refueling
@@ -212,7 +219,6 @@ async function exportFuelConsumptionReportToPDF (userData, reportData) {
       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,
@@ -220,10 +226,10 @@ async function exportFuelConsumptionReportToPDF (userData, reportData) {
           r.spentFuel > 0 ? formatNumber(r.spentFuel, lang) : 0,
           formatNumber(lang === 'pt-BR' ? r.avgConsumption.byLiters : r.avgConsumption.byKms, lang),
           convertMS(r.duration),
-          (r.endOdometer / 1000).toFixed(1),
-          r.refueling
+          formatNumber((r.endOdometer / 1000), lang),
+          formatNumber(r.refueling, lang)
         ]))
-      console.log(data)
+
       const footValues = [
         'Total:' + d.days.length,
         getTotalKms(userData.user, d.days),
@@ -235,7 +241,15 @@ async function exportFuelConsumptionReportToPDF (userData, reportData) {
       ]
 
       const style = getStyle(getUserPartner(userData.user))
-      addTable(doc, headers, data, footValues, style, space + (userData.allWeek ? 40 : 45))
+      addTable(doc, headers, data, footValues, style, space + (userData.allWeek ? 40 : 45),
+        {
+          1: { halign: 'right' },
+          2: { halign: 'right' },
+          3: { halign: 'right' },
+          4: { halign: 'right' },
+          5: { halign: 'right' },
+          6: { halign: 'right' }
+        })
     })
 
     return doc
@@ -271,7 +285,7 @@ function getTotalRefueling (user, data) {
 }
 
 function getTotalAvgConsumption (user, data) {
-  const values = data.map(a => a.distance * a.avgConsumption.byKms).reduce((a, b) => a + b, 0)
+  const values = data.map(a => a.distance * (user.attributes.lang === 'pt-BR' ? a.avgConsumption.byLiters : a.avgConsumption.byKms)).reduce((a, b) => a + b, 0)
   const totalKms = data.reduce((a, b) => a + b.distance, 0)
 
   const totalAvgConsumption = values / totalKms

package/src/util/utils.js

@@ -39,7 +39,7 @@ function convertMS (duration, withSeconds) {
 }
 
 exports.formatNumber = function formatNumber (value, lang) {
-  return Intl.NumberFormat(lang, { maximumFractionDigits: 1 }).format(value)
+  return Intl.NumberFormat(lang, { maximumFractionDigits: 1, minimumFractionDigits: 1 }).format(value)
 }
 
 function coordsDistance (lon1, lat1, lon2, lat2) {