fleetmap-reports 1.0.404 → 1.0.407

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fleetmap-reports",
-  "version": "1.0.404",
+  "version": "1.0.407",
   "description": "",
   "main": "src/index.js",
   "scripts": {
@@ -10,9 +10,9 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
+    "@turf/boolean-point-in-polygon": "^6.5.0",
     "@turf/distance": "^6.5.0",
     "@turf/helpers": "^6.5.0",
-    "@turf/point-on-feature": "^6.5.0",
     "@turf/point-to-line-distance": "^6.5.0",
     "axios": "^0.21.1",
     "axios-cookiejar-support": "^1.0.1",

package/src/index.test.js

@@ -147,12 +147,13 @@ describe('Test_Reports', function () {
     const report = await getReports()
     const userData = await report.getUserData()
     userData.byDriver = true
-    const data = await report.locationReport(new Date(2021, 11, 6, 0, 0, 0, 0),
-      new Date(2021, 11, 9, 23, 59, 59, 0),
+    const data = await report.locationReport(
+      new Date(Date.UTC(2021, 11, 6, 0, 0, 0, 0)),
+      new Date(Date.UTC(2021, 11, 9, 23, 59, 59, 0)),
       userData)
-
     assert.equal(data.length, 1)
     const driver = data[0].drivers.find(d => d.driver.id === 14020)
+    console.log(driver.positions)
     assert.equal(driver.positions.length, 85) // Total Positions
   }, 20000)
   // eslint-disable-next-line no-undef
@@ -338,19 +339,20 @@ describe('Test_Reports', function () {
     const device = data[0].devices.find(d => d.device.id === 25508)
     assert.equal(device.days.length, 25)
   }, 30000)
-  /*   it('Zone Report', async () => {
-        const report = await getReports()
-        const userData = await report.getUserData()
-        const data = await report.zoneReport(new Date(2022, 3, 25, 0, 0, 0, 0),
-            new Date(2022, 3, 28, 23, 59, 59, 0),
-            userData)
+  // eslint-disable-next-line no-undef
+  it('Zone Report', async () => {
+    const report = await getReports()
+    const userData = await report.getUserData()
+    const data = await report.zoneReport(new Date(2022, 3, 25, 0, 0, 0, 0),
+      new Date(2022, 3, 28, 23, 59, 59, 0),
+      userData)
 
-        assert.equal(data.length, 1)
-        const device = data[0].devices.find(d => d.device.id===22326)
-        assert.equal(device.geofences.length, 11)
-        assert.equal(device.geofences[0].inTime.fixTime, '2022-04-25T23:48:05.000+0000')
-        assert.equal(device.geofences[0].outTime.fixTime, '2022-04-26T07:47:35.000+0000')
-        assert.equal(device.geofences[0].totalTime, '28770')
-        assert.equal(device.geofences[0].geofenceName, 'Casa João')
-    }, 30000) */
+    assert.equal(data.length, 1)
+    const device = data[0].devices.find(d => d.device.id === 22326)
+    assert.equal(device.geofences.length, 19)
+    assert.equal(device.geofences[0].inTime.fixTime, '2022-04-25T23:47:58.000+0000')
+    assert.equal(device.geofences[0].outTime.fixTime, '2022-04-26T07:47:35.000+0000')
+    assert.equal(device.geofences[0].totalTime, '28777')
+    assert.equal(device.geofences[0].geofenceName, 'Casa João')
+  }, 30000)
 })

package/src/util/traccar.js

@@ -65,27 +65,45 @@ async function getSummary (traccar, from, to, devices) {
   return result.map(r => r.data).flat()
 }
 
-async function getAllInOne (traccar, from, to, devices, getRoutes, getTrips, getStops, getSummary, currentDeviceCount = 0, totalDevices = devices.length) {
-  let url = `/reports/allinone?&from=${from.toISOString()}&to=${to.toISOString()}`
+async function getAllInOne (
+  traccar,
+  from,
+  to,
+  devices,
+  getRoutes,
+  getTrips,
+  getStops,
+  getSummary,
+  currentDeviceCount = 0,
+  totalDevices = devices.length,
+  sliceSize = 5,
+  vehiclesByRequest = 1) {
+  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'
   if (getSummary) url += '&type=summary'
 
-  const sliced = automaticReports.sliceArray(devices, 5)
+  console.log('getAllInOn', devices.map(d => d.id))
+
+  const sliced = automaticReports.sliceArray(devices, sliceSize)
   const result = []
-  let deviceCount = currentDeviceCount
   for (const chunk of sliced) {
-    const requests = chunk.map(d =>
-      traccar.axios.get(url + '&' + `deviceId=${d.id}`, {
-        jar: traccar.cookieJar,
-        withCredentials: true
-      }).then(r => r.data).then(x => {
-        console.log('LOADING_MESSAGE:' + d.name)
-        deviceCount = deviceCount + 1
-        console.log(`PROGRESS_PERC:${deviceCount / totalDevices * 100}`)
-        return x
-      }))
+    const requests = []
+    for (const _chunk of automaticReports.sliceArray(chunk, vehiclesByRequest)) {
+      const u = url + '&' + _chunk.map(d => `deviceId=${d.id}`).join('&')
+      console.log(u)
+      requests.push(
+        traccar.axios.get(u, {
+          jar: traccar.cookieJar,
+          withCredentials: true
+        }).then(r => r.data).then(x => {
+          console.log('LOADING_MESSAGE:' + _chunk[0].name)
+          currentDeviceCount += vehiclesByRequest
+          console.log(`PROGRESS_PERC:${currentDeviceCount / totalDevices * 100}`)
+          return x
+        }))
+    }
     result.push(...(await Promise.all(requests)))
   }
   return {

package/src/zone-report.js

@@ -1,352 +1,353 @@
 const moment = require('moment')
-const automaticReports = require("./automaticReports")
-const {convertMS, convertToLocaleString, getTranslations, convertToFeature, convertPositionToFeature} = require("./util/utils")
+const automaticReports = require('./automaticReports')
+const { convertMS, convertToLocaleString, getTranslations, convertToFeature, convertPositionToFeature } = require('./util/utils')
 const jsPDF = require('jspdf')
 require('jspdf-autotable')
-const {headerFromUser} = require("./util/pdfDocument")
-const {getStyle} = require("./reportStyle")
-const {getUserPartner} = require("fleetmap-partners")
-const {devicesToProcess} = require("./util/device")
-const traccarHelper = require("./util/traccar")
-const pointToLineDistance = require("@turf/point-to-line-distance")
-const pointOnFeature = require("@turf/point-on-feature")
-const distance = require("@turf/distance")
+const { headerFromUser } = require('./util/pdfDocument')
+const { getStyle } = require('./reportStyle')
+const { getUserPartner } = require('fleetmap-partners')
+const { devicesToProcess } = require('./util/device')
+const traccarHelper = require('./util/traccar')
+const pointToLineDistance = require('@turf/point-to-line-distance')
+const booleanPointInPolygon = require('@turf/boolean-point-in-polygon')
+const distance = require('@turf/distance')
 
 const fileName = 'ZoneReport'
 
-async function createZoneReport(from, to, userData, traccar) {
-    console.log('Create ZoneReport')
-    const reportData = []
-    const types = ['geofenceEnter', "geofenceExit"]
-
-    if(userData.byGroup){
-        console.log("ByGroup")
-        for (const g of userData.groups) {
-            const devices = userData.devices.filter(d => d.groupId === g.id)
-            console.log(g.name + ' devices:' + devices.length)
-            if(devices.length > 0) {
-                const groupData = {
-                    devices: [],
-                    group: g,
-                    xpert: devices.filter(d => d.attributes.xpert).length > 0
-                }
-
-                const response = await traccar.reports.reportsEventsGet(from, to, null, [g.id], types)
-                const data = response.data
+async function createZoneReport (from, to, userData, traccar) {
+  console.log('Create ZoneReport')
+  const reportData = []
+  const types = ['geofenceEnter', 'geofenceExit']
+
+  if (userData.byGroup) {
+    console.log('ByGroup')
+    for (const g of userData.groups) {
+      const devices = userData.devices.filter(d => d.groupId === g.id)
+      console.log(g.name + ' devices:' + devices.length)
+      if (devices.length > 0) {
+        const groupData = {
+          devices: [],
+          group: g,
+          xpert: devices.filter(d => d.attributes.xpert).length > 0
+        }
 
-                console.log('Geofence Enter/Exit Alerts:'+data.length)
+        const response = await traccar.reports.reportsEventsGet(from, to, null, [g.id], types)
+        const data = response.data
 
-                devices.sort((a, b) => (a.name > b.name) ? 1 : -1)
+        console.log('Geofence Enter/Exit Alerts:' + data.length)
 
-                if (data.length > 0) {
-                    groupData.devices = await processDevices(from, to, devices, userData.drivers, userData.geofences, data)
+        devices.sort((a, b) => (a.name > b.name) ? 1 : -1)
 
-                    reportData.push(groupData)
-                }
-            }
+        if (data.length > 0) {
+          groupData.devices = await processDevices(from, to, devices, userData.drivers, userData.geofences, data)
+          reportData.push(groupData)
         }
+      }
     }
+  }
 
-    const devices = devicesToProcess(userData)
+  const devices = devicesToProcess(userData)
 
-    const allData = {
-        devices: [],
-        xpert: devices.filter(d => d.attributes.xpert).length > 0
-    }
+  const allData = {
+    devices: [],
+    xpert: devices.filter(d => d.attributes.xpert).length > 0
+  }
 
-    const sliced = automaticReports.sliceArray(devices, 5)
+  const sliced = automaticReports.sliceArray(devices, 5)
 
-    let deviceCount = 0
-    for(const slice of sliced) {
-        const allInOne = await traccarHelper.getAllInOne(traccar, from, to, slice, true, false, false, false, deviceCount, devices.length)
-        const routeData = allInOne.route
+  let deviceCount = 0
+  for (const slice of sliced) {
+    const allInOne = await traccarHelper.getAllInOne(traccar, from, to, slice, true, false, false, false, deviceCount, devices.length, 30, 10)
+    const routeData = allInOne.route
 
-        const data = getInAndOutEvents(slice, routeData, userData)
+    const data = getInAndOutEvents(slice, routeData, userData)
 
-        console.log('Geofence Enter/Exit Alerts:' + data.length)
+    console.log('Geofence Enter/Exit Alerts:' + data.length)
 
-        if (data.length) {
-            allData.devices.push(...await processDevices(from, to, devices, userData.drivers, userData.geofences, data, traccar))
-        }
-        deviceCount = deviceCount + slice.length
+    if (data.length) {
+      allData.devices.push(...await processDevices(from, to, devices, userData.drivers, userData.geofences, data, traccar))
     }
+    deviceCount = deviceCount + slice.length
+  }
 
-    reportData.push(allData)
+  reportData.push(allData)
 
-    return reportData
+  return reportData
 }
 
-async function processDevices(from, to, devices, drivers, geofences, data) {
-    const devicesResult = []
-
-    for (const d of devices) {
-        const alerts = data.filter(t => t.deviceId===d.id)
-        if(alerts.length > 0) {
-            //const response = await traccar.reports.reportsRouteGet(from, to, [d.id])
-
-            const zoneInOutData = []
-            const zoneInData = {}
-            //const positions = response.data
-
-            alerts.forEach(a => {
-                //a.position = positions.find(p => p.id === a.positionId)
-                if (a.position) {
-                    if (a.type === 'geofenceEnter') {
-                        const driver = drivers.find(d => a.position.attributes && d.uniqueId === a.position.attributes.driverUniqueId)
-                        a.position.driverName = driver ? driver.name : ''
-                        zoneInData[a.geofenceId] = a
-                    } else if (a.type === 'geofenceExit') {
-                        const geofence = geofences.find(g => g.id === a.geofenceId)
-                        if (zoneInData[a.geofenceId]) {
-                            const totalInTime = moment(a.position.fixTime).diff(moment(zoneInData[a.geofenceId].position.fixTime), 'seconds')
-                            if (geofence) {
-                                zoneInOutData.push({
-                                    inTime: zoneInData[a.geofenceId].position,
-                                    outTime: a.position,
-                                    totalTime: totalInTime,
-                                    geofenceName: geofence.name,
-                                    driverName: zoneInData[a.geofenceId].position.driverName
-                                })
-                            }
-                            zoneInData[a.geofenceId] = null
-                        } else {
-                            if (geofence) {
-                                zoneInOutData.push({
-                                    outTime: a.position,
-                                    geofenceName: geofence.name,
-                                    driverName: ''
-                                })
-                            }
-                        }
-                    }
-                }
-            })
-
-            for (const i in zoneInData) {
-                if(zoneInData[i]) {
-                    const geofence = geofences.find(g => g.id === zoneInData[i].geofenceId)
-                    if(geofence) {
-                        zoneInOutData.push({
-                            inTime: zoneInData[i].position,
-                            geofenceName: geofence.name,
-                            driverName: zoneInData[i].position.driverName
-                        })
-                    }
-                }
-            }
-
-            if(zoneInOutData.length > 0) {
-                devicesResult.push({
-                    device: d,
-                    from: from,
-                    to: to,
-                    geofences: zoneInOutData,
+async function processDevices (from, to, devices, drivers, geofences, data) {
+  const devicesResult = []
+
+  for (const d of devices) {
+    const alerts = data.filter(t => t.deviceId === d.id)
+    if (alerts.length > 0) {
+      // const response = await traccar.reports.reportsRouteGet(from, to, [d.id])
+
+      const zoneInOutData = []
+      const zoneInData = {}
+      // const positions = response.data
+
+      alerts.forEach(a => {
+        // a.position = positions.find(p => p.id === a.positionId)
+        if (a.position) {
+          if (a.type === 'geofenceEnter') {
+            const driver = drivers.find(d => a.position.attributes && d.uniqueId === a.position.attributes.driverUniqueId)
+            a.position.driverName = driver ? driver.name : ''
+            zoneInData[a.geofenceId] = a
+          } else if (a.type === 'geofenceExit') {
+            const geofence = geofences.find(g => g.id === a.geofenceId)
+            if (zoneInData[a.geofenceId]) {
+              const totalInTime = moment(a.position.fixTime).diff(moment(zoneInData[a.geofenceId].position.fixTime), 'seconds')
+              if (geofence) {
+                zoneInOutData.push({
+                  inTime: zoneInData[a.geofenceId].position,
+                  outTime: a.position,
+                  totalTime: totalInTime,
+                  geofenceName: geofence.name,
+                  driverName: zoneInData[a.geofenceId].position.driverName
+                })
+              }
+              zoneInData[a.geofenceId] = null
+            } else {
+              if (geofence) {
+                zoneInOutData.push({
+                  outTime: a.position,
+                  geofenceName: geofence.name,
+                  driverName: ''
                 })
+              }
             }
+          }
         }
+      })
+
+      for (const i in zoneInData) {
+        if (zoneInData[i]) {
+          const geofence = geofences.find(g => g.id === zoneInData[i].geofenceId)
+          if (geofence) {
+            zoneInOutData.push({
+              inTime: zoneInData[i].position,
+              geofenceName: geofence.name,
+              driverName: zoneInData[i].position.driverName
+            })
+          }
+        }
+      }
+
+      if (zoneInOutData.length > 0) {
+        devicesResult.push({
+          device: d,
+          from,
+          to,
+          geofences: zoneInOutData
+        })
+      }
     }
+  }
 
-    return devicesResult
+  return devicesResult
 }
 
-function getInAndOutEvents(devices, route, userData) {
-    const events = []
-    devices.forEach(d => {
-        const deviceRoute = route.filter(p => p.deviceId === d.id)
-
-        const routePoints = deviceRoute.map(p => convertPositionToFeature(p))
-        const geofencesFeatures = userData.geofences.map(g => convertToFeature(g))
-
-        const entryMap = []
-        routePoints.forEach(p => {
-            geofencesFeatures.forEach(g => {
-                if(g.geometry.type === 'Polygon') {
-                    if (pointOnFeature(p, g)) {
-                        if (!entryMap.includes(g)) {
-                            events.push(createEvent('geofenceEnter',d.id,p,g))
-                            entryMap.push(g)
-                        }
-                    } else {
-                        if (entryMap.includes(g)) {
-                            events.push(createEvent('geofenceExit',d.id,p,g))
-                            const index = entryMap.indexOf(g)
-                            entryMap.splice(index, 1)
-                        }
-                    }
-                }
-                if(g.geometry.type === 'Point') {
-                    if (distance.default(p, g, {units: 'meters'}) < g.properties.distance) {
-                        if (!entryMap.includes(g)) {
-                            events.push(createEvent('geofenceEnter',d.id,p,g))
-                            entryMap.push(g)
-                        }
-                    } else {
-                        if (entryMap.includes(g)) {
-                            events.push(createEvent('geofenceExit',d.id,p,g))
-                            const index = entryMap.indexOf(g)
-                            entryMap.splice(index, 1)
-                        }
-                    }
-                }
-                if(g.geometry.type === 'LineString') {
-                    if (pointToLineDistance(p, g,{units: 'meters'}) < (g.properties.geofence.attributes.polylineDistance || 25)) {
-                        if (!entryMap.includes(g)) {
-                            events.push(createEvent('geofenceEnter',d.id,p,g))
-                            entryMap.push(g)
-                        }
-                    } else {
-                        if (entryMap.includes(g)) {
-                            events.push(createEvent('geofenceExit',d.id,p,g))
-                            const index = entryMap.indexOf(g)
-                            entryMap.splice(index, 1)
-                        }
-                    }
-                }
-            })
-        })
+function getInAndOutEvents (devices, route, userData) {
+  const events = []
+  devices.forEach(d => {
+    const deviceRoute = route.filter(p => p.deviceId === d.id)
+
+    const routePoints = deviceRoute.map(p => convertPositionToFeature(p))
+    const geofencesFeatures = userData.geofences.map(g => convertToFeature(g))
+
+    const entryMap = []
+    routePoints.forEach(p => {
+      geofencesFeatures.forEach(g => {
+        if (g.geometry.type === 'Polygon') {
+          if (booleanPointInPolygon.default(p, g)) {
+            if (!entryMap.includes(g)) {
+              events.push(createEvent('geofenceEnter', d.id, p, g))
+              entryMap.push(g)
+            }
+          } else {
+            if (entryMap.includes(g)) {
+              events.push(createEvent('geofenceExit', d.id, p, g))
+              const index = entryMap.indexOf(g)
+              entryMap.splice(index, 1)
+            }
+          }
+        }
+        if (g.geometry.type === 'Point') {
+          if (distance.default(p, g, { units: 'meters' }) < g.properties.distance) {
+            if (!entryMap.includes(g)) {
+              events.push(createEvent('geofenceEnter', d.id, p, g))
+              entryMap.push(g)
+            }
+          } else {
+            if (entryMap.includes(g)) {
+              events.push(createEvent('geofenceExit', d.id, p, g))
+              const index = entryMap.indexOf(g)
+              entryMap.splice(index, 1)
+            }
+          }
+        }
+        if (g.geometry.type === 'LineString') {
+          if (pointToLineDistance.default(p, g, { units: 'meters' }) < (g.properties.geofence.attributes.polylineDistance || 25)) {
+            if (!entryMap.includes(g)) {
+              events.push(createEvent('geofenceEnter', d.id, p, g))
+              entryMap.push(g)
+            }
+          } else {
+            if (entryMap.includes(g)) {
+              events.push(createEvent('geofenceExit', d.id, p, g))
+              const index = entryMap.indexOf(g)
+              entryMap.splice(index, 1)
+            }
+          }
+        }
+      })
     })
+  })
 
-    return events
+  return events
 }
 
-function createEvent(type, deviceId, p, g) {
-    return {
-        type: type,
-        position: p.properties.position,
-        geofenceId: g.properties.geofence.id,
-        deviceId: deviceId
-    }
+function createEvent (type, deviceId, p, g) {
+  return {
+    type,
+    position: p.properties.position,
+    geofenceId: g.properties.geofence.id,
+    deviceId
+  }
 }
 
-async function exportZoneReportToPDF(userData, reportData) {
-    console.log('Export to PDF')
-
-    const timezone = userData.user.attributes.timezone
-    const translations = getTranslations(userData)
-    const lang = userData.user.attributes.lang || (navigator && navigator.language)
-
-    const headers = [
-        translations.report.enter,
-        translations.report.exit,
-        translations.report.duration,
-        translations.report.geofence,
-        translations.report.driver
-    ]
-    if (reportData.devices) {
-        let first = true
-        const doc = new jsPDF.jsPDF('l')
-        await headerFromUser(doc, translations.report.titleZoneReport, userData.user)
-
-        reportData.devices.forEach(d => {
-            let data = []
-            const name = deviceName(d.device)
-            const group = userData.groups.find(g => d.device.groupId === g.id)
-
-            let space = 0
-            if(!first) {
-                doc.addPage()
-            } else {
-                first = false
-                space = 10
-            }
-            doc.setFontSize(13)
-            doc.text(name, 20, space+20 )
-            doc.setFontSize(11)
-            doc.text(group ? translations.report.group + ': ' + group.name : '', 200, space+20 )
-            doc.text(convertToLocaleString(d.from, lang, timezone) + ' - ' + convertToLocaleString(d.to, lang, timezone), 20, space+25 )
-            d.geofences.map(a => {
-                const temp = [
-                    geofenceEnter(userData.user, a),
-                    geofenceExit(userData.user, a),
-                    a.totalTime ? convertMS(a.totalTime * 1000, true) : '',
-                    a.geofenceName,
-                    a.driverName
-                ]
-                data.push(temp)
-            })
-
-            const footValues = [
-                'Total:' + d.geofences.length
-            ]
-
-            const style = getStyle(getUserPartner(userData.user))
-            doc.autoTable({
-                head: [headers],
-                body: data,
-                foot: [footValues],
-                showFoot: 'lastPage',
-                headStyles: {
-                    fillColor: style.pdfHeaderColor,
-                    textColor: style.pdfHeaderTextColor,
-                    fontSize: 10
-                },
-                bodyStyles: {
-                    fillColor: style.pdfBodyColor,
-                    textColor: style.pdfBodyTextColor,
-                    fontSize: 8
-                },
-                footStyles: {
-                    fillColor: style.pdfFooterColor,
-                    textColor: style.pdfFooterTextColor,
-                    fontSize: 9
-                },
-                startY: space+35 });
-        })
+async function exportZoneReportToPDF (userData, reportData) {
+  console.log('Export to PDF')
+
+  const timezone = userData.user.attributes.timezone
+  const translations = getTranslations(userData)
+  const lang = userData.user.attributes.lang || (navigator && navigator.language)
+
+  const headers = [
+    translations.report.enter,
+    translations.report.exit,
+    translations.report.duration,
+    translations.report.geofence,
+    translations.report.driver
+  ]
+  if (reportData.devices) {
+    let first = true
+    // eslint-disable-next-line new-cap
+    const doc = new jsPDF.jsPDF('l')
+    await headerFromUser(doc, translations.report.titleZoneReport, userData.user)
+
+    reportData.devices.forEach(d => {
+      const data = []
+      const name = deviceName(d.device)
+      const group = userData.groups.find(g => d.device.groupId === g.id)
+
+      let space = 0
+      if (!first) {
+        doc.addPage()
+      } else {
+        first = false
+        space = 10
+      }
+      doc.setFontSize(13)
+      doc.text(name, 20, space + 20)
+      doc.setFontSize(11)
+      doc.text(group ? translations.report.group + ': ' + group.name : '', 200, space + 20)
+      doc.text(convertToLocaleString(d.from, lang, timezone) + ' - ' + convertToLocaleString(d.to, lang, timezone), 20, space + 25)
+      d.geofences.forEach(a => {
+        const temp = [
+          geofenceEnter(userData.user, a),
+          geofenceExit(userData.user, a),
+          a.totalTime ? convertMS(a.totalTime * 1000, true) : '',
+          a.geofenceName,
+          a.driverName
+        ]
+        data.push(temp)
+      })
+
+      const footValues = [
+        'Total:' + d.geofences.length
+      ]
+
+      const style = getStyle(getUserPartner(userData.user))
+      doc.autoTable({
+        head: [headers],
+        body: data,
+        foot: [footValues],
+        showFoot: 'lastPage',
+        headStyles: {
+          fillColor: style.pdfHeaderColor,
+          textColor: style.pdfHeaderTextColor,
+          fontSize: 10
+        },
+        bodyStyles: {
+          fillColor: style.pdfBodyColor,
+          textColor: style.pdfBodyTextColor,
+          fontSize: 8
+        },
+        footStyles: {
+          fillColor: style.pdfFooterColor,
+          textColor: style.pdfFooterTextColor,
+          fontSize: 9
+        },
+        startY: space + 35
+      })
+    })
 
-        return doc
-    }
+    return doc
+  }
 }
 
-function exportZoneReportToExcel(userData, reportData) {
-    console.log('Export to Excel')
-
-    const translations = getTranslations(userData)
-
-    const settings = {
-        sheetName: translations.report.titleActivityReport, // The name of the sheet
-        fileName: fileName, // The name of the spreadsheet
-    }
-    const headers = [
-        {label: translations.report.vehicle, value:'name'},
-        {label: translations.report.enter, value:'enter'},
-        {label: translations.report.exit, value:'exit'},
-        {label: translations.report.duration, value:'duration'},
-        {label: translations.report.geofence, value:'zone'},
-        {label: translations.report.driver, value:'driver'},
-    ]
-    let data = []
-    if (reportData.devices) {
-        reportData.devices.forEach(d => {
-            data = data.concat([{}])
-            data = data.concat(d.geofences.map(a => {
-                return {
-                    name: d.device.name,
-                    enter: geofenceEnter(userData.user, a),
-                    exit: geofenceExit(userData.user, a),
-                    duration: a.totalTime ? convertMS(a.totalTime * 1000, true) : '',
-                    zone: a.geofenceName,
-                    driver: a.driverName
-                }
-            }))
-        })
-        console.log(data)
+function exportZoneReportToExcel (userData, reportData) {
+  console.log('Export to Excel')
+
+  const translations = getTranslations(userData)
+
+  const settings = {
+    sheetName: translations.report.titleActivityReport, // The name of the sheet
+    fileName // The name of the spreadsheet
+  }
+  const headers = [
+    { label: translations.report.vehicle, value: 'name' },
+    { label: translations.report.enter, value: 'enter' },
+    { label: translations.report.exit, value: 'exit' },
+    { label: translations.report.duration, value: 'duration' },
+    { label: translations.report.geofence, value: 'zone' },
+    { label: translations.report.driver, value: 'driver' }
+  ]
+  let data = []
+  if (reportData.devices) {
+    reportData.devices.forEach(d => {
+      data = data.concat([{}])
+      data = data.concat(d.geofences.map(a => {
         return {
-            headers,
-            data,
-            settings
+          name: d.device.name,
+          enter: geofenceEnter(userData.user, a),
+          exit: geofenceExit(userData.user, a),
+          duration: a.totalTime ? convertMS(a.totalTime * 1000, true) : '',
+          zone: a.geofenceName,
+          driver: a.driverName
         }
+      }))
+    })
+    console.log(data)
+    return {
+      headers,
+      data,
+      settings
     }
+  }
 }
 
-function deviceName(device){
-    return device.name + (device.attributes.license_plate ? ', ' +device.attributes.license_plate : '') + (device.model ? ', ' + device.model : '')
+function deviceName (device) {
+  return device.name + (device.attributes.license_plate ? ', ' + device.attributes.license_plate : '') + (device.model ? ', ' + device.model : '')
 }
 
-function geofenceEnter(user, row){
-    return row.inTime ? convertToLocaleString(row.inTime.fixTime, user.attributes.lang, user.attributes.timezone) : ''
+function geofenceEnter (user, row) {
+  return row.inTime ? convertToLocaleString(row.inTime.fixTime, user.attributes.lang, user.attributes.timezone) : ''
 }
-function geofenceExit(user, row){
-    return row.outTime ? convertToLocaleString(row.outTime.fixTime, user.attributes.lang, user.attributes.timezone) : ''
+function geofenceExit (user, row) {
+  return row.outTime ? convertToLocaleString(row.outTime.fixTime, user.attributes.lang, user.attributes.timezone) : ''
 }
 
 exports.createZoneReport = createZoneReport