fleetmap-reports 2.0.6 → 2.0.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fleetmap-reports",
-  "version": "2.0.6",
+  "version": "2.0.8",
   "description": "",
   "main": "src/index.js",
   "scripts": {
@@ -14,15 +14,15 @@
     "@turf/distance": "^6.5.0",
     "@turf/helpers": "^6.5.0",
     "@turf/point-to-line-distance": "^6.5.0",
-    "axios": "0.27.2",
+    "axios": "1.6.7",
     "country-reverse-geocoding": "^0.2.2",
     "docx": "^7.3.0",
     "file-saver": "^2.0.5",
     "fleetmap-partners": "^1.0.160",
-    "json-as-xlsx": "^1.2.1",
+    "json-as-xlsx": "2.5.6",
     "jspdf": "^2.5.1",
     "jspdf-autotable": "3.6.0",
-    "moment": "^2.29.4",
+    "moment": "2.30.1",
     "traccar-api": "^1.0.5",
     "wkt": "^0.1.1"
   },

package/src/location-report.js

@@ -134,7 +134,9 @@ function processDevices (from, to, devices, data) {
           rain: p.attributes.rain,
           ignition: p.attributes.ignition,
           alarm: p.attributes.alarm,
-          input: p.attributes.input
+          input: p.attributes.input,
+          di2: p.attributes.di2,
+          di3: p.attributes.di3
         }
       }
     })
@@ -313,8 +315,8 @@ function getDigitalPort1Label (row, translations, dAttributes) {
   return (dAttributes && dAttributes.sensor1) || (row.attributes && row.attributes.sensor1) || translations.report.digital_ports1
 }
 
-function getDigitalPort2Label (row, translations) {
-  return row.attributes.door2 || translations.report.digital_ports2
+function getDigitalPort2Label (row, translations, dAttributes) {
+  return (dAttributes && dAttributes.sensor2) || (row.attributes && row.attributes.sensor2) || translations.report.digital_ports2
 }
 
 function getDigitalPortValue (row, index, translations, dAttributes) {
@@ -335,6 +337,11 @@ function getDigitalPortValue (row, index, translations, dAttributes) {
       }
       break
     case 2:
+      if (row.attributes && row.attributes[dAttributes.sensor2Attribute] !== undefined) {
+        return row.attributes[dAttributes.sensor2Attribute]
+          ? dAttributes.sensor2on || row.attributes.sensor
+          : dAttributes.sensor2off || row.attributes.sensor
+      }
       if (row.attributes && row.attributes.door2) {
         return translations.report[row.attributes.door2]
       }

package/src/tests/index.js

@@ -1,4 +1,3 @@
-const { SessionApi } = require('traccar-api')
 const Index = require('../index')
 const { isClientSide } = require('../util/utils')
 const { newDomains } = require('fleetmap-partners')
@@ -14,7 +13,9 @@ const axios = require('axios').create({ ...traccarConfig.baseOptions, baseURL: t
 const getReports = async (email, password) => {
   try {
     console.log('email / pass', process.env.email || email, process.env.password || password)
-    await new SessionApi(traccarConfig, null, axios).sessionPost(email || process.env.email, password || process.env.password)
+    const formData = `email=${encodeURIComponent(email)}&password=${encodeURIComponent(password)}`
+    const [cookie] = (await axios.post('/session', formData)).headers['set-cookie']
+    axios.defaults.headers.common.cookie = cookie
     return new Index(traccarConfig, axios)
   } catch (e) {
     console.error(e)

package/src/tests/positions.test.js

@@ -1,5 +1,6 @@
 const { getReports } = require('./index')
 const assert = require('assert')
+const xlsx = require('json-as-xlsx')
 // eslint-disable-next-line no-undef
 describe('test positions', function () {
   // eslint-disable-next-line no-undef
@@ -40,17 +41,21 @@ describe('test positions', function () {
     const report = await getReports(process.env.USER_ARCESE, process.env.PASS_ARCESE)
     const userData = await report.getUserData()
     userData.devices = userData.devices.filter(d => d.id === deviceId)
-    const data = await report.locationReport(
-      new Date(Date.UTC(2024, 1, 1, 0, 0, 0, 0)),
-      new Date(Date.UTC(2024, 1, 2, 23, 59, 59, 0)),
-      userData)
-    assert.equal(data.length, 1)
-    console.log('data', data)
-    const device = data[0].devices.find(d => d.device.id === deviceId)
-    assert.equal(device.positions.length, 2414) // Total Positions
     userData.includeDigitalPorts = true
-    const pdf = await report.loca(userData, data[0])
-    pdf.save('report.pdf')
+    const [data] = await report.locationReport(
+      new Date(Date.UTC(2024, 0, 23, 22, 0, 0, 0)),
+      new Date(Date.UTC(2024, 0, 24, 23, 59, 59, 0)),
+      userData)
+    const device = data.devices.find(d => d.device.id === deviceId)
+    assert.equal(device.positions.length, 3599) // Total Positions
+    const pdf = await report.locationReportToPDF(userData, data)
+    pdf.save()
+    const excel = report.locationReportToExcel(userData, data)
+    xlsx([{
+      sheet: 'Sheet1',
+      columns: excel.headers,
+      content: excel.data
+    }], excel.settings)
   }, 30000)
   // eslint-disable-next-line no-undef
 })