fleetmap-reports 1.0.868 → 1.0.870

package/package.json

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

package/src/events-report.js

@@ -4,7 +4,7 @@ require('jspdf-autotable')
 const { getStyle } = require('./reportStyle')
 const { headerFromUser } = require('./util/pdfDocument')
 const { getUserPartner } = require('fleetmap-partners')
-const { convertToLocaleString, getTranslations } = require('./util/utils')
+const { convertToLocaleString, getTranslations, convertMS } = require('./util/utils')
 const { devicesToProcess } = require('./util/device')
 const { isInside } = require('./util/timetable')
 const { getDigitalPortValue } = require('./location-report')
@@ -84,6 +84,13 @@ async function processDevices (from, to, devices, data, traccar, userData) {
       for (const a of deviceAlerts) {
         a.position = positions.find(p => p.id === a.positionId)
 
+        if (a.type === 'alarm' && a.position) {
+          for (const p of positions.filter(p => p.fixTime >= a.position.fixTime)) {
+            if (p.attributes.alarm !== a.position.attributes.alarm) { break }
+            a.endPosition = p
+          }
+        }
+
         if (!a.geofenceId && a.position) {
           const poi = getNearestPOI(a.position, userData.geofences)
           a.geofenceId = poi && poi.p.id
@@ -132,8 +139,10 @@ async function exportSpeedingReportToPDF (userData, reportData) {
 
   const headers = [
     translations.report.eventType,
-    translations.report.date,
+    translations.report.start,
+    translations.report.end,
     translations.report.address,
+    translations.report.duration,
     translations.report.info
   ]
   if (reportData.devices) {
@@ -185,8 +194,10 @@ async function exportSpeedingReportToPDF (userData, reportData) {
       d.alerts.forEach(a => {
         const temp = [
           getEventType(a, translations, d.device),
-          getAlertDate(userData.user, a),
+          getAlertDate(userData.user, a.position),
+          getAlertDate(userData.user, a.endPosition),
           a.geofenceName || (a.position ? a.position.address : ''),
+          a.position && a.endPosition ? convertMS(new Date(a.endPosition.fixTime).getTime() - new Date(a.position.fixTime).getTime()) : '',
           getAlertInfo(userData.drivers, a, d.device, translations)
         ]
         data.push(temp)
@@ -247,8 +258,10 @@ function exportSpeedingReportToExcel (userData, reportData) {
   const headers = [
     { label: translations.report.vehicle, value: 'name' },
     { label: translations.report.eventType, value: 'eventType' },
-    { label: translations.report.date, value: 'fixTime' },
+    { label: translations.report.start, value: 'fixTime' },
+    { label: translations.report.end, value: 'endFixTime' },
     { label: translations.report.address, value: 'address' },
+    { label: translations.report.duration, value: 'duration' },
     { label: translations.report.zone, value: 'geofenceName' },
     { label: translations.report.driver, value: 'driver' },
     { label: translations.report.info, value: 'info' },
@@ -262,8 +275,10 @@ function exportSpeedingReportToExcel (userData, reportData) {
         return {
           name: d.device.name,
           eventType: getEventType(a, translations, d.device),
-          fixTime: getAlertDate(userData.user, a),
+          fixTime: getAlertDate(userData.user, a.position),
+          endFixTime: getAlertDate(userData.user, a.endPosition),
           address: a.position && a.position.address,
+          duration: a.position && a.endPosition ? convertMS(new Date(a.endPosition.fixTime).getTime() - new Date(a.position.fixTime).getTime()) : '',
           geofenceName: a.geofenceName,
           info: getAlertInfo(userData.drivers, a, d.device, translations),
           driver: a.driver,
@@ -309,9 +324,9 @@ function getAlertInfo (drivers, alert, device, translations) {
   return ''
 }
 
-function getAlertDate (user, alert) {
-  if (alert.position) {
-    return convertToLocaleString(alert.position.fixTime, user.attributes.lang, user.attributes.timezone)
+function getAlertDate (user, position) {
+  if (position) {
+    return convertToLocaleString(position.fixTime, user.attributes.lang, user.attributes.timezone)
   }
 }
 

package/src/index.js

@@ -182,6 +182,5 @@ function Reports (config, axios, cookieJar) {
   this.stopReportToExcel = (userData, reportData) => {
     return require('./stop-report').exportStopReportToExcel(userData, reportData)
   }
-  this.getPdf = require('./carbone').getPdf
 }
 module.exports = Reports

package/src/partnerReports/afriquia.js

@@ -6,11 +6,6 @@ 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/tests/activity.test.js

@@ -72,4 +72,14 @@ 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,6 +2,7 @@
 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 () {
@@ -18,12 +19,19 @@ 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()
@@ -54,7 +62,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

@@ -27,6 +27,18 @@ 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)