fleetmap-reports 1.0.515 → 1.0.517

package/package.json

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

package/src/fuelconsumption-report.js

@@ -93,11 +93,16 @@ async function createFuelConsumptionReport (from, to, userData, traccar) {
 function getOdooAvgConsumption (refuelingPositions, trips) {
   const odooTotalfuel = refuelingPositions.reduce((a, b) => a + b.diff, 0)
   const totalKms = trips.reduce((a, b) => a + b.distance, 0)
-  return Math.round(odooTotalfuel * 100 / (totalKms / 1000))
+
+  if (totalKms === 0 || odooTotalfuel === 0) { return { byKms: 0, byLiters: 0 } }
+
+  return { byKms: Math.round(odooTotalfuel * 100 / (totalKms / 1000)), byLiters: Math.round((totalKms / 1000) / odooTotalfuel) }
 }
 
 function getCanAvgConsumption (userData, distance, spentFuel) {
-  return distance > 0 && spentFuel > 0 ? Math.round(spentFuel * 100 / (distance / 1000)) : 0
+  if (distance === 0 || spentFuel === 0) { return { byKms: 0, byLiters: 0 } }
+
+  return { byKms: Math.round(spentFuel * 100 / (distance / 1000)), byLiters: Math.round((distance / 1000) / spentFuel) }
 }
 
 function calculateConsumption (userData, d, day, avgConsumption, data) {
@@ -105,7 +110,7 @@ function calculateConsumption (userData, d, day, avgConsumption, data) {
     return automaticReports.calculateXpertSpentFuel(day, data.route)
   }
   if (userData.withOdooServices) {
-    return Math.round((avgConsumption * (data.trips.reduce((a, b) => a + b.distance, 0) / 1000)) / 100)
+    return Math.round((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)
 }

package/src/index.test.js

@@ -351,33 +351,18 @@ describe('Test_Reports', function () {
   it('Refueling Report', async () => {
     const report = await getReports()
     const userData = await report.getUserData()
-
+    userData.withOdooServices = true
     const data = await report.refuelingReport(
-      new Date(Date.UTC(2022, 1, 2, 0, 0, 0, 0)),
-      new Date(Date.UTC(2022, 1, 2, 23, 59, 59, 0)),
-      userData)
+        new Date(Date.UTC(2022, 9, 1, 0, 0, 0, 0)),
+        new Date(Date.UTC(2022, 9, 31, 23, 59, 59, 0)),
+        userData)
 
     assert.equal(data.length, 1)
     console.log(data[0])
-    const device = data[0].devices.find(d => d.device.id === 16245)
+    const device = data[0].devices.find(d => d.device.id === 22326)
     assert.equal(device.refuelings.length, 2)
   }, 30000)
   // eslint-disable-next-line no-undef
-  it('Refueling2 Report', async () => {
-    const report = await getReports()
-    const userData = await report.getUserData()
-
-    const data = await report.refuelingReport(new Date(2022, 1, 21, 0, 0, 0, 0),
-      new Date(2022, 1, 25, 23, 59, 59, 0),
-      userData)
-
-    assert.equal(data.length, 1)
-    console.log(data[0])
-    const device = data[0].devices.find(d => d.device.id === 16245)
-    console.log(device.refuelings)
-    assert.equal(device.refuelings.length, 4)
-  }, 30000)
-  // eslint-disable-next-line no-undef
   it('FuelConsumption Report', async () => {
     const report = await getReports()
     const userData = await report.getUserData()

package/src/refueling-report.js

@@ -27,7 +27,7 @@ async function createRefuelingReport (from, to, userData, traccar) {
   const data = []
   for (const a of arrayOfArrays) {
     const allInOne = await traccarHelper.getAllInOne(traccar, from, to, a, true, false, false, false)
-    data.push(allInOne.route)
+    data.push(...allInOne.route)
   }
 
   const fuelServicesData = []
@@ -51,14 +51,16 @@ async function createRefuelingReport (from, to, userData, traccar) {
       const refuelingPositions = await this.calculateRefuelingPositions(userData, d, { route: positions, fuelServices: deviceFuelServices })
 
       if (userData.drivers.length > 0) {
-        refuelingPositions.forEach(p => {
-          const geofence = findNearestPOI(p.position, userData.geofences)
-          if (geofence) {
-            p.position.geofenceName = geofence.name
-          }
-          const driver = userData.drivers.find(d => d.uniqueId === p.position.attributes.driverUniqueId)
-          if (driver) {
-            p.position.driverName = driver.name
+        refuelingPositions.forEach(r => {
+          if (r.position) {
+            const geofence = findNearestPOI(r.position, userData.geofences)
+            if (geofence) {
+              r.position.geofenceName = geofence.name
+            }
+            const driver = userData.drivers.find(d => d.uniqueId === r.position.attributes.driverUniqueId)
+            if (driver) {
+              r.position.driverName = driver.name
+            }
           }
         })
       }