fleetmap-reports 1.0.850 → 1.0.852

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fleetmap-reports",
-  "version": "1.0.850",
+  "version": "1.0.852",
   "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/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/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/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

package/src/trip-report.js

@@ -170,7 +170,7 @@ function processDevices (from, to, devices, data, userData, traccar) {
 
       const stop = getStop(new Date(trip.startTime), stops)
 
-      if ((deviceRoute[0].protocol === 'teltonika' && deviceRoute.some(r => r.attributes.fuel)) ||
+      if (deviceRoute.some(r => r.attributes.fuel) ||
           automaticReports.deviceWithFuelInfo(d)) {
         trip.fuelConsumption = calculateConsumption(d, { trips: [trip], stops: (stop ? [stop] : []), route: deviceRoute })
         trip.avgFuelConsumption = trip.totalKms > 0 ? trip.fuelConsumption * 100 / trip.totalKms : 0

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"
-]