fleetmap-reports 1.0.756 → 1.0.758

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fleetmap-reports",
-  "version": "1.0.756",
+  "version": "1.0.758",
   "description": "",
   "main": "src/index.js",
   "scripts": {
@@ -34,8 +34,7 @@
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^6.0.0",
-    "jest": "^27.5.0",
-    "mocha": "^10.2.0",
+    "jest": "^29.6.1",
     "webpack": "^5.51.0",
     "webpack-cli": "^4.5.0"
   },

package/src/activity-report.js

@@ -264,7 +264,6 @@ function processDevices (from, to, devices, data, userData) {
 }
 
 function processDrivers (from, to, drivers, data, userData) {
-  console.log(data)
   const driversResult = []
   drivers.forEach(d => {
     const { route, trips } = getDriverData(d, data)
@@ -351,7 +350,6 @@ function exportActivityReportToPDFDriver (doc, translations, reportData, userDat
 
   doc.setFontSize(10)
   doc.text(convertToLocaleString(reportData.from, lang, timezone) + ' - ' + convertToLocaleString(reportData.to, lang, timezone), 20, 30)
-  doc.text()
 
   const data = []
   reportData.drivers.forEach(d => {

package/src/partnerReports/performance-report.js

@@ -22,8 +22,8 @@ async function createPerformanceReport (from, to, userData, traccar) {
         deviceTrips.push(uncompletedTrip)
       }
 
-      const endTripData = getEndTripMessages(deviceRoute).map(m => parseEndTripMessage(m.xpertString || m))
-      const canDriverStyle = getCanDriverStyleMessages(deviceRoute).map(m => parseCanDriverStyleMessage(m.xpertString || m))
+      const endTripData = getEndTripMessages(deviceRoute).map(m => parseEndTripMessage(m.xpertString || m)).sort((a, b) => a.date.localeCompare(b.date))
+      const canDriverStyle = getCanDriverStyleMessages(deviceRoute).map(m => parseCanDriverStyleMessage(m.xpertString || m)).sort((a, b) => a.date.localeCompare(b.date))
 
       const deviceData = {
         device: d.name,

package/src/tests/activity.test.js

@@ -0,0 +1,48 @@
+// eslint-disable-next-line no-undef
+const { getReports } = require('./index')
+const assert = require('assert')
+// eslint-disable-next-line no-undef
+describe('activity report', function () {
+  // eslint-disable-next-line no-undef
+  it('Activity by device', async () => {
+    const report = await getReports()
+    const userData = await report.getUserData()
+
+    const data = await report.activityReport(new Date(2022, 0, 1, 0, 0, 0, 0),
+      new Date(2022, 0, 31, 23, 59, 59, 0),
+      userData)
+    assert.equal(data.length, 1)
+    const device = data[0].devices.find(d => d.device.id === 22326)
+    assert.equal(device.summary[0].startOdometer, 0)
+    assert.equal(device.summary[0].distance, 0)
+    assert.equal(device.summary[0].startTime, 0)
+    assert.equal(device.summary[0].endTime, 0)
+  }, 80000)
+
+  // eslint-disable-next-line no-undef
+  it('Activity by driver', async () => {
+    const report = await getReports('felipe@codepa.com.br', process.env.password)
+    const userData = await report.getUserData()
+    userData.byDriver = true
+    const data = await report.activityReport(new Date(2023, 0, 1, 0, 0, 0, 0),
+      new Date(2023, 0, 1, 23, 59, 59, 0),
+      userData)
+    assert.equal(data.length, 1)
+    await report.activityReportToPDF(userData, data[0])
+  }, 800000)
+  // eslint-disable-next-line no-undef
+  it('Activity byDevice groupByDay', async () => {
+    const report = await getReports()
+    const userData = await report.getUserData()
+    userData.groupByDay = true
+    const data = await report.activityReport(new Date(2022, 0, 1, 0, 0, 0, 0),
+      new Date(2022, 0, 20, 23, 59, 59, 0),
+      userData)
+    assert.equal(data.length, 1)
+    const device = data[0].devices.find(d => d.device.id === 22326)
+    assert.equal(device.summary[5].startOdometer, 0)
+    assert.equal(device.summary[5].distance, 0)
+    assert.equal(device.summary[5].startTime, 0)
+    assert.equal(device.summary[5].endTime, 0)
+  }, 90000)
+})

package/src/tests/index.js

@@ -16,6 +16,7 @@ axiosCookieJarSupport(axios)
 
 const getReports = async (email, password) => {
   try {
+    console.log('email / pass', process.env.email, process.env.password)
     await new SessionApi(traccarConfig, null, axios).sessionPost(email || process.env.email, password || process.env.password)
     return new Index(traccarConfig, axios, cookieJar)
   } catch (e) {

package/src/tests/index.test.js

@@ -192,36 +192,6 @@ describe('Test_Reports', function () {
     assert.equal(totalIdleTime, 16000) // Total Duration
   }, 20000)
   // eslint-disable-next-line no-undef
-  it('Activity by device', async () => {
-    const report = await getReports()
-    const userData = await report.getUserData()
-
-    const data = await report.activityReport(new Date(2022, 0, 1, 0, 0, 0, 0),
-      new Date(2022, 0, 31, 23, 59, 59, 0),
-      userData)
-    assert.equal(data.length, 1)
-    const device = data[0].devices.find(d => d.device.id === 22326)
-    assert.equal(device.summary[0].startOdometer, 122502742.59)
-    assert.equal(device.summary[0].distance, 1425532.6071218813)
-    assert.equal(device.summary[0].startTime, '2022-01-01T13:35:47.000+0000')
-    assert.equal(device.summary[0].endTime, '2022-01-31T17:36:27.000+0000')
-  }, 80000)
-  // eslint-disable-next-line no-undef
-  it('Activity byDevice groupByDay', async () => {
-    const report = await getReports()
-    const userData = await report.getUserData()
-    userData.groupByDay = true
-    const data = await report.activityReport(new Date(2022, 0, 1, 0, 0, 0, 0),
-      new Date(2022, 0, 20, 23, 59, 59, 0),
-      userData)
-    assert.equal(data.length, 1)
-    const device = data[0].devices.find(d => d.device.id === 22326)
-    assert.equal(device.summary[5].startOdometer, 122923290.95)
-    assert.equal(device.summary[5].distance, 77033.18999999762)
-    assert.equal(device.summary[5].startTime, '2022-01-06T18:35:36.000+0000')
-    assert.equal(device.summary[5].endTime, '2022-01-06T19:54:27.000+0000')
-  }, 90000)
-  // eslint-disable-next-line no-undef
   it('test allinone', async () => {
     console.log('Start')
     const reports = await getReports()

package/src/tests/performance.test.js

@@ -2,7 +2,6 @@ const { getReports } = require('./index')
 const { createPerformanceReport } = require('../partnerReports/performance-report')
 // eslint-disable-next-line no-undef
 describe('performance', function () {
-  this.timeout(500000)
   // eslint-disable-next-line no-undef
   it('performance report', async () => {
     const report = await getReports()

package/src/tests/zones.test.js

@@ -2,7 +2,6 @@ const { getReports } = require('./index')
 const assert = require('assert')
 // eslint-disable-next-line no-undef
 describe('zones', function () {
-  this.timeout(500000)
   // eslint-disable-next-line no-undef
   it('works with ellca', async () => {
     const report = await getReports()
@@ -48,25 +47,4 @@ describe('zones', function () {
     assert.equal(first.inTime.fixTime, '2023-01-03T21:23:24.000+0000')
     assert.equal(first.outTime.fixTime, '2023-01-07T12:22:53.000+0000')
   }, 4000000)
-
-  // eslint-disable-next-line no-undef
-  it('works with casais 2', async () => {
-    const report = await getReports('mario.andre.moreira@casais.gi', 'Casais.23')
-    const userData = await report.getUserData()
-    userData.groupByDay = true
-    userData.devices = userData.devices.filter(d => d.name === 'G-2542-F Fiat Tipo')
-    userData.geofences = userData.geofences.filter(g => g.name === 'baliza raio verde ')
-    assert.equal(userData.geofences.length > 0, true)
-    assert.equal(userData.devices.length > 0, true)
-    const result = await report.zoneReport(
-      new Date(2023, 1, 27, 0, 0, 0, 0),
-      new Date(2023, 1, 27, 23, 59, 59, 0),
-      userData)
-    assert.equal(result[0].devices[0].geofences.length, 1)
-    assert.equal(result[0].devices[0].geofences[0].days.length, 1)
-    const first = result[0].devices[0].geofences[0].days[0]
-    assert.equal(first.firstIn, '2023-02-27T21:53:16.000+0000')
-    assert.equal(first.distanceIn, 93.03917199839687)
-    assert.equal(first.distanceOut, 819.6685737216337)
-  }, 4000000)
 })

package/src/util/xpert.js

@@ -2,6 +2,7 @@ function parseEndTripMessage (xpertMessage) {
   const data = xpertMessage.split(',')
 
   return {
+    date: data[1],
     totalDistanceTravelled: Number(data[2]),
     totalDistanceTravelledWithCruiseControl: Number(data[3]),
     totalFuelConsumption: Number(data[4]),
@@ -22,6 +23,7 @@ function parseCanDriverStyleMessage (xpertMessage) {
   const data = xpertMessage.split(',')
 
   return {
+    date: data[1],
     totalFuelConsumptionInEcoRange: Number(data[2]),
     totalTimeInEcoRange: Number(data[3]),
     totalDistanceInEcoRange: Number(data[4]),