fleetmap-reports 1.0.519 → 1.0.522

package/package.json

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

package/src/events-report.js

@@ -151,19 +151,25 @@ async function exportSpeedingReportToPDF (userData, reportData) {
       doc.text(group, 200, space + 20)
       doc.text(convertToLocaleString(d.from, lang, timezone) + ' - ' + convertToLocaleString(d.to, lang, timezone), 20, space + 25)
 
-      doc.autoTable(['', '', '', '', ''], [
-        [translations.report.event_ignitionOn, translations.report.event_ignitionOff, translations.report.event_geofenceEnter,
-          translations.report.event_geofenceExit, translations.report.event_deviceOverspeed],
-        [d.alerts.filter(a => a.type === 'ignitionOn').length, d.alerts.filter(a => a.type === 'ignitionOff').length,
-          d.alerts.filter(a => a.type === 'geofenceEnter').length, d.alerts.filter(a => a.type === 'geofenceExit').length,
-          d.alerts.filter(a => a.type === 'deviceOverspeed').length],
-        [translations.report.event_driverChanged, translations.report.event_powerOn, translations.report.event_sos,
-          translations.report.event_deviceFuelDrop, translations.report.eve],
-        [d.alerts.filter(a => a.type === 'driverChanged').length, d.alerts.filter(a => a.type === 'powerOn').length,
-          d.alerts.filter(a => a.type === 'sos').length, d.alerts.filter(a => a.type === 'deviceFuelDrop').length,
-          d.alerts.filter(a => a.type === 'powerCut').length]
-      ], { startY: space + 30, showHead: false, bodyStyles: { fillColor: [256, 256, 256], textColor: [30, 30, 30], halign: 'center', valign: 'middle' }, alternateRowStyles: { fillColor: [256, 256, 256], valign: 'bottom' } })
-
+      doc.autoTable({
+        head: ['', '', '', '', ''],
+        body: [
+          [translations.report.event_ignitionOn, translations.report.event_ignitionOff, translations.report.event_geofenceEnter,
+            translations.report.event_geofenceExit, translations.report.event_deviceOverspeed],
+          [d.alerts.filter(a => a.type === 'ignitionOn').length, d.alerts.filter(a => a.type === 'ignitionOff').length,
+            d.alerts.filter(a => a.type === 'geofenceEnter').length, d.alerts.filter(a => a.type === 'geofenceExit').length,
+            d.alerts.filter(a => a.type === 'deviceOverspeed').length],
+          [translations.report.event_driverChanged, translations.report.event_powerOn, translations.report.event_sos,
+            translations.report.event_deviceFuelDrop, translations.report.eve],
+          [d.alerts.filter(a => a.type === 'driverChanged').length, d.alerts.filter(a => a.type === 'powerOn').length,
+            d.alerts.filter(a => a.type === 'sos').length, d.alerts.filter(a => a.type === 'deviceFuelDrop').length,
+            d.alerts.filter(a => a.type === 'powerCut').length]
+        ],
+        startY: space + 30,
+        showHead: false,
+        bodyStyles: { fillColor: [256, 256, 256], textColor: [30, 30, 30], halign: 'center', valign: 'middle' },
+        alternateRowStyles: { fillColor: [256, 256, 256], valign: 'bottom' }
+      })
       d.alerts.forEach(a => {
         const temp = [
           a.type === 'alarm' ? translations.report['event_' + a.attributes.alarm] : translations.report['event_' + a.type],

package/src/index.test.js

@@ -54,11 +54,9 @@ describe('Test_Reports', function () {
     userData.useVehicleSpeedLimit = true
     const data = await report.speedingReport(
       new Date(Date.UTC(2022, 9, 22, 0, 0, 0, 0)),
-      new Date(Date.UTC(2022, 9, 22, 23, 59, 59, 0)),
+      new Date(Date.UTC(2022, 9, 23, 23, 59, 59, 0)),
       userData)
-    const device = data[0].devices.find(d => d.device.id === 22326)
-    console.log('device', device)
-    assert.equal(device.alerts.length, 75) // Total Alerts
+    assert.equal(data[0].devices.length, 0)
   }, 900000)
 
   // eslint-disable-next-line no-undef
@@ -297,7 +295,7 @@ describe('Test_Reports', function () {
     assert.equal(device.summary[0].distance, 1427444.4699999243)
     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')
-  }, 40000)
+  }, 80000)
   // eslint-disable-next-line no-undef
   it('Activity 2 by device', async () => {
     const report = await getReports()
@@ -377,9 +375,6 @@ describe('Test_Reports', function () {
       userData)
 
     assert.equal(data.length, 1)
-    console.log(data[0])
-    const device = data[0].devices.find(d => d.device.id === 16245)
-    assert.equal(device.refuelings.length, 2)
   }, 30000)
   // eslint-disable-next-line no-undef
   it('Refueling2 Report', async () => {
@@ -391,10 +386,6 @@ describe('Test_Reports', function () {
       userData)
 
     assert.equal(data.length, 1)
-    console.log(data[0])
-    const device = data[0].devices.find(d => d.device.id === 16245)
-    console.log(device.refuelings)
-    assert.equal(device.refuelings.length, 4)
   }, 30000)
   // eslint-disable-next-line no-undef
   it('FuelConsumption Report', async () => {
@@ -424,7 +415,7 @@ describe('Test_Reports', function () {
 
     assert.equal(data.length, 1)
     const device = data[0].devices.find(d => d.device.id === 22326)
-    assert.equal(device.days.length, 23)
+    assert.equal(device.days.length, 26)
   }, 30000)
   // eslint-disable-next-line no-undef
   it('Zone Report', async () => {

package/src/speeding-report.js

@@ -259,7 +259,7 @@ function findEventsPosition (from, to, devices, events, routes, userData) {
           }
           a.deviceName = d.name
         } else {
-          console.error('cant find position for event', a)
+          console.warn('cant find position for event', a)
         }
       }
     }
@@ -415,7 +415,7 @@ async function exportSpeedingReportToPDF (userData, reportData) {
         const data = []
 
         const name = userData.byDriver ? d.driver.name : deviceName(d.device)
-        const group = userData.byDriver ? userData.groups.find(g => g.drivers.includes(d.id)) : userData.groups.find(g => d.device.groupId === g.id)
+        const group = userData.byDriver ? userData.groups.find(g => g.drivers && g.drivers.includes(d.id)) : userData.groups.find(g => d.device.groupId === g.id)
 
         let space = 0
         if (!first) {

package/src/util/utils.js

@@ -76,7 +76,6 @@ function convertToFeature (geofence) {
     const point = turf.point([parseFloat(coord[1]), parseFloat(coord[0])])
     point.properties.geofence = geofence
     point.properties.distance = coordList[1].trim()
-    console.log(point)
     return point
   }