fleetmap-reports 1.0.345 → 1.0.348

package/package.json

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

package/src/index.test.js

@@ -119,6 +119,7 @@ describe('Test_Reports', function() {
     it('KmsReport by device', async () => {
         const reports = await getReports()
         const userData = await reports.getUserData()
+        userData.devices = userData.devices.filter(d => d.id === 22326)
         const data = await reports.kmsReport(new Date(2021, 10, 1, 0, 0,0), new Date(2021, 10, 31, 23, 59, 59),
             userData)
         assert.equal(data.length, 1)
@@ -129,6 +130,7 @@ describe('Test_Reports', function() {
     it('KmsReport byDevice groupByDay', async () => {
         const reports = await getReports()
         const userData = await reports.getUserData()
+        userData.devices = userData.devices.filter(d => d.id === 22326)
         userData.groupByDay = true
         const data = await reports.kmsReport(new Date(2021, 10, 1, 0, 0,0), new Date(2021, 10, 10, 23, 59, 59),
             userData)
@@ -137,7 +139,7 @@ describe('Test_Reports', function() {
         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
-    },90000)
+    },30000)
     it('Idle by device', async () => {
         const report = await getReports()
         const userData = await report.getUserData()
@@ -215,4 +217,33 @@ describe('Test_Reports', function() {
         const device2 = kmsReport[0].devices.find(d => d.device.id===11681)
         assert.equal(device2.summary.distance, device1.totalDistance)  // Total Kms
     }, 30000)
+    it('Refueling Report', async () => {
+        const report = await getReports()
+        const userData = await report.getUserData()
+
+        const data = await report.refuelingReport(new Date(2022, 1, 2, 0, 0, 0, 0),
+            new Date(2022, 1, 2, 23, 59, 59, 0),
+            userData)
+
+        assert.equal(data.length, 1)
+        console.log(data[0])
+        const device = data[0].devices.find(d => d.device.id===16245)
+        assert.equal(device.refuelings.length, 2)
+
+    }, 30000)
+    it('Refueling2 Report', async () => {
+        const report = await getReports()
+        const userData = await report.getUserData()
+
+        const data = await report.refuelingReport(new Date(2022, 1, 21, 0, 0, 0, 0),
+            new Date(2022, 1, 25, 23, 59, 59, 0),
+            userData)
+
+        assert.equal(data.length, 1)
+        console.log(data[0])
+        const device = data[0].devices.find(d => d.device.id===16245)
+        console.log(device.refuelings)
+        assert.equal(device.refuelings.length, 4)
+
+    }, 30000)
 })

package/src/refueling-report.js

@@ -1,6 +1,8 @@
 const helpers = require("turf");
 const automaticReports = require("./automaticReports");
 
+const positionsToCheck = 15
+
 async function createRefuelingReport(from, to, userData, traccar) {
     console.log('Create RefuelingReport')
 
@@ -134,10 +136,10 @@ function calculateRefuelingPositions(d, positions) {
                 const value = Math.round(diff * d.attributes.fuel_tank_capacity / 100)
                 refuelingPositions.push({position: element, diff: value})
                 lastRefuelingIndex = index
-                positionsChecked = 6 // to reset values
+                positionsChecked = positionsToCheck+1 // to reset values
             }
 
-            if(positionsChecked > 5) {
+            if(positionsChecked > positionsToCheck) {
                 refuelingActivated = false
                 currentValue = null
                 positionsChecked = 0

package/src/speeding-report.js

@@ -68,7 +68,7 @@ async function createSpeedingReportByGroup(from, to, userData, traccarInstance){
 
 async function createSpeedingReportByDevice(from, to, userData, traccarInstance) {
   const groupIds = userData.groups.map(g => g.id)
-  const devices = userData.devices.filter(d => !groupIds.includes(d.groupId))
+  const devices = userData.byGroup ? userData.devices.filter(d => !groupIds.includes(d.groupId)) : userData.devices
 
   devices.sort((a, b) => (a.name > b.name) ? 1 : -1)
 
@@ -238,7 +238,6 @@ async function getHereEvents(devices, routes, threshold){
       continue
     }
     let hereAlerts = null
-    try {
       const results = await here.routeMatch(positions)
       hereAlerts = results.filter(r => r.currentSpeedKmh > (parseInt(r.speedLimit) + threshold)).map(r => {
         const position = positions.find(p => new Date(p.fixTime).getTime() === r.timestamp)
@@ -265,9 +264,6 @@ async function getHereEvents(devices, routes, threshold){
         return acc
       })
       events.push(...reduced)
-    } catch (e) {
-      console.error(hereAlerts, 'threshold', threshold,  e)
-    }
   }
   return events
 }