fleetmap-reports 1.0.845 → 1.0.847

package/package.json

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

package/src/partnerReports/afriquia.js

@@ -6,6 +6,11 @@ const { convertToFeature, convertPositionToFeature } = require('../util/utils')
 function calculateLastStopTime (stopTime, to, time) {
   return stopTime + (to.getTime() - new Date(time).getTime())
 }
+
+function calculateFirstStopTime (stopTime, from, time) {
+  return stopTime + (new Date(time).getTime() - from.getTime())
+}
+
 async function createActivityReport (from, to, userData, traccarInstance) {
   const unauthorizedGeofences = []
   const authorizedGeofences = []

package/src/partnerReports/gpsjump-report.js

@@ -3,20 +3,18 @@ const traccarHelper = require('../util/traccar')
 const distance = require('@turf/distance')
 const { convertToLocaleString } = require('../util/utils')
 
-const minDistance = 5000
-
-async function createGPSJumpReport (from, to, userData, traccar) {
+async function createGPSJumpReport (from, to, userData, traccar, minDistance) {
   let reportData = []
 
   const devices = userData.devices
 
-  const sliced = automaticReports.sliceArray(devices, 5)
+  const sliced = automaticReports.sliceArray(devices, 10)
   let deviceCount = 0
   for (const slice of sliced) {
     const allInOne = await traccarHelper.getAllInOne(traccar, from, to, slice, true, false, false, false, deviceCount, devices.length)
 
     slice.forEach(d => {
-      const deviceData = getDeviceData(allInOne, d, userData.user)
+      const deviceData = getDeviceData(allInOne, d, userData.user, minDistance)
       reportData = reportData.concat(deviceData)
     })
 
@@ -26,7 +24,7 @@ async function createGPSJumpReport (from, to, userData, traccar) {
   return reportData
 }
 
-function getDeviceData (allInOne, d, user) {
+function getDeviceData (allInOne, d, user, minDistance) {
   const deviceRoute = allInOne.route.filter(t => t.deviceId === d.id)
 
   return deviceRoute.map((pA, index) => {
@@ -44,7 +42,7 @@ function getDeviceData (allInOne, d, user) {
       }
     }
     return undefined
-  }).filter(a => a && minDistance < a.distance)
+  }).filter(a => a && minDistance * 1000 < a.distance)
 }
 
 exports.createGPSJumpReport = createGPSJumpReport

package/src/tests/activity.test.js

@@ -72,14 +72,4 @@ describe('activity report', function () {
     console.log(device)
     assert.equal(device.summary.reduce((a, b) => a + b.convertedSpentFuel, 0), 168.79999999999995)
   }, 800000)
-  it('Activity test performance', async () => {
-    const report = await getReports('q.trans', 'quality1214')
-    const userData = await report.getUserData()
-    console.log(userData)
-    userData.groupByDay = true
-    const data = await report.activityReport(new Date(2023, 7, 1, 0, 0, 0, 0),
-        new Date(2023, 31, 5, 23, 59, 59, 0),
-        userData)
-    assert.equal(data.length, 1)
-  }, 8000000)
 })

package/src/tests/index.test.js

@@ -2,7 +2,6 @@
 const { getReports } = require('./index')
 const assert = require('assert')
 const utils = require('../util/utils')
-const { createGPSJumpReport } = require('../partnerReports/gpsjump-report')
 
 // eslint-disable-next-line no-undef
 describe('Test_Reports', function () {
@@ -19,19 +18,12 @@ describe('Test_Reports', function () {
     const pdf = await report.speedingReportToPDF(userData, data[0])
     pdf.save()
   }, 40000)
+
   it('converts madrid time', async () => {
     assert.equal(false, utils.isClientSide())
     console.log(utils.convertToLocaleString(new Date(), 'es-CL', 'Europe/Madrid'))
   })
-  it('gps jump device', async () => {
-    const report = await getReports('HASSANE', 'movitec.1637')
-    const userData = await report.getUserData()
-    userData.devices = userData.devices.filter(d => d.id === 148725)
-    const data = await createGPSJumpReport(new Date(2023, 8, 22, 0, 0, 0, 0),
-      new Date(2023, 8, 24, 23, 59, 59, 0),
-      userData, report.traccar)
-    console.log(data)
-  }, 40000)
+
   it('Idle by device', async () => {
     const report = await getReports()
     const userData = await report.getUserData()
@@ -62,7 +54,7 @@ describe('Test_Reports', function () {
     const totalIdleTime = driver.idleEvents.reduce((a, b) => a + b.idleTime, 0)
     assert.equal(driver.idleEvents.length, 15) // Total Alerts
     assert.equal(totalIdleTime, 16000) // Total Duration
-  }, 20000),
+  }, 20000)
   // eslint-disable-next-line no-undef
   it('test allinone', async () => {
     console.log('Start')

package/src/tests/zones.test.js

@@ -32,18 +32,6 @@ describe('zones', function () {
     console.log('result', result)
   }, 4000000)
 
-  it('works with afriquia', async () => {
-    const report = await getReports(process.env.USER_AFRIQUIA, process.env.PASS_AFRIQUIA)
-    const userData = await report.getUserData()
-    console.log(userData.devices.length)
-    console.log(userData.geofences)
-    const result = await report.zoneReport(
-        new Date(Date.UTC(2023, 5, 11, 0, 0, 0, 0)),
-        new Date(Date.UTC(2023, 5, 11, 23, 59, 59, 0)),
-        userData)
-    console.log('result', result)
-  }, 4000000)
-
   // eslint-disable-next-line no-undef
   it('works with casais', async () => {
     const report = await getReports(process.env.USER_CASAIS, process.env.PASS_CASAIS)