fleetmap-reports 2.0.42 → 2.0.44

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fleetmap-reports",
-  "version": "2.0.42",
+  "version": "2.0.44",
   "description": "",
   "main": "src/index.js",
   "scripts": {
@@ -18,7 +18,7 @@
     "country-reverse-geocoding": "^0.2.2",
     "docx": "^7.3.0",
     "file-saver": "^2.0.5",
-    "fleetmap-partners": "1.0.161",
+    "fleetmap-partners": "1.0.164",
     "json-as-xlsx": "2.5.6",
     "jspdf": "^2.5.1",
     "jspdf-autotable": "3.8.1",

package/src/speeding-report.js

@@ -8,7 +8,9 @@ require('jspdf-autotable')
 const { getStyle } = require('./reportStyle')
 const drivers = require('./util/driver')
 const here = require('./here')
-const { getUserPartner } = require('fleetmap-partners')
+const {
+  getUserPartner
+} = require('fleetmap-partners')
 const traccarHelper = require('./util/traccar')
 const { devicesToProcess } = require('./util/device')
 const { point } = require('@turf/helpers')
@@ -18,6 +20,7 @@ const booleanPointInPolygon = require('@turf/boolean-point-in-polygon')
 const automaticReports = require('./automaticReports')
 const { default: axios } = require('axios')
 const { getDriverName, getDriverData } = require('./util/driver')
+const { getServerHost } = require('./util')
 
 const fileName = 'SpeedingReport'
 const eventTypes = ['deviceOverspeed']
@@ -123,7 +126,7 @@ async function createSpeedingReportByDriver (from, to, userData, traccarInstance
 
 async function getEvents (traccarInstance, from, to, devices, userData, deviceCount, totalDevices, sliceSize) {
   if (processServerSide()) {
-    const url = `https://${process.env.SERVER_HOST}/reports/speeding-report/getEvents`
+    const url = `https://${getServerHost()}/reports/speeding-report/getEvents`
     return axios.post(url, { from, to, devices, userData, deviceCount, totalDevices, sliceSize }, { withCredentials: true }).then(d => d.data)
   } else {
     const geofencesFeatures = userData.geofences.filter(g => g.area.startsWith('POLYGON') &&

package/src/util/index.js

@@ -1,7 +1,13 @@
 const { devicesToProcess } = require('./device')
 const { isClientSide } = require('./utils')
+const { newDomains } = require('fleetmap-partners')
 
 exports.processServerSide = (userData) => {
   const devices = devicesToProcess(userData)
   return devices.length > 100 && isClientSide()
 }
+
+exports.getServerHost = () =>
+  isClientSide() && newDomains.includes(window.location.hostname)
+    ? `${window.location.hostname}/pinmeapi`
+    : process.env.SERVER_HOST

package/src/util/traccar.js

@@ -81,7 +81,7 @@ async function getAllInOne (
   devicesPerRequest = 1,
   counter = undefined,
   ignorePercentage = false) {
-  let url = `/reports/10240/allinone?from=${from.toISOString()}&to=${to.toISOString()}`
+  let url = `/reports/allinone?from=${from.toISOString()}&to=${to.toISOString()}`
   if (getRoutes) url += '&type=route'
   if (getTrips) url += '&type=trips'
   if (getStops) url += '&type=stops'

package/src/util/utils.js

@@ -2,6 +2,7 @@ const turf = require('@turf/helpers')
 const { getUserPartner } = require('fleetmap-partners')
 const messages = require('../../lang')
 const distance = require('@turf/distance')
+const { getServerHost } = require('./index')
 
 exports.getTranslations = (userData) => {
   const lang = this.getLanguage(userData)
@@ -234,7 +235,7 @@ async function executeServerSide (type, sliced, from, to, userData, totalItems,
   for (let i = 0; i < sliced.length; i += maxRequests) {
     const _sliced = sliced.slice(i, i + maxRequests)
     await Promise.all(_sliced.map(async items => {
-      const url = `https://${process.env.SERVER_HOST}/reports/${type}`
+      const url = `https://${getServerHost()}/reports/${type}`
       try {
         const data = await axios.post(url, {
           from,

package/src/zone-report.js

@@ -12,8 +12,7 @@ const traccarHelper = require('./util/traccar')
 const { headerFromUser, addTable } = require('./util/pdfDocument')
 const { getStyle } = require('./reportStyle')
 const {
-  getUserPartner,
-  newDomains
+  getUserPartner
 } = require('fleetmap-partners')
 const { devicesToProcess } = require('./util/device')
 const {
@@ -23,6 +22,7 @@ const {
 const { checkGeofenceIn } = require('./util/geofence')
 const { parallel } = require('./util/parallel')
 const { getDataByDay } = require('./util/trips')
+const { getServerHost } = require('./util')
 const sliceSize = 100
 const deviceChunk = 5
 const fileName = 'ZoneReport'
@@ -35,12 +35,8 @@ async function createZoneReport (from, to, userData, traccar) {
     xpert: devices.filter(d => d.attributes.xpert).length > 0
   }
 
-  const serverHost = isClientSide() && newDomains.includes(window.location.hostname)
-    ? `${window.location.hostname}/pinmeapi`
-    : process.env.SERVER_HOST
-
   if (isClientSide()) {
-    const url = `https://${serverHost}/reports/zone-report/`
+    const url = `https://${getServerHost()}/reports/zone-report/`
     return traccar.axios.post(url, { from, to, userData }, { withCredentials: true })
       .then(d => d.data)
   }
@@ -714,9 +710,11 @@ function exportZoneReportToExcel (userData, reportData) {
       { label: translations.report.vehicle, value: 'name' },
       { label: translations.report.date, value: 'date' }
     ])
-    reportData.devices[0].days[0].geofences.forEach(g =>
-      headers.push({ label: g.geofenceName, value: '' + g.geofenceId })
-    )
+    if (reportData.devices.length) {
+      reportData.devices[0].days[0].geofences.forEach(g =>
+        headers.push({ label: g.geofenceName, value: '' + g.geofenceId })
+      )
+    }
     headers.push({ label: translations.report.distanceOut || 'Kms Afuera', value: 'distanceOut', format: '0' })
   } else if (userData.tripsBetweenZones) {
     headers.push(...[