fleetmap-reports 2.0.74 → 2.0.75

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/package.json +1 -1
  2. package/src/fuelconsumption-report.js +3 -4
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "fleetmap-reports",
3
- "version": "2.0.74",
3
+ "version": "2.0.75",
4
4
  "description": "",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
package/src/fuelconsumption-report.js CHANGED
@@ -7,7 +7,7 @@ const { getStyle } = require('./reportStyle')
7
7
  const { getUserPartner } = require('fleetmap-partners')
8
8
  const { addTable, headerFromUser } = require('./util/pdfDocument')
9
9
  const jsPDF = require('jspdf')
10
- const { useOdooFuelData, calculateConsumption } = require('./util/fuel')
10
+ const { calculateConsumption } = require('./util/fuel')
11
11
  const { getSummaryByDay } = require('./util/traccar')
12
12
  const { getDataByDay } = require('./util/trips')
13
13
 
@@ -52,15 +52,14 @@ async function createFuelConsumptionReport (from, to, userData, traccar) {
52
52
  const summaryByDay = summary.find(a => a.date === date).summary
53
53
  const summaryByDevice = summaryByDay.find(a => a.deviceId === d.id)
54
54
 
55
- const odooAvgConsumption = useOdooFuelData(d, route) ? getOdooAvgConsumption(date, refuelingPositions, trips) : 0
56
55
  const distance = summaryByDevice.distance
57
- const spentFuel = calculateConsumption(d, { trips: tripsByDay, stops: [], route: routeByDay, summary: summaryByDevice }, odooAvgConsumption)
56
+ const spentFuel = calculateConsumption(d, { trips: tripsByDay, stops: [], route: routeByDay, summary: summaryByDevice })
58
57
 
59
58
  const dataRow = {
60
59
  date,
61
60
  distance,
62
61
  spentFuel,
63
- avgConsumption: useOdooFuelData(d, route) ? odooAvgConsumption : getCanAvgConsumption(distance, spentFuel),
62
+ avgConsumption: getCanAvgConsumption(distance, spentFuel),
64
63
  startOdometer: summaryByDevice.startOdometer,
65
64
  endOdometer: summaryByDevice.endOdometer,
66
65
  duration: tripsByDay.reduce((a, b) => a + b.duration, 0),