fleetmap-reports 1.0.851 → 1.0.853

package/package.json

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

package/src/carbone/index.js

@@ -0,0 +1,13 @@
+const baseURL = 'https://api.carbone.io/render'
+
+const axios = require('axios').create({
+  baseURL,
+  headers: {
+    Authorization: `Bearer ${process.env.CARBONE_API_KEY}`
+  }
+})
+
+exports.getPdf = async (template, body) => {
+  const { data } = await axios.post(template, body).then(r => r.data)
+  return `${baseURL}/${data.renderId}`
+}

package/src/events-report.js

@@ -106,6 +106,7 @@ async function processDevices (from, to, devices, data, traccar, userData) {
       }
 
       const alerts = deviceAlerts.filter(a => userData.allWeek || !userData.weekDays || (!a.position || isInside(a.position.fixTime, a.position.fixTime, userData)))
+        .filter(a => a.position).sort((a, b) => a.position.fixTime.localeCompare(b.position.fixTime))
       console.log('LOADING_MESSAGE:' + d.name)
       console.log(`PROGRESS_PERC:${++i / devices.length * 100}`)
 

package/src/index.js

@@ -182,5 +182,6 @@ 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,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/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/carbone.test.js

@@ -0,0 +1,20 @@
+const carbone = require('../carbone')
+
+// eslint-disable-next-line no-undef
+describe('test carbone', function () {
+  // eslint-disable-next-line no-undef
+// eslint-disable-next-line no-undef
+  it('works', async () => {
+    try {
+      console.log(
+        await carbone.getPdf('a7322d5a19b6a37c3ceee4719ed701876a27e288f8b9b58b7e0f8c13b7f01bbb',
+          {
+            data: 1,
+            convertTo: 'pdf'
+          }))
+    } catch (e) {
+      console.error(e && e.response && e.response.data)
+      throw e
+    }
+  })
+})

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

@@ -3,20 +3,15 @@ const assert = require('assert')
 // eslint-disable-next-line no-undef
 describe('zones', function () {
   // eslint-disable-next-line no-undef
-  it('works with ellca', async () => {
+  it('works tripsBetweenZones', async () => {
     const report = await getReports()
     const userData = await report.getUserData()
-    const ellca = require('./ellca.json')
-    userData.devices = userData.devices.filter(d => ellca.find(e => e === d.name))
-    console.log(userData.devices.length)
-    console.log(userData.devices.map(d => d.id))
-    userData.geofences = userData.geofences.filter(g => g.name === 'Geofence Ellca 2')
-    console.log(userData.geofences)
+    userData.tripsBetweenZones = true
     const result = await report.zoneReport(
-      new Date(Date.UTC(2022, 6, 24, 0, 0, 0, 0)),
-      new Date(Date.UTC(2022, 6, 25, 23, 59, 59, 0)),
+      new Date(Date.UTC(2023, 6, 24, 0, 0, 0, 0)),
+      new Date(Date.UTC(2023, 6, 25, 23, 59, 59, 0)),
       userData)
-    console.log('result', result)
+    console.log(await report.zoneReportToPDF(userData, result[0]))
   }, 4000000)
 
   // eslint-disable-next-line no-undef
@@ -32,18 +27,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)

package/src/tests/ellca.json

@@ -1,46 +0,0 @@
-[
-  "KRS5330",
-  "LTR6D02",
-  "LTS8J58",
-  "LUA4F53",
-  "LUN9B64",
-  "RJN0J89",
-  "RJP0I18",
-  "RJY4A56",
-  "RKT2C85",
-  "RKU3F60",
-  "EPA5I95",
-  "ESV3G14",
-  "FKT3J22",
-  "JAD3F55",
-  "JAJ1C36",
-  "KRX2869",
-  "KXG9094",
-  "KZA5664",
-  "KZA5940",
-  "LMT4A13",
-  "LTY8D84",
-  "RIP4C67",
-  "RIZ0H12",
-  "RJA0F90",
-  "RJG4J53",
-  "RJH4J70",
-  "RJJ5E13",
-  "RJK9F52",
-  "RJL1E23",
-  "RJL1E26",
-  "RJM5G37",
-  "RJN9G45",
-  "RJP3C03",
-  "RJR4G53",
-  "RJV8G79",
-  "RJY4A55",
-  "RKC9H45",
-  "RKG0I43",
-  "RKG3D47",
-  "RKK9G32",
-  "RKR3I02",
-  "RKR3I09",
-  "RKR3I10",
-  "RKS1A72"
-]