fleetmap-reports 1.0.554 → 1.0.556

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fleetmap-reports",
-  "version": "1.0.554",
+  "version": "1.0.556",
   "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

@@ -377,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/location-report.js

@@ -205,8 +205,17 @@ async function exportLocationReportToPDF (userData, reportData) {
 
   if (positionsData) {
     if (userData.includeDigitalPorts) {
-      headers.push(getDigitalPort1Label(userData.byDriver ? positionsData[0].driver : positionsData[0].device, translations))
-      headers.push(getDigitalPort2Label(userData.byDriver ? positionsData[0].driver : positionsData[0].device, translations))
+      headers.push(
+        getDigitalPort1Label(
+          userData.byDriver ? positionsData[0].driver : positionsData[0].device,
+          translations,
+          positionsData[0].device.attributes
+        ))
+      headers.push(
+        getDigitalPort2Label(
+          userData.byDriver ? positionsData[0].driver : positionsData[0].device,
+          translations,
+          positionsData[0].device.attributes))
     }
     headers.push('Latitude')
     headers.push('Longitude')
@@ -247,8 +256,8 @@ async function exportLocationReportToPDF (userData, reportData) {
         }
 
         if (userData.includeDigitalPorts) {
-          temp.push(getDigitalPortValue(a, 1, translations))
-          temp.push(getDigitalPortValue(a, 2, translations))
+          temp.push(getDigitalPortValue(a, 1, translations, d.attributes))
+          temp.push(getDigitalPortValue(a, 2, translations, d.attributes))
         }
         temp.push(a.latitude)
         temp.push(a.longitude)
@@ -296,18 +305,24 @@ function getTempValue (row) {
   )) || ''
 }
 
-function getDigitalPort1Label (row, translations) {
-  return row.attributes.door1 || translations.report.digital_ports1
+function getDigitalPort1Label (row, translations, dAttributes) {
+  return dAttributes.sensor1 || translations.report.digital_ports1
 }
 
 function getDigitalPort2Label (row, translations) {
   return row.attributes.door2 || translations.report.digital_ports2
 }
 
-function getDigitalPortValue (row, index, translations) {
+function getDigitalPortValue (row, index, translations, dAttributes) {
   switch (index) {
     case 1:
-      return row.attributes && row.attributes.door1 ? translations.report[row.attributes.door1] : ''
+      if (row.attributes && row.attributes.door1 !== undefined) {
+        return translations.report[row.attributes.door1]
+      }
+      if (row.attributes && row.attributes.sensor !== undefined) {
+        return dAttributes.sensor1On || row.attributes.sensor
+      }
+      break
     case 2:
       if (row.attributes && row.attributes.door2) {
         return translations.report[row.attributes.door2]

package/src/zone-report.js

@@ -80,27 +80,18 @@ async function createZoneReport (from, to, userData, traccar) {
   return reportData
 }
 
-async function getAllInOne (
+async function getRoute (
   traccar,
   from,
   to,
   devices,
-  getRoutes,
-  getTrips,
-  getStops,
-  getSummary,
   currentDeviceCount = 0,
   totalDevices = devices.length,
   sliceSize = 5,
   devicesPerRequest = 1,
   counter = undefined,
   userData) {
-  let url = `/reports/allinone?from=${from.toISOString()}&to=${to.toISOString()}`
-  if (getRoutes) url += '&type=route'
-  if (getTrips) url += '&type=trips'
-  if (getStops) url += '&type=stops'
-  if (getSummary) url += '&type=summary'
-
+  const url = `/reports/allinone?from=${from.toISOString()}&to=${to.toISOString()}&type=route`
   const sliced = automaticReports.sliceArray(devices, sliceSize)
   const result = []
   console.log('getAll, slicing', sliceSize)