fleetmap-reports 1.0.852 → 1.0.856

package/package.json

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

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}`)
 
@@ -248,6 +249,7 @@ function exportSpeedingReportToExcel (userData, reportData) {
     { label: translations.report.eventType, value: 'eventType' },
     { label: translations.report.date, value: 'fixTime' },
     { label: translations.report.address, value: 'address' },
+    { label: translations.report.zone, value: 'geofenceName' },
     { label: translations.report.driver, value: 'driver' },
     { label: translations.report.info, value: 'info' },
     { label: 'Latitude', value: 'latitude' },
@@ -261,7 +263,8 @@ function exportSpeedingReportToExcel (userData, reportData) {
           name: d.device.name,
           eventType: getEventType(a, translations, d.device),
           fixTime: getAlertDate(userData.user, a),
-          address: a.geofenceName || (a.position ? a.position.address : ''),
+          address: a.position && a.position.address,
+          geofenceName: a.geofenceName,
           info: getAlertInfo(userData.drivers, a, d.device, translations),
           driver: a.driver,
           latitude: a.position && a.position.latitude,

package/src/tests/events.test.js

@@ -5,12 +5,14 @@ describe('events', function () {
   it('works with many devices', async () => {
     const report = await getReports(process.env.USER_NOGARTEL, process.env.PASS_NOGARTEL)
     const userData = await report.getUserData()
-    console.log(userData.devices.length)
+    userData.devices = userData.devices.filter(d => d.name.startsWith('BBU-4428'))
+    userData.eventTypes = ['alarm_sensor']
+    console.log('devices.length', userData.devices.length)
     const result = await report.eventsReport(
-      new Date(Date.UTC(2023, 5, 11, 0, 0, 0, 0)),
-      new Date(Date.UTC(2023, 5, 11, 23, 59, 59, 0)),
+      new Date(Date.UTC(2023, 8, 29, 0, 0, 0, 0)),
+      new Date(Date.UTC(2023, 8, 29, 23, 59, 59, 0)),
       userData)
-    console.log('result', result)
+    console.log('result', result[0].devices[0].alerts)
   }, 4000000)
 
   // eslint-disable-next-line no-undef