fleetmap-reports 1.0.553 → 1.0.555

package/package.json

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

package/src/fuelconsumption-report.js

@@ -27,7 +27,7 @@ async function createFuelConsumptionReport (from, to, userData, traccar) {
   const routeData = allInOne.route
 
   const fuelServicesData = []
-  if (userData.withOdooServices) {
+  if (devices.some(d => d.attributes.odooId)) {
     fuelServicesData.push(...(await odoo.getOdooFuelServices(traccar, from, to)))
   }
 
@@ -55,7 +55,7 @@ async function createFuelConsumptionReport (from, to, userData, traccar) {
         new Map()
       )
 
-      const odooAvgConsumption = userData.withOdooServices ? getOdooAvgConsumption(refuelingPositions, trips) : 0
+      const odooAvgConsumption = useOdooFuelData(d, route) ? getOdooAvgConsumption(refuelingPositions, trips) : 0
 
       const days = []
       const keys = Array.from(groupedTripsByDay.keys())
@@ -70,7 +70,7 @@ async function createFuelConsumptionReport (from, to, userData, traccar) {
           date: day,
           distance,
           spentFuel,
-          avgConsumption: userData.withOdooServices ? odooAvgConsumption : getCanAvgConsumption(distance, spentFuel),
+          avgConsumption: useOdooFuelData(d, route) ? odooAvgConsumption : getCanAvgConsumption(distance, spentFuel),
           endOdometer: dayTrips.slice(-1)[0].endOdometer,
           duration: dayTrips.reduce((a, b) => a + b.duration, 0),
           refueling: (dayRefueling && dayRefueling.length > 0) ? dayRefueling.reduce((a, b) => a + b.diff, 0) : 0
@@ -113,7 +113,7 @@ function calculateConsumption (userData, d, day, avgConsumption, data) {
   if (d.attributes.xpert) {
     return automaticReports.calculateXpertSpentFuel(day, data.route)
   }
-  if (userData.withOdooServices) {
+  if (useOdooFuelData(d, data.route)) {
     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)
@@ -226,6 +226,10 @@ function deviceName (device) {
   return device.name + (device.attributes.license_plate ? ', ' + device.attributes.license_plate : '') + (device.model ? ', ' + device.model : '')
 }
 
+function useOdooFuelData (d, route) {
+  return route.length && !route[0].attributes.fuel && d.attributes.odooId
+}
+
 exports.createFuelConsumptionReport = createFuelConsumptionReport
 exports.exportFuelConsumptionReportToPDF = exportFuelConsumptionReportToPDF
 exports.exportFuelConsumptionReportToExcel = exportFuelConsumptionReportToExcel

package/src/index.test.js

@@ -120,22 +120,6 @@ describe('Test_Reports', function () {
     assert.equal(device.trips[1].endPOIName, undefined)
   }, 20000)
   // eslint-disable-next-line no-undef
-  it('Trip 2 by device', async () => {
-    const report = await getReports()
-    const userData = await report.getUserData()
-    userData.devices = userData.devices.filter(d => d.id === 11437)
-
-    const data = await report.tripReport(
-      new Date(Date.UTC(2022, 2, 4, 0, 0, 0, 0)),
-      new Date(Date.UTC(2022, 2, 4, 23, 59, 59, 0)),
-      userData)
-
-    assert.equal(data.length, 1)
-    const device = data[0].devices.find(d => d.device.id === 11437)
-    assert.equal(device.trips.length, 5) // Total Trips
-    assert.equal(device.totalDistance, 207353.2299999997) // Total Kms
-  }, 20000)
-  // eslint-disable-next-line no-undef
   it('Trip by device with time period ', async () => {
     const report = await getReports()
     const userData = await report.getUserData()
@@ -297,19 +281,6 @@ describe('Test_Reports', function () {
     assert.equal(device.summary[0].endTime, '2022-01-31T17:36:27.000+0000')
   }, 80000)
   // eslint-disable-next-line no-undef
-  it('Activity 2 by device', async () => {
-    const report = await getReports()
-    const userData = await report.getUserData()
-    userData.devices = userData.devices.filter(d => d.id === 11437)
-    const data = await report.activityReport(new Date(Date.UTC(2022, 2, 5, 0, 0, 0, 0)),
-      new Date(Date.UTC(2022, 2, 5, 23, 59, 59, 0)),
-      userData)
-    assert.equal(data.length, 1)
-    const device = data[0].devices.find(d => d.device.id === 11437)
-    assert.equal(device.summary[0].endTime, '2022-03-05T23:59:55.000+0000')
-    assert.equal(device.summary[0].distance, 232925.12000000034)
-  }, 40000)
-  // eslint-disable-next-line no-undef
   it('Activity byDevice groupByDay', async () => {
     const report = await getReports()
     const userData = await report.getUserData()
@@ -406,7 +377,6 @@ describe('Test_Reports', function () {
   it('FuelConsumption Odoo Report', async () => {
     const report = await getReports()
     const userData = await report.getUserData()
-    userData.withOdooServices = true
     userData.devices = userData.devices.filter(d => d.id === 22326)
     const data = await report.fuelConsumptionReport(
       new Date(Date.UTC(2022, 9, 1, 0, 0, 0, 0)),

package/src/util/utils.js

@@ -7,7 +7,7 @@ const distance = require('@turf/distance')
 exports.getTranslations = (userData) => {
   const lang = this.getLanguage(userData)
   if (!messages[lang]) {
-    console.warn('no lang found for', userData.user, userData.user.attributes.lang, navigator && navigator.language)
+    console.warn('no lang found for', userData.user, userData.user.attributes.lang)
   }
   return messages[lang] ? messages[lang] : messages['en-GB']
 }