fleetmap-reports 1.0.769 → 1.0.771

package/package.json

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

package/src/fuelconsumption-report.js

@@ -55,6 +55,12 @@ async function createFuelConsumptionReport (from, to, userData, traccar) {
         new Map()
       )
 
+      route.forEach(p => { p.startDate = p.fixTime.substring(0, 10) })
+      const groupedRouteByDay = route.reduce(
+        (entryMap, e) => entryMap.set(e.startDate, [...entryMap.get(e.startDate) || [], e]),
+        new Map()
+      )
+
       const days = []
       const keys = Array.from(groupedTripsByDay.keys())
 
@@ -63,7 +69,7 @@ async function createFuelConsumptionReport (from, to, userData, traccar) {
         const dayTrips = groupedTripsByDay.get(day)
         const dayRefueling = groupedRefuelingsByDay.get(day)
         const distance = dayTrips.reduce((a, b) => a + b.distance, 0)
-        const spentFuel = calculateConsumption(userData, d, day, odooAvgConsumption, { trips: dayTrips, route })
+        const spentFuel = calculateConsumption(userData, d, day, odooAvgConsumption, { trips: dayTrips, route: groupedRouteByDay.get(day) })
 
         const dataRow = {
           date: day,
@@ -124,6 +130,11 @@ function calculateConsumption (userData, d, day, avgConsumption, data) {
   if (useOdooFuelData(d, data.route)) {
     return (avgConsumption.byKms * (data.trips.reduce((a, b) => a + b.distance, 0) / 1000) / 100)
   }
+
+  if (data.route.length > 1 && data.route[0].attributes.fuelUsed) {
+    return data.route[data.route.length - 1].attributes.fuelUsed - data.route[0].attributes.fuelUsed
+  }
+
   return automaticReports.calculateSpentFuel(data.trips.reduce((a, b) => a + b.spentFuel, 0), d)
 }
 

package/src/partnerReports/performance-report.js

@@ -145,8 +145,11 @@ function getDeviceData (allInOne, d) {
       economicDistance
     }
   } else {
+    const drivingTime = deviceTrips.reduce((a, b) => a + b.duration, 0)
+    const drivingDistance = deviceTrips.reduce((a, b) => a + b.distance, 0)
+
     return {
-      drivingTime: 0,
+      drivingTime: drivingTime,
       idleTime: 0,
       cruiseControlTime: 0,
       economicTime: 0,
@@ -157,7 +160,7 @@ function getDeviceData (allInOne, d) {
       idleConsumption: 0,
       cruiseControlConsumption: 0,
       economicConsumption: 0,
-      drivingDistance: 0,
+      drivingDistance: drivingDistance,
       cruiseControlDistance: 0,
       economicDistance: 0
     }

package/src/tests/index.test.js

@@ -194,8 +194,7 @@ describe('Test_Reports', function () {
       userData)
     assert.equal(data.length, 1)
     const device = data[0].devices.find(d => d.device.id === 69114)
-    console.log(device)
-    assert.equal(device.days.reduce((a, b) => a + b.spentFuel, 0), 153.7)
+    assert.equal(device.days.reduce((a, b) => a + b.spentFuel, 0), 168.91999999999985)
   }, 30000)
   // eslint-disable-next-line no-undef
   it('Zone Report', async () => {

package/src/tests/trips.test.js

@@ -135,6 +135,6 @@ describe('trips', function () {
 
     assert.equal(data.length, 1)
     const device = data[0].devices.find(d => d.device.id === 69114)
-    assert.equal(device.trips.reduce((a, b) => a + b.spentFuel, 0), 153.6999999999998) // Total Trips
+    assert.equal(device.trips.reduce((a, b) => a + b.fuelConsumption, 0), 167.69999999999987) // Total Trips
   }, 30000)
 })

package/src/trip-report.js

@@ -167,14 +167,14 @@ function processDevices (from, to, devices, data, userData, traccar) {
         trip.endPOIName = nearestPOIs[0].p.name
       }
 
+      const stop = getStop(new Date(trip.startTime), stops)
+
       if ((deviceRoute[0].protocol === 'teltonika' && deviceRoute.some(r => r.attributes.fuel)) ||
           automaticReports.deviceWithFuelInfo(d)) {
-        trip.fuelConsumption = trip.spentFuel
+        trip.fuelConsumption = trip.spentFuel + (stop ? stop.spentFuel : 0)
         trip.avgFuelConsumption = trip.totalKms > 0 ? trip.fuelConsumption * 100 / trip.totalKms : 0
       }
 
-      const stop = getStop(new Date(trip.startTime), stops)
-
       if (stop && !trip.endTimeIsOut) {
         trip.stopDuration = calculateStopDuration(stop)
         trip.stopEngineHours = trip.idleTime + stop.engineHours