fleetmap-reports 1.0.576 → 1.0.578

package/package.json

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

package/src/fuel.test.js

@@ -0,0 +1,23 @@
+/* eslint-disable no-undef */
+const { getReports } = require('./tests')
+const assert = require('assert')
+
+const deviceId = 122575
+// eslint-disable-next-line no-undef
+describe('Test_Reports', function () {
+  it('Trip by device', async () => {
+    console.log('trip by device')
+    this.timeout(2000000)
+    const report = await getReports()
+    const userData = await report.getUserData()
+
+    const data = await report.tripReport(new Date(2023, 0, 26, 0, 0, 0, 0),
+      new Date(2023, 0, 26, 23, 59, 59, 0),
+      userData)
+
+    assert.equal(data.length, 1)
+    const device = data[0].devices.find(d => d.device.id === deviceId)
+    assert.equal(device.trips.length, 9) // Total Trips
+    console.log(device.trips)
+  }, 30000)
+})

package/src/index.test.js

@@ -360,18 +360,27 @@ describe('Test_Reports', function () {
   }, 30000)
   // eslint-disable-next-line no-undef
   it('FuelConsumption Report', async () => {
+    const device1 = 22326
+    const device2 = 122575
     const report = await getReports()
     const userData = await report.getUserData()
-    userData.devices = userData.devices.filter(d => d.id === 22326)
-    const data = await report.fuelConsumptionReport(new Date(2022, 0, 1, 0, 0, 0, 0),
+    const devices = userData.devices
+    userData.devices = devices.filter(d => d.id === device1)
+    let data = await report.fuelConsumptionReport(new Date(2022, 0, 1, 0, 0, 0, 0),
       new Date(2022, 0, 10, 23, 59, 59, 0),
       userData)
 
     assert.equal(data.length, 1)
-    const device = data[0].devices.find(d => d.device.id === 22326)
+    let device = data[0].devices.find(d => d.device.id === device1)
     console.log(device.days)
     assert.equal(device.days.length, 8)
     assert.equal(device.days[0].spentFuel, 2)
+    userData.devices = devices.filter(d => d.id === device2)
+    data = await report.fuelConsumptionReport(new Date(2023, 0, 26, 0, 0, 0, 0),
+      new Date(2023, 0, 26, 23, 59, 59, 0),
+      userData)
+    device = data[0].devices.find(d => d.device.id === device2)
+    console.log(device.days)
   }, 30000)
   // eslint-disable-next-line no-undef
   it('FuelConsumption Odoo Report', async () => {

package/src/location-report.js

@@ -306,7 +306,7 @@ function getTempValue (row) {
 }
 
 function getDigitalPort1Label (row, translations, dAttributes) {
-  return dAttributes.sensor1 || translations.report.digital_ports1
+  return (dAttributes && dAttributes.sensor1) || translations.report.digital_ports1
 }
 
 function getDigitalPort2Label (row, translations) {

package/src/trip-report.js

@@ -163,7 +163,10 @@ function processDevices (from, to, devices, data, userData, traccar) {
     addNearestPOIs(trips, userData)
 
     trips.forEach(trip => {
-      if (automaticReports.deviceWithFuelInfo(d)) {
+      if (deviceRoute[0].protocol === 'teltonika') {
+        trip.fuelConsumption = trip.spentFuel
+        trip.avgFuelConsumption = trip.totalKms > 0 ? Math.round(trip.fuelConsumption * 100 / trip.totalKms) : 0
+      } else if (automaticReports.deviceWithFuelInfo(d)) {
         trip.fuelConsumption = Math.round((trip.spentFuel * d.attributes.fuel_tank_capacity) / 100)
         trip.avgFuelConsumption = trip.totalKms > 0 ? Math.round(trip.fuelConsumption * 100 / trip.totalKms) : 0
       } else {