fleetmap-reports 1.0.448 → 1.0.452

package/package.json

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

package/src/idle-report.js

@@ -166,8 +166,7 @@ function processDevices (from, to, devices, routes, userData) {
     const route = routes.filter(p => p.deviceId === d.id)
 
     const idleEvents = getIdleEvents(route)
-    console.log(idleEvents)
-    const filteredEvents = idleEvents.filter(e => userData.minimumIdleMinutes ? e.idleTime > userData.minimumIdleMinutes * 60 * 1000 : true)
+    const filteredEvents = idleEvents.filter(e => e.idleTime > (userData.minimumIdleMinutes ? userData.minimumIdleMinutes * 60 * 1000 : 0))
 
     if (filteredEvents.length) {
       filteredEvents.forEach(e => {

package/src/index.test.js

@@ -15,7 +15,6 @@ 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()
@@ -51,8 +50,9 @@ describe('Test_Reports', function () {
     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, 339204.53999999166) // Total Kms
+    assert.equal(device.totalDistance, 339170.3099999875) // Total Kms
   }, 20000)
   // eslint-disable-next-line no-undef
   it('Trip by driver', async () => {
@@ -65,10 +65,10 @@ 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, 9) // Total Trips
-    assert.equal(driver.totalDuration, 6274000)
-    assert.equal(driver.maxSpeed, 70.1944)
-  }, 20000)
+    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()
@@ -199,7 +199,7 @@ describe('Test_Reports', function () {
     assert.equal(data.length, 1)
     assert.equal(data.length, 1)
     const device = data[0].devices.find(d => d.device.id === 22326)
-    assert.equal(device.summary.distance, 1193284.3100000024) // Total Kms
+    assert.equal(device.summary.distance, 1183904.0299999565) // Total Kms
   }, 30000)
   // eslint-disable-next-line no-undef
   it('KmsReport byDevice groupByDay', async () => {
@@ -213,7 +213,7 @@ describe('Test_Reports', function () {
     assert.equal(data.length, 1)
     const device = data[0].devices.find(d => d.device.id === 22326)
     assert.equal(device.days.length, 10) // Total Kms
-    assert.equal(device.days[5].kms, 23183.010000005364) // Total Kms
+    assert.equal(device.days[5].kms, 23124.280000001192) // Total Kms
   }, 30000)
   // eslint-disable-next-line no-undef
   it('Idle by device', async () => {
@@ -226,23 +226,26 @@ describe('Test_Reports', function () {
     assert.equal(data.length, 1)
     const device = data[0].devices.find(d => d.device.id === 22326)
     const totalIdleTime = device.idleEvents.reduce((a, b) => a + b.idleTime, 0)
-    assert.equal(device.idleEvents.length, 8) // Total Alerts
-    assert.equal(totalIdleTime, 1294000) // Total Duration
+    assert.equal(device.idleEvents.length, 9) // Total Alerts
+    assert.equal(totalIdleTime, 1592000) // Total Duration
   }, 20000)
   // eslint-disable-next-line no-undef
   it('Idle by driver', async () => {
     const report = await getReports()
     const userData = await report.getUserData()
-    userData.minimumIdleMinutes = 2
+    userData.minimumIdleMinutes = 0
     userData.byDriver = true
+
+    console.log(userData.drivers)
     const data = await report.idleReport(new Date(2022, 0, 3, 0, 0, 0, 0),
       new Date(2022, 0, 7, 23, 59, 59, 0),
       userData)
     assert.equal(data.length, 1)
     const driver = data[0].drivers.find(d => d.driver.id === 14020)
+
     const totalIdleTime = driver.idleEvents.reduce((a, b) => a + b.idleTime, 0)
-    assert.equal(driver.idleEvents.length, 1) // Total Alerts
-    assert.equal(totalIdleTime, 8267000) // Total Duration
+    assert.equal(driver.idleEvents.length, 15) // Total Alerts
+    assert.equal(totalIdleTime, 16000) // Total Duration
   }, 20000)
   // eslint-disable-next-line no-undef
   it('Activity by device', async () => {
@@ -255,7 +258,7 @@ describe('Test_Reports', function () {
     assert.equal(data.length, 1)
     const device = data[0].devices.find(d => d.device.id === 22326)
     assert.equal(device.summary[0].startOdometer, 122502742.59)
-    assert.equal(device.summary[0].distance, 1423529.600000009)
+    assert.equal(device.summary[0].distance, 1404204.4299999028)
     assert.equal(device.summary[0].startTime, '2022-01-01T13:35:47.000+0000')
     assert.equal(device.summary[0].endTime, '2022-01-31T17:36:27.000+0000')
   }, 40000)
@@ -283,8 +286,8 @@ describe('Test_Reports', function () {
     assert.equal(data.length, 1)
     const device = data[0].devices.find(d => d.device.id === 22326)
     assert.equal(device.summary[5].startOdometer, 122923290.95)
-    assert.equal(device.summary[5].distance, 77020.37999999523)
-    assert.equal(device.summary[5].startTime, '2022-01-06T18:35:04.000+0000')
+    assert.equal(device.summary[5].distance, 77021.6400000006)
+    assert.equal(device.summary[5].startTime, '2022-01-06T18:35:36.000+0000')
     assert.equal(device.summary[5].endTime, '2022-01-06T19:54:27.000+0000')
   }, 90000)
   // eslint-disable-next-line no-undef
@@ -320,11 +323,11 @@ describe('Test_Reports', function () {
       userData)
 
     assert.equal(tripsReport.length, 1)
-    const device1 = tripsReport[0].devices.find(d => d.device.id === 11681)
-    assert.equal(device1.trips.length, 44) // Total Trips
-    assert.equal(device1.totalDistance, 882801.0815308811) // Total Kms
+    const device1 = tripsReport[0].devices.find(d => d.device.id === 22327)
+    assert.equal(device1.trips.length, 14) // Total Trips
+    assert.equal(device1.totalDistance, 83553.13999999687) // Total Kms
 
-    const device2 = kmsReport[0].devices.find(d => d.device.id === 11681)
+    const device2 = kmsReport[0].devices.find(d => d.device.id === 22327)
     assert.equal(device2.summary.distance, device1.totalDistance) // Total Kms
   }, 30000)
   // eslint-disable-next-line no-undef

package/src/trip-report.js

@@ -169,9 +169,10 @@ function processDevices (from, to, devices, data, userData, traccar) {
       }
 
       const stop = getStop(new Date(trip.startTime), stops)
+
       if (stop && !trip.endTimeIsOut) {
         trip.stopDuration = (new Date(stop.endTime) - new Date(stop.startTime))
-        trip.stopEngineHours = stop.engineHours
+        trip.stopEngineHours = trip.idleTime + stop.idleTime
       } else {
         trip.stopDuration = 0
         trip.stopEngineHours = 0
@@ -270,6 +271,7 @@ async function exportTripReportToPDF (userData, reportData) {
   }
 
   if (tripsData) {
+    // eslint-disable-next-line new-cap
     const doc = new jsPDF.jsPDF('l')
     await headerFromUser(doc, translations.report.titleTripReport, userData.user)
 

package/src/util/odoo.js

@@ -1,16 +1,14 @@
 
-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()}`
 
-  console.log('LOADING_MESSAGE:' + url)
-  const { data } = await traccar.axios.get(url, {
-    jar: traccar.cookieJar,
-    withCredentials: true
-  })
+    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

package/src/util/route.js

@@ -1,4 +1,5 @@
 function getIdleEvents (route, driver) {
+  const speedThreshold = 3
   const idleEvents = []
 
   const routeByDevice = route.reduce(function (a, x) {
@@ -8,8 +9,9 @@ function getIdleEvents (route, driver) {
 
   Object.keys(routeByDevice).forEach(function (key) {
     let inIdle = false
+    let last = null
     routeByDevice[key].forEach(p => {
-      if (p.attributes.ignition && p.speed === 0 && (!driver || p.attributes.driverUniqueId === driver.uniqueId)) {
+      if (p.attributes.ignition && p.speed < speedThreshold && (!driver || p.attributes.driverUniqueId === driver.uniqueId)) {
         if (!inIdle) {
           const idleEvent = {
             position: p,
@@ -17,20 +19,16 @@ function getIdleEvents (route, driver) {
           }
           idleEvents.push(idleEvent)
           inIdle = true
-        } else {
-          if (!idleEvents[idleEvents.length - 1].position.attributes.driverUniqueId) {
-            idleEvents[idleEvents.length - 1].position.attributes.driverUniqueId = p.attributes.driverUniqueId
-          }
+        }
 
-          if (p.attributes.idleTime) {
-            idleEvents[idleEvents.length - 1].idleTime = p.attributes.idleTime
-          }
+        if (!idleEvents[idleEvents.length - 1].position.attributes.driverUniqueId) {
+          idleEvents[idleEvents.length - 1].position.attributes.driverUniqueId = p.attributes.driverUniqueId
         }
+
+        last = p
       } else if (inIdle) {
         const currentIdleEvent = idleEvents[idleEvents.length - 1]
-        if (p.attributes.idleTime === undefined) {
-          currentIdleEvent.idleTime = new Date(p.fixTime) - new Date(currentIdleEvent.position.fixTime)
-        }
+        currentIdleEvent.idleTime = new Date(last.fixTime) - new Date(currentIdleEvent.position.fixTime)
         inIdle = false
       }
     })
@@ -38,5 +36,4 @@ function getIdleEvents (route, driver) {
 
   return idleEvents
 }
-
 exports.getIdleEvents = getIdleEvents