fleetmap-reports 1.0.569 → 1.0.571

package/package.json

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

package/src/events-report.js

@@ -174,7 +174,7 @@ async function exportSpeedingReportToPDF (userData, reportData) {
       d.alerts.forEach(a => {
         const temp = [
           a.type === 'alarm'
-            ? translations.report['event_' + a.attributes.alarm] || a.attributes.alarm
+            ? getEventType(a, translations, d.device)
             : translations.report['event_' + a.type],
           getAlertDate(userData.user, a),
           a.geofenceName || (a.position ? a.position.address : ''),
@@ -216,6 +216,12 @@ async function exportSpeedingReportToPDF (userData, reportData) {
   }
 }
 
+function getEventType (a, translations, device) {
+  let sensor
+  if (a.attributes.alarm === 'sensor') { sensor = device.attributes.sensor1 }
+  return sensor || translations.report['event_' + a.attributes.alarm] || a.attributes.alarm
+}
+
 function exportSpeedingReportToExcel (userData, reportData) {
   console.log('exportSpeedingReportToExcel')
 
@@ -242,7 +248,7 @@ function exportSpeedingReportToExcel (userData, reportData) {
         return {
           name: d.device.name,
           eventType: a.type === 'alarm'
-            ? translations.report['event_' + a.attributes.alarm] || a.attributes.alarm
+            ? getEventType(a, translations, d.device)
             : translations.report['event_' + a.type],
           fixTime: getAlertDate(userData.user, a),
           address: a.geofenceName || (a.position ? a.position.address : ''),

package/src/zone-report.js

@@ -3,6 +3,7 @@ const automaticReports = require('./automaticReports')
 const { convertMS, convertToLocaleString, getTranslations, convertToFeature, convertPositionToFeature } = require('./util/utils')
 const jsPDF = require('jspdf')
 require('jspdf-autotable')
+const traccarHelper = require('./util/traccar')
 const { headerFromUser } = require('./util/pdfDocument')
 const { getStyle } = require('./reportStyle')
 const { getUserPartner } = require('fleetmap-partners')
@@ -63,14 +64,15 @@ async function createZoneReport (from, to, userData, traccar) {
 
   let deviceCount = 0
   for (const slice of sliced) {
-    const data = await getAllInOne(
+    const data = await traccarHelper.getAllInOne(
       traccar, from, to, slice, true, false, false, false,
-      deviceCount, devices.length, sliceSize, deviceChunk, undefined, userData)
+      deviceCount, devices.length, sliceSize, deviceChunk, undefined)
 
-    console.log('Geofence Enter/Exit Alerts:' + data.length)
+    const alerts = getInAndOutEvents(slice, data.route, userData)
+    console.log('Geofence Enter/Exit Alerts:' + alerts.length)
 
-    if (data.length) {
-      allData.devices.push(...await processDevices(from, to, devices, userData.drivers, userData.geofences, data, traccar))
+    if (alerts.length) {
+      allData.devices.push(...await processDevices(from, to, devices, userData.drivers, userData.geofences, alerts, traccar))
     }
     deviceCount = deviceCount + slice.length
   }
@@ -80,47 +82,6 @@ async function createZoneReport (from, to, userData, traccar) {
   return reportData
 }
 
-async function getRoute (
-  traccar,
-  from,
-  to,
-  devices,
-  currentDeviceCount = 0,
-  totalDevices = devices.length,
-  sliceSize = 5,
-  devicesPerRequest = 1,
-  counter = undefined,
-  userData) {
-  const url = `/reports/allinone?from=${from.toISOString()}&to=${to.toISOString()}&type=route`
-  const sliced = automaticReports.sliceArray(devices, sliceSize)
-  const result = []
-  console.log('getAll, slicing', sliceSize)
-  let iteration = 0
-  for (const chunk of sliced) {
-    console.log('iteration', ++iteration)
-    const requests = []
-    for (const _chunk of automaticReports.sliceArray(chunk, devicesPerRequest)) {
-      const u = url + '&' + _chunk.map(d => `deviceId=${d.id}`).join('&')
-      requests.push(
-        traccar.axios.get(u, {
-          jar: traccar.cookieJar,
-          withCredentials: true
-        }).then(r => r.data).then(x => {
-          if (counter) {
-            counter.count += devicesPerRequest
-            console.log(`PROGRESS_PERC:${counter.count / totalDevices * 100}`)
-          } else {
-            currentDeviceCount += devicesPerRequest
-            console.log(`PROGRESS_PERC:${currentDeviceCount / totalDevices * 100}`)
-          }
-          return getInAndOutEvents(devices, x.route, userData)
-        }))
-    }
-    result.push(...(await Promise.all(requests)))
-  }
-  return result.flat()
-}
-
 async function processDevices (from, to, devices, drivers, geofences, data) {
   const devicesResult = []