fleetmap-reports 1.0.442 → 1.0.443

package/package.json

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

package/src/index.test.js

@@ -15,10 +15,12 @@ async function getSpeedingReport (report, userData) {
 
 // eslint-disable-next-line no-undef
 describe('Test_Reports', function () {
+  this.timeout(500000)
   // eslint-disable-next-line no-undef
   it('Speeding by device', async () => {
     const report = await getReports()
     const userData = await report.getUserData()
+    userData.roadSpeedLimit = true
     const { device, totalDistance, totalEventTime } = await getSpeedingReport(report, userData)
     assert.equal(device.alerts.length, 15) // Total Alerts
     assert.equal(totalDistance, 19.59984677533689) // Total Kms
@@ -50,7 +52,7 @@ describe('Test_Reports', function () {
     assert.equal(device.trips.length, 7) // Total Trips
     assert.equal(device.trips[0].endPOIName, 'Casa João')
     assert.equal(device.trips[1].endPOIName, undefined)
-    assert.equal(device.totalDistance, 339170.3099999875) // Total Kms
+    assert.equal(device.totalDistance, 339204.53999999166) // Total Kms
   }, 20000)
   // eslint-disable-next-line no-undef
   it('Trip by driver', async () => {
@@ -63,7 +65,7 @@ describe('Test_Reports', function () {
     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.trips.length, 9) // Total Trips
     assert.equal(driver.totalDuration, 6274000)
     assert.equal(driver.maxSpeed, 70.1944)
   }, 20000)

package/src/trip-report.js

@@ -276,7 +276,7 @@ async function exportTripReportToPDF (userData, reportData) {
     tripsData.forEach(function (d, index) {
       const data = []
       const name = userData.byDriver ? d.driver.name : deviceName(d.device)
-      const group = userData.byDriver ? userData.groups.find(g => g.drivers.includes(d.id)) : userData.groups.find(g => d.device.groupId === g.id)
+      const group = userData.byDriver ? userData.groups.find(g => g.drivers && g.drivers.includes(d.id)) : userData.groups.find(g => d.device.groupId === g.id)
 
       const space = index === 0 ? 8 : 0
       if (index) {

package/src/util/odoo.js

@@ -1,14 +1,16 @@
 
-async function getOdooFuelServices(traccar, from, to) {
-    const url = `/odoo/reports/refuelingServices?startDate=${from.toDateString()}&endDate=${to.toDateString()}`
+async function getOdooFuelServices (traccar, from, to) {
+  const url = `/odoo/reports/refuelingServices?startDate=${from.toDateString()}&endDate=${to.toDateString()}`
 
-    const {data} = await traccar.axios.get(url,{
-        jar: traccar.cookieJar,
-        withCredentials: true })
+  console.log('LOADING_MESSAGE:' + url)
+  const { data } = await traccar.axios.get(url, {
+    jar: traccar.cookieJar,
+    withCredentials: true
+  })
 
-    console.log(data)
+  console.log(data)
 
-    return data
+  return data
 }
 
 exports.getOdooFuelServices = getOdooFuelServices