fleetmap-reports 1.0.767 → 1.0.769

package/package.json

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

package/src/automaticReports.js

@@ -25,20 +25,6 @@ function fuelSignalInverter (device) {
   return device.attributes.fuel_low_threshold <= device.attributes.fuel_high_threshold ? 1 : -1
 }
 
-function calculateXpertSpentFuel (date, positions) {
-  const begin = moment(date, 'YYYY-MM-DD').startOf('day')
-  const end = moment(date, 'YYYY-MM-DD').endOf('day')
-  const datePositions = positions.filter(p => moment(p.fixTime).isAfter(begin) && moment(p.fixTime).isBefore(end))
-  const xpertMessages = datePositions.map(p => p.attributes.xpert).flat().filter(p => p)
-  const xpertEndTripMessage = xpertMessages.filter(x => x.type === '3')
-  if (xpertEndTripMessage.length > 1) {
-    const diff = xpertEndTripMessage[xpertEndTripMessage.length - 1].total_fuel - xpertEndTripMessage[0].total_fuel
-    console.log('Diff:', diff)
-    return Math.round(diff)
-  }
-  return 0
-}
-
 function calculateXpertDistance (date, positions) {
   const begin = moment(date, 'YYYY-MM-DD').startOf('day')
   const end = moment(date, 'YYYY-MM-DD').endOf('day')
@@ -48,11 +34,9 @@ function calculateXpertDistance (date, positions) {
 }
 
 function calculateSpentFuel (value, device) {
-  if (!value) { return value }
+  if (!value || device.attributes.xpert) { return value }
 
-  if (device.attributes.xpert) {
-    return Math.round((value * device.attributes.fuel_tank_capacity) / 100)
-  } else if (device.attributes.fuel_low_threshold && device.attributes.fuel_high_threshold) {
+  if (device.attributes.fuel_low_threshold && device.attributes.fuel_high_threshold) {
     const valueSignalCheck = value * fuelSignalInverter(device)
     const valuePercentage = (valueSignalCheck * 100) / Math.abs(device.attributes.fuel_low_threshold - device.attributes.fuel_high_threshold)
     return Math.round((valuePercentage * device.attributes.fuel_tank_capacity) / 100)
@@ -63,6 +47,5 @@ function calculateSpentFuel (value, device) {
 exports.sliceArray = sliceArray
 exports.deviceWithFuelInfo = deviceWithFuelInfo
 exports.calculateSpentFuel = calculateSpentFuel
-exports.calculateXpertSpentFuel = calculateXpertSpentFuel
 exports.calculateXpertDistance = calculateXpertDistance
 exports.maxParallelRequests = maxParallelRequests

package/src/fuelconsumption-report.js

@@ -121,9 +121,6 @@ function calculateAvgConsumption (fuel, distance) {
 }
 
 function calculateConsumption (userData, d, day, avgConsumption, data) {
-  if (d.attributes.xpert) {
-    return automaticReports.calculateXpertSpentFuel(day, data.route)
-  }
   if (useOdooFuelData(d, data.route)) {
     return (avgConsumption.byKms * (data.trips.reduce((a, b) => a + b.distance, 0) / 1000) / 100)
   }

package/src/partnerReports/performance-report.js

@@ -15,24 +15,28 @@ async function createPerformanceReport (from, to, userData, traccar) {
       const allInOne = await traccarHelper.getAllInOne(traccar, from, to, slice, true, true, false, false, deviceCount, devices.length)
 
       slice.forEach(d => {
-        const { endTripData, canDriverStyle } = getDeviceXpertData(allInOne, d)
+        const {
+          drivingTime, idleTime, cruiseControlTime, economicTime, highEngineRPM, hardBreaking, hardAcceleration,
+          drivingConsumption, idleConsumption, cruiseControlConsumption, economicConsumption, drivingDistance, cruiseControlDistance,
+          economicDistance
+        } = getDeviceData(allInOne, d)
 
         const deviceData = {
           device: d.name,
-          drivingTime: endTripData.length > 1 ? endTripData[endTripData.length - 1].totalTimeDriving - endTripData[0].totalTimeDriving : 0,
-          idleTime: endTripData.length > 1 ? endTripData[endTripData.length - 1].totalTimeInIdle - endTripData[0].totalTimeInIdle : 0,
-          drivingConsumption: endTripData.length > 1 ? endTripData[endTripData.length - 1].totalFuelConsumptionDriving - endTripData[0].totalFuelConsumptionDriving : 0,
-          idleConsumption: endTripData.length > 1 ? endTripData[endTripData.length - 1].totalFuelConsumptionInIdle - endTripData[0].totalFuelConsumptionInIdle : 0,
-          drivingDistance: endTripData.length > 1 ? endTripData[endTripData.length - 1].totalDistanceTravelled - endTripData[0].totalDistanceTravelled : 0,
-          cruiseControlTime: endTripData.length > 1 ? endTripData[endTripData.length - 1].totalTimeWithCruiseControl - endTripData[0].totalTimeWithCruiseControl : 0,
-          cruiseControlConsumption: endTripData.length > 1 ? endTripData[endTripData.length - 1].totalFuelConsumptionWithCruiseControl - endTripData[0].totalFuelConsumptionWithCruiseControl : 0,
-          cruiseControlDistance: endTripData.length > 1 ? endTripData[endTripData.length - 1].totalDistanceTravelledWithCruiseControl - endTripData[0].totalDistanceTravelledWithCruiseControl : 0,
-          economicTime: canDriverStyle.length > 1 ? canDriverStyle[canDriverStyle.length - 1].totalTimeInEcoRange - canDriverStyle[0].totalTimeInEcoRange : 0,
-          economicConsumption: canDriverStyle.length > 1 ? canDriverStyle[canDriverStyle.length - 1].totalFuelConsumptionInEcoRange - canDriverStyle[0].totalFuelConsumptionInEcoRange : 0,
-          economicDistance: canDriverStyle.length > 1 ? canDriverStyle[canDriverStyle.length - 1].totalDistanceInEcoRange - canDriverStyle[0].totalDistanceInEcoRange : 0,
-          highEngineRPM: canDriverStyle.length > 1 ? canDriverStyle[canDriverStyle.length - 1].totalTimeWithHighRpmAndTorque - canDriverStyle[0].totalTimeWithHighRpmAndTorque : 0,
-          hardBreaking: canDriverStyle.length > 1 ? canDriverStyle[canDriverStyle.length - 1].totalNumberOfHarshBrakes - canDriverStyle[0].totalNumberOfHarshBrakes : 0,
-          hardAcceleration: canDriverStyle.length > 1 ? canDriverStyle[canDriverStyle.length - 1].totalNumberOfHarshAccelerations - canDriverStyle[0].totalNumberOfHarshAccelerations : 0
+          drivingTime,
+          idleTime,
+          drivingConsumption,
+          idleConsumption,
+          drivingDistance,
+          cruiseControlTime,
+          cruiseControlConsumption,
+          cruiseControlDistance,
+          economicTime,
+          economicConsumption,
+          economicDistance,
+          highEngineRPM,
+          hardBreaking,
+          hardAcceleration
         }
         reportData.push(deviceData)
       })
@@ -43,39 +47,43 @@ async function createPerformanceReport (from, to, userData, traccar) {
     const allInOne = await traccarHelper.getAllInOne(traccar, from, to, userData.devices, true, true, false, false)
 
     const device = userData.devices[0]
-    const { endTripData, canDriverStyle } = getDeviceXpertData(allInOne, device)
 
-    const drivingTime = endTripData.length > 1 ? endTripData[endTripData.length - 1].totalTimeDriving - endTripData[0].totalTimeDriving : 0
-    const idleTime = endTripData.length > 1 ? endTripData[endTripData.length - 1].totalTimeInIdle - endTripData[0].totalTimeInIdle : 0
-    const cruiseControlTime = endTripData.length > 1 ? endTripData[endTripData.length - 1].totalTimeWithCruiseControl - endTripData[0].totalTimeWithCruiseControl : 0
-    const economicTime = canDriverStyle.length > 1 ? canDriverStyle[canDriverStyle.length - 1].totalTimeInEcoRange - canDriverStyle[0].totalTimeInEcoRange : 0
-    const highEngineRPM = canDriverStyle.length > 1 ? canDriverStyle[canDriverStyle.length - 1].totalTimeWithHighRpmAndTorque - canDriverStyle[0].totalTimeWithHighRpmAndTorque : 0
-    const hardBreaking = canDriverStyle.length > 1 ? canDriverStyle[canDriverStyle.length - 1].totalNumberOfHarshBrakes - canDriverStyle[0].totalNumberOfHarshBrakes : 0
-    const hardAcceleration = canDriverStyle.length > 1 ? canDriverStyle[canDriverStyle.length - 1].totalNumberOfHarshAccelerations - canDriverStyle[0].totalNumberOfHarshAccelerations : 0
-
-    const drivingConsumption = endTripData.length > 1 ? endTripData[endTripData.length - 1].totalFuelConsumptionDriving - endTripData[0].totalFuelConsumptionDriving : 0
-    const idleConsumption = endTripData.length > 1 ? endTripData[endTripData.length - 1].totalFuelConsumptionInIdle - endTripData[0].totalFuelConsumptionInIdle : 0
-    const cruiseControlConsumption = endTripData.length > 1 ? endTripData[endTripData.length - 1].totalFuelConsumptionWithCruiseControl - endTripData[0].totalFuelConsumptionWithCruiseControl : 0
-    const economicConsumption = canDriverStyle.length > 1 ? canDriverStyle[canDriverStyle.length - 1].totalFuelConsumptionInEcoRange - canDriverStyle[0].totalFuelConsumptionInEcoRange : 0
-
-    const drivingDistance = endTripData.length > 1 ? endTripData[endTripData.length - 1].totalDistanceTravelled - endTripData[0].totalDistanceTravelled : 0
-    const cruiseControlDistance = endTripData.length > 1 ? endTripData[endTripData.length - 1].totalDistanceTravelledWithCruiseControl - endTripData[0].totalDistanceTravelledWithCruiseControl : 0
-    const economicDistance = canDriverStyle.length > 1 ? canDriverStyle[canDriverStyle.length - 1].totalDistanceInEcoRange - canDriverStyle[0].totalDistanceInEcoRange : 0
+    const {
+      drivingTime, idleTime, cruiseControlTime, economicTime, highEngineRPM, hardBreaking, hardAcceleration,
+      drivingConsumption, idleConsumption, cruiseControlConsumption, economicConsumption, drivingDistance, cruiseControlDistance,
+      economicDistance
+    } = getDeviceData(allInOne, device)
 
     const totalTime = drivingTime + idleTime
     const totalConsumption = drivingConsumption + idleConsumption
 
-    const totalData = getRowData(1, device, 'Totale', totalTime, totalConsumption, drivingDistance, (drivingDistance > 0 ? (totalConsumption * 0.1) * 100 / drivingDistance : 0).toFixed(1) + ' L/100')
-    const drivingData = getRowData(2, device, 'Conduite', drivingTime, drivingConsumption, drivingDistance, (drivingDistance > 0 ? (drivingConsumption * 0.1) * 100 / drivingDistance : 0).toFixed(1) + ' L/100')
-    const idleData = getRowData(3, device, 'Ralenti', idleTime, idleConsumption, '', (totalConsumption > 0 ? idleConsumption * 100 / totalConsumption : 0) + ' %')
-    const economicData = getRowData(4, device, 'Économique', economicTime, economicConsumption, economicDistance, totalTime > 0 ? economicTime * 100 / totalTime : 0)
-    const cruiseControlData = getRowData(5, device, 'Cruise Control', cruiseControlTime, cruiseControlConsumption, cruiseControlDistance, totalTime > 0 ? cruiseControlTime * 100 / totalTime : 0)
-    const highEngineRPMData = getRowData(6, device, 'Tour moteur élevé', highEngineRPM, '', '', totalTime > 0 ? highEngineRPM * 100 / totalTime : 0)
-    const hardBreakingData = getRowData(7, device, 'Freinage brusque', hardBreaking, '', '', drivingDistance > 0 ? hardBreaking * 100 / drivingDistance : 0)
-    const hardAccelerationData = getRowData(8, device, 'Accéleration brusque', hardAcceleration, '', '', drivingDistance > 0 ? hardAcceleration * 100 / drivingDistance : 0)
-
-    drivingData.used = (totalTime > 0 ? drivingTime * 100 / totalTime : 0).toFixed(0)
-    idleData.used = (totalTime > 0 ? idleTime * 100 / totalTime : 0).toFixed(0)
+    const totalIndicator = (drivingDistance > 0 ? (totalConsumption * 0.1) * 100 / drivingDistance : 0).toFixed(1) + ' L/100'
+    const drivingIndicator = (drivingDistance > 0 ? (drivingConsumption * 0.1) * 100 / drivingDistance : 0).toFixed(1) + ' L/100'
+    const idleIndicator = (totalConsumption > 0 ? idleConsumption * 100 / totalConsumption : 0).toFixed(1) + ' %'
+    const economicIndicator = (totalTime > 0 ? economicTime * 100 / totalTime : 0).toFixed(1) + ' %'
+    const cruiseControlIndicator = (totalTime > 0 ? cruiseControlTime * 100 / totalTime : 0).toFixed(1) + ' %'
+    const highEngineRPMIndicator = (totalTime > 0 ? highEngineRPM * 100 / totalTime : 0).toFixed(1) + ' %'
+    const hardBreakingIndicator = (drivingDistance > 0 ? hardBreaking * 100 / drivingDistance : 0).toFixed(0) + ' Freinage/100 Km'
+    const hardAccelerationIndicator = (drivingDistance > 0 ? hardAcceleration * 100 / drivingDistance : 0).toFixed(0) + ' Accélération/100 Km'
+
+    const drivingUse = Math.round(totalTime > 0 ? drivingTime * 100 / totalTime : 0)
+    const idleUse = Math.round(totalTime > 0 ? idleTime * 100 / totalTime : 0)
+
+    const engineEconomicRPM = Math.round(totalTime > 0 ? economicTime * 100 / totalTime : 0)
+    const engineHighRPM = Math.round(totalTime > 0 ? highEngineRPM * 100 / totalTime : 0)
+    const engineOtherRPM = 100 - (engineEconomicRPM + engineHighRPM)
+
+    const cruiseControlOn = Math.round(totalTime > 0 ? cruiseControlTime * 100 / totalTime : 0)
+    const cruiseControlOff = 100 - cruiseControlOn
+
+    const totalData = getRowData(1, device, 'Totale', totalTime, totalConsumption, drivingDistance, totalIndicator, 0, 0, 0)
+    const drivingData = getRowData(2, device, 'Conduite', drivingTime, drivingConsumption, drivingDistance, drivingIndicator, drivingUse, engineOtherRPM, cruiseControlOff)
+    const idleData = getRowData(3, device, 'Ralenti', idleTime, idleConsumption, '', idleIndicator, idleUse, 0, 0)
+    const economicData = getRowData(4, device, 'Économique', economicTime, economicConsumption, economicDistance, economicIndicator, 0, engineEconomicRPM, 0)
+    const cruiseControlData = getRowData(5, device, 'Cruise Control', cruiseControlTime, cruiseControlConsumption, cruiseControlDistance, cruiseControlIndicator, 0, 0, cruiseControlOn)
+    const highEngineRPMData = getRowData(6, device, 'Tour moteur élevé', highEngineRPM, '', '', highEngineRPMIndicator, 0, engineHighRPM, 0)
+    const hardBreakingData = getRowData(7, device, 'Freinage brusque', hardBreaking, '', '', hardBreakingIndicator, 0, 0, 0)
+    const hardAccelerationData = getRowData(8, device, 'Accéleration brusque', hardAcceleration, '', '', hardAccelerationIndicator, 0, 0, 0)
 
     reportData.push(totalData)
     reportData.push(drivingData)
@@ -89,7 +97,7 @@ async function createPerformanceReport (from, to, userData, traccar) {
   return reportData
 }
 
-function getDeviceXpertData (allInOne, d) {
+function getDeviceData (allInOne, d) {
   const deviceRoute = allInOne.route.filter(t => t.deviceId === d.id)
   const deviceTrips = allInOne.trips.filter(t => t.deviceId === d.id)
 
@@ -98,12 +106,65 @@ function getDeviceXpertData (allInOne, d) {
     deviceTrips.push(uncompletedTrip)
   }
 
-  const endTripData = getEndTripMessages(deviceRoute).map(m => parseEndTripMessage(m.xpertString || m)).sort((a, b) => a.date.localeCompare(b.date))
-  const canDriverStyle = getCanDriverStyleMessages(deviceRoute).map(m => parseCanDriverStyleMessage(m.xpertString || m)).sort((a, b) => a.date.localeCompare(b.date))
-  return { endTripData, canDriverStyle }
+  if (deviceRoute.find(p => p.attributes.xpert)) {
+    // Inofleet unit with xpert data
+    const endTripData = getEndTripMessages(deviceRoute).map(m => parseEndTripMessage(m.xpertString || m)).sort((a, b) => a.date.localeCompare(b.date))
+    const canDriverStyle = getCanDriverStyleMessages(deviceRoute).map(m => parseCanDriverStyleMessage(m.xpertString || m)).sort((a, b) => a.date.localeCompare(b.date))
+
+    const drivingTime = endTripData.length > 1 ? endTripData[endTripData.length - 1].totalTimeDriving - endTripData[0].totalTimeDriving : 0
+    const idleTime = endTripData.length > 1 ? endTripData[endTripData.length - 1].totalTimeInIdle - endTripData[0].totalTimeInIdle : 0
+    const cruiseControlTime = endTripData.length > 1 ? endTripData[endTripData.length - 1].totalTimeWithCruiseControl - endTripData[0].totalTimeWithCruiseControl : 0
+    const economicTime = canDriverStyle.length > 1 ? canDriverStyle[canDriverStyle.length - 1].totalTimeInEcoRange - canDriverStyle[0].totalTimeInEcoRange : 0
+    const highEngineRPM = canDriverStyle.length > 1 ? canDriverStyle[canDriverStyle.length - 1].totalTimeWithHighRpmAndTorque - canDriverStyle[0].totalTimeWithHighRpmAndTorque : 0
+    const hardBreaking = canDriverStyle.length > 1 ? canDriverStyle[canDriverStyle.length - 1].totalNumberOfHarshBrakes - canDriverStyle[0].totalNumberOfHarshBrakes : 0
+    const hardAcceleration = canDriverStyle.length > 1 ? canDriverStyle[canDriverStyle.length - 1].totalNumberOfHarshAccelerations - canDriverStyle[0].totalNumberOfHarshAccelerations : 0
+
+    const drivingConsumption = endTripData.length > 1 ? endTripData[endTripData.length - 1].totalFuelConsumptionDriving - endTripData[0].totalFuelConsumptionDriving : 0
+    const idleConsumption = endTripData.length > 1 ? endTripData[endTripData.length - 1].totalFuelConsumptionInIdle - endTripData[0].totalFuelConsumptionInIdle : 0
+    const cruiseControlConsumption = endTripData.length > 1 ? endTripData[endTripData.length - 1].totalFuelConsumptionWithCruiseControl - endTripData[0].totalFuelConsumptionWithCruiseControl : 0
+    const economicConsumption = canDriverStyle.length > 1 ? canDriverStyle[canDriverStyle.length - 1].totalFuelConsumptionInEcoRange - canDriverStyle[0].totalFuelConsumptionInEcoRange : 0
+
+    const drivingDistance = endTripData.length > 1 ? endTripData[endTripData.length - 1].totalDistanceTravelled - endTripData[0].totalDistanceTravelled : 0
+    const cruiseControlDistance = endTripData.length > 1 ? endTripData[endTripData.length - 1].totalDistanceTravelledWithCruiseControl - endTripData[0].totalDistanceTravelledWithCruiseControl : 0
+    const economicDistance = canDriverStyle.length > 1 ? canDriverStyle[canDriverStyle.length - 1].totalDistanceInEcoRange - canDriverStyle[0].totalDistanceInEcoRange : 0
+
+    return {
+      drivingTime,
+      idleTime,
+      cruiseControlTime,
+      economicTime,
+      highEngineRPM,
+      hardBreaking,
+      hardAcceleration,
+      drivingConsumption,
+      idleConsumption,
+      cruiseControlConsumption,
+      economicConsumption,
+      drivingDistance,
+      cruiseControlDistance,
+      economicDistance
+    }
+  } else {
+    return {
+      drivingTime: 0,
+      idleTime: 0,
+      cruiseControlTime: 0,
+      economicTime: 0,
+      highEngineRPM: 0,
+      hardBreaking: 0,
+      hardAcceleration: 0,
+      drivingConsumption: 0,
+      idleConsumption: 0,
+      cruiseControlConsumption: 0,
+      economicConsumption: 0,
+      drivingDistance: 0,
+      cruiseControlDistance: 0,
+      economicDistance: 0
+    }
+  }
 }
 
-function getRowData (index, device, description, time, consumption, distance, indicator) {
+function getRowData (index, device, description, time, consumption, distance, indicator, use, rpm, cruiseControl) {
   return {
     index,
     device: device.name,
@@ -111,7 +172,10 @@ function getRowData (index, device, description, time, consumption, distance, in
     time,
     consumption,
     distance,
-    indicator
+    indicator,
+    use,
+    rpm,
+    cruiseControl
   }
 }
 

package/src/tests/activity.test.js

@@ -45,4 +45,17 @@ describe('activity report', function () {
     assert.equal(device.summary[5].startTime, 0)
     assert.equal(device.summary[5].endTime, 0)
   }, 90000)
+  // eslint-disable-next-line no-undef
+  it('Activity check fuel consumption', async () => {
+    const report = await getReports()
+    const userData = await report.getUserData()
+    userData.devices = userData.devices.filter(d => d.id === 69114)
+    const data = await report.activityReport(new Date(2023, 5, 11, 0, 0, 0, 0),
+      new Date(2023, 6, 11, 23, 59, 59, 0),
+      userData)
+    assert.equal(data.length, 1)
+    const device = data[0].devices.find(d => d.device.id === 69114)
+    console.log(device)
+    assert.equal(device.summary[0].convertedSpentFuel, 168.6)
+  }, 800000)
 })

package/src/tests/index.test.js

@@ -23,114 +23,6 @@ describe('Test_Reports', function () {
     console.log(utils.convertToLocaleString(new Date(), 'es-CL', 'Europe/Madrid'))
   })
 
-  // eslint-disable-next-line no-undef
-  it('Trip by device', async () => {
-    const report = await getReports()
-    const userData = await report.getUserData()
-
-    const data = await report.tripReport(new Date(2022, 0, 3, 0, 0, 0, 0),
-      new Date(2022, 0, 4, 23, 59, 59, 0),
-      userData)
-
-    assert.equal(data.length, 1)
-    const device = data[0].devices.find(d => d.device.id === 22326)
-    assert.equal(device.trips.length, 7) // Total Trips
-    assert.equal(device.trips[0].endPOIName, 'Casa João')
-    assert.equal(device.trips[0].idleTime, 602000)
-    assert.equal(device.trips[1].endPOIName, undefined)
-    assert.equal(device.totalDistance, 339170.3099999875) // Total Kms
-  }, 30000)
-  // eslint-disable-next-line no-undef
-  it('Trip by driver', async () => {
-    const report = await getReports()
-    const userData = await report.getUserData()
-    userData.byDriver = true
-    const data = await report.tripReport(new Date(2022, 1, 1, 0, 0, 0, 0),
-      new Date(2022, 1, 10, 23, 59, 59, 0),
-      userData)
-    assert.equal(data.length, 1)
-    console.log(data[0].drivers)
-    const driver = data[0].drivers.find(d => d.driver.id === 14020)
-    assert.equal(driver.trips.length, 13) // Total Trips
-    assert.equal(driver.totalDuration, 8159000)
-    assert.equal(driver.maxSpeed, 78.8337)
-  }, 90000)
-  // eslint-disable-next-line no-undef
-  it('Trip without addresses', async () => {
-    const report = await getReports()
-    const userData = await report.getUserData()
-
-    const data = await report.tripReport(new Date(2022, 4, 27, 0, 0, 0, 0),
-      new Date(2022, 4, 27, 23, 59, 59, 0),
-      userData)
-
-    assert.equal(data.length, 1)
-    const device = data[0].devices.find(d => d.device.id === 25808)
-    assert.equal(device.trips.length, 12) // Total Trips
-    console.log(device.trips[0])
-    // assert.equal(device.trips[0].endAddress, 'RS-409, 184-314 - Centro, Vera Cruz - RS, 96880-000, Brazil')
-    assert.equal(device.trips[1].endPOIName, undefined)
-  }, 20000)
-  // eslint-disable-next-line no-undef
-  it('Trip by device with time period ', async () => {
-    const report = await getReports()
-    const userData = await report.getUserData()
-
-    userData.allWeek = false
-    userData.weekDays = {
-      sunday: true,
-      monday: true,
-      tuesday: true,
-      wednesday: true,
-      thursday: true,
-      friday: true,
-      saturday: true
-    }
-    userData.dayHours = {
-      startTime: '15:00',
-      endTime: '19:00'
-    }
-
-    const data = await report.tripReport(
-      new Date(Date.UTC(2022, 0, 3, 0, 0, 0, 0)),
-      new Date(Date.UTC(2022, 0, 4, 23, 59, 59, 0)),
-      userData)
-
-    assert.equal(data.length, 1)
-    // const device = data[0].devices.find(d => d.device.id === 22326)
-    // assert.equal(device.trips.length, 1) // Total Trips
-    // assert.equal(device.totalDistance, 172190.92999999225) // Total Kms
-  }, 20000)
-  // eslint-disable-next-line no-undef
-  it('Trip by device with time period 2', async () => {
-    const report = await getReports()
-    const userData = await report.getUserData()
-
-    userData.allWeek = false
-    userData.weekDays = {
-      sunday: true,
-      monday: true,
-      tuesday: true,
-      wednesday: true,
-      thursday: true,
-      friday: true,
-      saturday: true
-    }
-    userData.dayHours = {
-      startTime: '18:00',
-      endTime: '09:00'
-    }
-
-    const data = await report.tripReport(
-      new Date(Date.UTC(2022, 0, 10, 0, 0, 0, 0)),
-      new Date(Date.UTC(2022, 0, 14, 23, 59, 59, 0)),
-      userData)
-
-    assert.equal(data.length, 1)
-    /* const device = data[0].devices.find(d => d.device.id === 22326)
-    assert.equal(device.trips.length, 22) // Total Trips
-    assert.equal(device.totalDistance, 214334.7800000161) // Total Kms */
-  }, 20000)
   // eslint-disable-next-line no-undef
   it('Location by device', async () => {
     const report = await getReports()
@@ -293,6 +185,19 @@ describe('Test_Reports', function () {
     assert.equal(device.days.length, 26)
   }, 30000)
   // eslint-disable-next-line no-undef
+  it('FuelConsumption xpert', async () => {
+    const report = await getReports()
+    const userData = await report.getUserData()
+    userData.devices = userData.devices.filter(d => d.id === 69114)
+    const data = await report.fuelConsumptionReport(new Date(2023, 5, 11, 0, 0, 0, 0),
+      new Date(2023, 6, 11, 23, 59, 59, 0),
+      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)
+  }, 30000)
+  // eslint-disable-next-line no-undef
   it('Zone Report', async () => {
     const report = await getReports()
     const userData = await report.getUserData()

package/src/tests/performance.test.js

@@ -1,5 +1,6 @@
 const { getReports } = require('./index')
 const { createPerformanceReport } = require('../partnerReports/performance-report')
+const assert = require('assert')
 // eslint-disable-next-line no-undef
 describe('performance', function () {
   // eslint-disable-next-line no-undef
@@ -14,4 +15,18 @@ describe('performance', function () {
       report.traccar)
     console.log(data)
   })
+
+  // eslint-disable-next-line no-undef
+  it('performance report 2', async () => {
+    const report = await getReports()
+    const userData = await report.getUserData()
+    userData.devices = userData.devices.filter(d => d.id === 69114)
+    const data = await createPerformanceReport(
+      new Date(Date.UTC(2023, 5, 11, 0, 0, 0, 0)),
+      new Date(Date.UTC(2023, 6, 11, 23, 59, 59, 0)),
+      userData,
+      report.traccar)
+    console.log(data)
+    assert.equal(data[0].consumption, 1685.1989999999996)
+  }, 8000000)
 })

package/src/tests/trips.test.js

@@ -1,5 +1,8 @@
 const { getReports } = require('./index')
+const assert = require('assert')
+// eslint-disable-next-line no-undef
 describe('trips', function () {
+  // eslint-disable-next-line no-undef
   it('converts to pdf', async () => {
     const report = await getReports()
     const userData = await report.getUserData()
@@ -12,4 +15,126 @@ describe('trips', function () {
       userData)
     // await report.tripReportToPDF(userData, data)
   }, 40000)
+  // eslint-disable-next-line no-undef
+  it('Trip by device', async () => {
+    const report = await getReports()
+    const userData = await report.getUserData()
+
+    const data = await report.tripReport(new Date(2022, 0, 3, 0, 0, 0, 0),
+      new Date(2022, 0, 4, 23, 59, 59, 0),
+      userData)
+
+    assert.equal(data.length, 1)
+    const device = data[0].devices.find(d => d.device.id === 22326)
+    assert.equal(device.trips.length, 7) // Total Trips
+    assert.equal(device.trips[0].endPOIName, 'Casa João')
+    assert.equal(device.trips[0].idleTime, 602000)
+    assert.equal(device.trips[1].endPOIName, undefined)
+    assert.equal(device.totalDistance, 339170.3099999875) // Total Kms
+  }, 30000)
+  // eslint-disable-next-line no-undef
+  it('Trip by driver', async () => {
+    const report = await getReports()
+    const userData = await report.getUserData()
+    userData.byDriver = true
+    const data = await report.tripReport(new Date(2022, 1, 1, 0, 0, 0, 0),
+      new Date(2022, 1, 10, 23, 59, 59, 0),
+      userData)
+    assert.equal(data.length, 1)
+    console.log(data[0].drivers)
+    const driver = data[0].drivers.find(d => d.driver.id === 14020)
+    assert.equal(driver.trips.length, 13) // Total Trips
+    assert.equal(driver.totalDuration, 8159000)
+    assert.equal(driver.maxSpeed, 78.8337)
+  }, 90000)
+  // eslint-disable-next-line no-undef
+  it('Trip without addresses', async () => {
+    const report = await getReports()
+    const userData = await report.getUserData()
+
+    const data = await report.tripReport(new Date(2022, 4, 27, 0, 0, 0, 0),
+      new Date(2022, 4, 27, 23, 59, 59, 0),
+      userData)
+
+    assert.equal(data.length, 1)
+    const device = data[0].devices.find(d => d.device.id === 25808)
+    assert.equal(device.trips.length, 12) // Total Trips
+    console.log(device.trips[0])
+    // assert.equal(device.trips[0].endAddress, 'RS-409, 184-314 - Centro, Vera Cruz - RS, 96880-000, Brazil')
+    assert.equal(device.trips[1].endPOIName, undefined)
+  }, 20000)
+  // eslint-disable-next-line no-undef
+  it('Trip by device with time period ', async () => {
+    const report = await getReports()
+    const userData = await report.getUserData()
+
+    userData.allWeek = false
+    userData.weekDays = {
+      sunday: true,
+      monday: true,
+      tuesday: true,
+      wednesday: true,
+      thursday: true,
+      friday: true,
+      saturday: true
+    }
+    userData.dayHours = {
+      startTime: '15:00',
+      endTime: '19:00'
+    }
+
+    const data = await report.tripReport(
+      new Date(Date.UTC(2022, 0, 3, 0, 0, 0, 0)),
+      new Date(Date.UTC(2022, 0, 4, 23, 59, 59, 0)),
+      userData)
+
+    assert.equal(data.length, 1)
+    // const device = data[0].devices.find(d => d.device.id === 22326)
+    // assert.equal(device.trips.length, 1) // Total Trips
+    // assert.equal(device.totalDistance, 172190.92999999225) // Total Kms
+  }, 20000)
+  // eslint-disable-next-line no-undef
+  it('Trip by device with time period 2', async () => {
+    const report = await getReports()
+    const userData = await report.getUserData()
+
+    userData.allWeek = false
+    userData.weekDays = {
+      sunday: true,
+      monday: true,
+      tuesday: true,
+      wednesday: true,
+      thursday: true,
+      friday: true,
+      saturday: true
+    }
+    userData.dayHours = {
+      startTime: '18:00',
+      endTime: '09:00'
+    }
+
+    const data = await report.tripReport(
+      new Date(Date.UTC(2022, 0, 10, 0, 0, 0, 0)),
+      new Date(Date.UTC(2022, 0, 14, 23, 59, 59, 0)),
+      userData)
+
+    assert.equal(data.length, 1)
+    /* const device = data[0].devices.find(d => d.device.id === 22326)
+    assert.equal(device.trips.length, 22) // Total Trips
+    assert.equal(device.totalDistance, 214334.7800000161) // Total Kms */
+  }, 20000)
+
+  // eslint-disable-next-line no-undef
+  it('Trip fuel consumption', async () => {
+    const report = await getReports()
+    const userData = await report.getUserData()
+    userData.devices = userData.devices.filter(d => d.id === 69114)
+    const data = await report.tripReport(new Date(2023, 5, 11, 0, 0, 0, 0),
+      new Date(2023, 6, 11, 23, 59, 59, 0),
+      userData)
+
+    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
+  }, 30000)
 })