fleetmap-reports 1.0.307 → 1.0.311

package/.idea/runConfigurations.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RunConfigurationProducerService">
+    <option name="ignoredProducers">
+      <set>
+        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
+      </set>
+    </option>
+  </component>
+</project>

package/package.json

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

package/src/activity-report.js

@@ -11,33 +11,28 @@ const traccar = require("./util/traccar")
 const {isInsideTimetable, isPartialInsideTimetable} = require("./util/trips");
 const trips = require("./util/trips");
 
-let traccarInstance
-let userData
-
 const fileName = 'ActivityReport'
 
-async function createActivityReport(from, to, reportUserData, traccar) {
+async function createActivityReport(from, to, userData, traccarInstance) {
     console.log('Create ActivityReport')
-    traccarInstance = traccar
-    userData = reportUserData
     const reportData = []
 
     if(userData.byDriver){
-        const allData = await createActivityReportByDriver(from, to)
+        const allData = await createActivityReportByDriver(from, to, userData, traccarInstance)
         reportData.push(allData)
     }
     else if(userData.byGroup){
-        const allData = await createActivityReportByGroup(from, to)
+        const allData = await createActivityReportByGroup(from, to, userData, traccarInstance)
         reportData.push(...allData)
     } else {
-        const allData = await createActivityReportByDevice(from, to)
+        const allData = await createActivityReportByDevice(from, to, userData, traccarInstance)
         reportData.push(allData)
     }
 
     return reportData
 }
 
-async function createActivityReportByGroup(from, to){
+async function createActivityReportByGroup(from, to, userData, traccarInstance){
     console.log("ByGroup")
     const reportData = []
     for (const g of userData.groups) {
@@ -76,7 +71,7 @@ async function createActivityReportByGroup(from, to){
     return reportData
 }
 
-async function createActivityReportByDevice(from, to){
+async function createActivityReportByDevice(from, to, userData, traccarInstance){
     const groupIds = userData.groups.map(g => g.id)
     const devicesToProcess = userData.byGroup ? userData.devices.filter(d => !groupIds.includes(d.groupId)) : userData.devices
 
@@ -127,7 +122,7 @@ async function createActivityReportByDevice(from, to){
     return allData
 }
 
-async function createActivityReportByDriver(from, to){
+async function createActivityReportByDriver(from, to, userData, traccarInstance){
     const devices = await drivers.devicesByDriver(traccarInstance, from, to, userData.drivers, userData.devices)
 
     let tripsData = []
@@ -143,13 +138,13 @@ async function createActivityReportByDriver(from, to){
         to: to
     }
 
-    allData.drivers = processDrivers(from, to, userData.drivers, {trips: tripsData, route: routeData})
+    allData.drivers = processDrivers(from, to, userData.drivers, {trips: tripsData, route: routeData}, userData)
 
     return allData
 }
 
 
-function processDevices(from, to, devices, data) {
+function processDevices(from, to, devices, data, userData) {
     const devicesResult = []
 
     devices.forEach(d => {
@@ -216,7 +211,7 @@ function processDevices(from, to, devices, data) {
     return devicesResult
 }
 
-function processDrivers(from, to, drivers, data) {
+function processDrivers(from, to, drivers, data, userData) {
     console.log(data)
     const driversResult = []
     drivers.forEach(d => {
@@ -269,20 +264,20 @@ async function exportActivityReportToPDF(userData, reportData) {
         await headerFromUser(doc, translations.report.titleActivityReport, userData.user)
 
         if(userData.groupByDay && userData.byDriver) {
-            exportActivityReportToPDF_Driver_GroupByDay(doc, translations, reportData)
+            exportActivityReportToPDF_Driver_GroupByDay(doc, translations, reportData, userData)
         } else if(userData.groupByDay) {
-            exportActivityReportToPDF_Vehicle_GroupByDay(doc, translations, reportData)
+            exportActivityReportToPDF_Vehicle_GroupByDay(doc, translations, reportData, userData)
         } else if(userData.byDriver) {
-            exportActivityReportToPDF_Driver(doc, translations, reportData)
+            exportActivityReportToPDF_Driver(doc, translations, reportData, userData)
         } else {
-            exportActivityReportToPDF_Vehicle(doc, translations, reportData)
+            exportActivityReportToPDF_Vehicle(doc, translations, reportData, userData)
         }
 
         return doc
     }
 }
 
-function exportActivityReportToPDF_Driver(doc, translations, reportData) {
+function exportActivityReportToPDF_Driver(doc, translations, reportData, userData) {
     const headers = [translations.report.driver,
         translations.report.distance,
         translations.report.speed + ' ' + translations.report.avgSpeed + ' (Km/h)',
@@ -314,7 +309,7 @@ function exportActivityReportToPDF_Driver(doc, translations, reportData) {
     addTable(doc, headers, data, footValues, style, 35)
 }
 
-function exportActivityReportToPDF_Vehicle(doc, translations, reportData) {
+function exportActivityReportToPDF_Vehicle(doc, translations, reportData, userData) {
     const headers = [translations.report.vehicle,
         translations.report.group,
         translations.report.distance,
@@ -359,7 +354,7 @@ function exportActivityReportToPDF_Vehicle(doc, translations, reportData) {
     addTable(doc, headers, data, footValues, style, 35)
 }
 
-function exportActivityReportToPDF_Vehicle_GroupByDay(doc, translations, reportData) {
+function exportActivityReportToPDF_Vehicle_GroupByDay(doc, translations, reportData, userData) {
     const headers = [translations.report.date,
         translations.report.distance,
         translations.report.start + ' ' + translations.report.odometer,
@@ -425,17 +420,17 @@ function exportActivityReportToPDF_Vehicle_GroupByDay(doc, translations, reportD
         const footValues = ['Total:' + d.summary.length,
             (d.summary.reduce((a, b) => a + b.distance, 0) / 1000).toFixed(0),
             '', '',
-            getSumAvgSpeed(d.summary),
-            getSumMaxSpeed(d.summary),
+            getSumAvgSpeed(d.summary, userData),
+            getSumMaxSpeed(d.summary, userData),
             convertMS(d.summary.reduce((a, b) => a + b.engineHours, 0)),
-            getSumSpentFuel(d.summary)]
+            getSumSpentFuel(d.summary, userData)]
 
         const style = getStyle(getUserPartner(userData.user))
         addTable(doc, headers, data, footValues, style, 40)
     })
 }
 
-function exportActivityReportToExcel_Vehicle_GroupByDay(settings, translations, reportData) {
+function exportActivityReportToExcel_Vehicle_GroupByDay(settings, translations, reportData, userData) {
     const headers = [{label: translations.report.vehicle, value: 'name'},
         {label: translations.report.group, value: 'group'},
         {label: translations.report.date, value: 'date'},
@@ -489,7 +484,7 @@ function exportActivityReportToExcel_Vehicle_GroupByDay(settings, translations,
     }
 }
 
-function exportActivityReportToPDF_Driver_GroupByDay(doc, translations, reportData) {
+function exportActivityReportToPDF_Driver_GroupByDay(doc, translations, reportData, userData) {
     const headers = [translations.report.date,
         translations.report.distance,
         translations.report.avgSpeed + ' (Km/h)',
@@ -557,7 +552,7 @@ function exportActivityReportToPDF_Driver_GroupByDay(doc, translations, reportDa
     })
 }
 
-function exportActivityReportToExcel_Driver_GroupByDay(settings, translations, reportData) {
+function exportActivityReportToExcel_Driver_GroupByDay(settings, translations, reportData, userData) {
     const headers = [{label: translations.report.driver, value: 'name'},
         {label: translations.report.group, value: 'group'},
         {label: translations.report.date, value: 'date'},
@@ -632,7 +627,7 @@ function exportActivityReportToExcel_Driver(settings, translations, reportData)
     }
 }
 
-function exportActivityReportToExcel_Vehicle(settings, translations, reportData) {
+function exportActivityReportToExcel_Vehicle(settings, translations, reportData, userData) {
     const headers = [{label: translations.report.vehicle, value: 'name'},
         {label: translations.report.group, value: 'group'},
         {label: translations.report.distance, value: 'distance'},
@@ -669,9 +664,8 @@ function exportActivityReportToExcel_Vehicle(settings, translations, reportData)
     }
 }
 
-function exportActivityReportToExcel(reportUserData, reportData) {
+function exportActivityReportToExcel(userData, reportData) {
     console.log('Export to Excel')
-    userData = reportUserData
     const lang = userData.user.attributes.lang
     const translations = messages[lang] ? messages[lang] : messages['en-GB']
 
@@ -681,17 +675,17 @@ function exportActivityReportToExcel(reportUserData, reportData) {
     }
 
     if(userData.groupByDay && userData.byDriver){
-        return exportActivityReportToExcel_Driver_GroupByDay(settings, translations, reportData)
+        return exportActivityReportToExcel_Driver_GroupByDay(settings, translations, reportData, userData)
     } else if(userData.groupByDay){
-        return exportActivityReportToExcel_Vehicle_GroupByDay(settings, translations, reportData)
+        return exportActivityReportToExcel_Vehicle_GroupByDay(settings, translations, reportData, userData)
     } else if(userData.byDriver){
-        return exportActivityReportToExcel_Driver(settings, translations, reportData)
+        return exportActivityReportToExcel_Driver(settings, translations, reportData, userData)
     } else {
-        return exportActivityReportToExcel_Vehicle(settings, translations, reportData)
+        return exportActivityReportToExcel_Vehicle(settings, translations, reportData, userData)
     }
 }
 
-function getSumAvgSpeed(data){
+function getSumAvgSpeed(data, userData){
     const values = data.map(item => {
         if(userData.groupByDay){
             return Math.round(item.averageSpeed * 1.85200)
@@ -702,7 +696,7 @@ function getSumAvgSpeed(data){
     return Math.round((values.reduce((a, b) => a + b, 0)) / values.length)
 }
 
-function getSumMaxSpeed(data){
+function getSumMaxSpeed(data, userData){
     const values = data.map(item => {
         if(userData.groupByDay){
             return item.maxSpeed
@@ -716,7 +710,7 @@ function getSumMaxSpeed(data){
     return Math.round(max * 1.85200)
 }
 
-function getSumSpentFuel(data){
+function getSumSpentFuel(data, userData){
     const values = data.map(item => {
         if(userData.groupByDay){
             return item.convertedSpentFuel >= 0 ? item.convertedSpentFuel : 0

package/src/events-report.js

@@ -9,10 +9,7 @@ const {convertToLocaleString} = require("./util/utils");
 
 const fileName = 'EventReport'
 
-let traccar
-
-async function createEventsReport(from, to, userData, traccarInstance) {
-    traccar = traccarInstance
+async function createEventsReport(from, to, userData, traccar) {
     console.log('Create EventsReport')
     const reportData = []
 
@@ -45,7 +42,7 @@ async function createEventsReport(from, to, userData, traccarInstance) {
 
     withoutGroupDevices.sort((a, b) => (a.name > b.name) ? 1 : -1)
 
-    const data = await getReportData(from, to, withoutGroupDevices, userData.eventTypes)
+    const data = await getReportData(from, to, withoutGroupDevices, userData.eventTypes, traccar)
 
     if(data.length > 0) {
         reportData.push({
@@ -57,7 +54,7 @@ async function createEventsReport(from, to, userData, traccarInstance) {
     return reportData
 }
 
-async function getReportData(from, to, devices, types) {
+async function getReportData(from, to, devices, types, traccar) {
     let data = []
     const arrayOfArrays = automaticReports.sliceArray(devices)
     const traccarTypes = new Set(types.map(t => t.startsWith('alarm') ? 'alarm' : t))

package/src/fuelconsumption-report.js

@@ -1,10 +1,7 @@
 const automaticReports = require("./automaticReports");
 const refuelingReport = require("./refueling-report");
 
-let traccar
-
-async function createFuelConsumptionReport(from, to, userData, traccarInstance) {
-    traccar = traccarInstance
+async function createFuelConsumptionReport(from, to, userData, traccar) {
     console.log('Create FuelConsumption Report')
 
     const reportData = []
@@ -60,12 +57,10 @@ async function createFuelConsumptionReport(from, to, userData, traccarInstance)
                 const dayTrips = groupedTrips.get(key)
                 const dayRefueling = groupedRefuelings.get(key)
                 const distance = dayTrips.reduce((a, b) => a + b.distance, 0)
-                let spentFuel = 0
-                if(d.attributes.xpert) {
-                    spentFuel = automaticReports.calculateXpertSpentFuel(key, positions)
-                } else {
-                    spentFuel = automaticReports.calculateSpentFuel(dayTrips.reduce((a, b) => a + b.spentFuel, 0), d)
-                }
+                let spentFuel = d.attributes.xpert ?
+                    automaticReports.calculateXpertSpentFuel(key, positions)
+                    :
+                    automaticReports.calculateSpentFuel(dayTrips.reduce((a, b) => a + b.spentFuel, 0), d)
 
                 const day = {
                     date: key,

package/src/idle-report.js

@@ -6,32 +6,26 @@ const {convertToLocaleString, convertMS} = require("./util/utils");
 const {getStyle} = require("./reportStyle");
 const {getUserPartner} = require("fleetmap-partners");
 
-
-let traccarInstance
-let userData
-
 const fileName = 'IdleReport'
 
-async function createIdleReport(from, to, reportUserData, traccar) {
+async function createIdleReport(from, to, userData, traccarInstance) {
     console.log('Create IdleReport')
-    userData = reportUserData
-    traccarInstance = traccar
     const reportData = []
 
     if (userData.byGroup) {
         console.log("ByGroup")
-        const allData = await createTripReportByGroup(from, to)
+        const allData = await createTripReportByGroup(from, to, userData, traccarInstance)
         reportData.push(...allData)
     } else {
         console.log("ByDevice")
-        const report = await createTripReportByDevice(from, to)
+        const report = await createTripReportByDevice(from, to, userData, traccarInstance)
         reportData.push(report)
     }
 
     return reportData
 }
 
-async function createTripReportByGroup(from, to) {
+async function createTripReportByGroup(from, to, userData, traccarInstance) {
     const reportData = []
     for (const g of userData.groups) {
         const devices = userData.devices.filter(d => d.groupId === g.id)
@@ -61,14 +55,13 @@ async function createTripReportByGroup(from, to) {
     const groupIds = userData.groups.map(g => g.id)
     const withoutGroupDevices = userData.devices.filter(d => !groupIds.includes(d.groupId))
 
-    const allData = await createTripReportByDevice(from, to, withoutGroupDevices)
+    const allData = await createTripReportByDevice(from, to, withoutGroupDevices, userData, traccarInstance)
     reportData.push(allData)
 
     return reportData
 }
 
-async function createTripReportByDevice(from, to) {
-    const devices = userData.devices
+async function createTripReportByDevice(from, to, devices, userData, traccarInstance) {
     const allData = {
         devices: [],
         from: from,

package/src/kms-report.js

@@ -11,37 +11,32 @@ const drivers = require("./util/driver")
 const { isInsideTimetable, isPartialInsideTimetable} = require("./util/trips")
 const word = require("./word");
 
-let traccarInstance
-let userData
-
 const fileName = 'KmsReport'
 
-async function createKmsReport(from, to, reportUserData, traccar) {
+async function createKmsReport(from, to, userData, traccarInstance) {
     console.log('Create KmsReport')
 
     console.log(from, to)
-    traccarInstance = traccar
-    userData = reportUserData
     const reportData = []
     if(userData.byDriver){
         console.log("ByDriver")
-        const allData = await createKmsReportByDriver(from, to)
+        const allData = await createKmsReportByDriver(from, to, userData, traccarInstance)
         reportData.push(allData)
     }
     else if(userData.byGroup){
         console.log("ByGroup")
-        const allData = await createKmsReportByGroup(from, to)
+        const allData = await createKmsReportByGroup(from, to, userData, traccarInstance)
         reportData.push(...allData)
     } else {
         console.log("ByDevice")
-        const allData = await createKmsReportByDevice(from, to)
+        const allData = await createKmsReportByDevice(from, to, userData, traccarInstance)
         reportData.push(allData)
     }
 
     return reportData
 }
 
-async function createKmsReportByDevice(from, to) {
+async function createKmsReportByDevice(from, to, userData, traccarInstance) {
     const groupIds = userData.groups.map(g => g.id)
     const devicesToProcess = userData.byGroup ? userData.devices.filter(d => !groupIds.includes(d.groupId)) : userData.devices
 
@@ -59,13 +54,13 @@ async function createKmsReportByDevice(from, to) {
 
     if (tripsData.length > 0) {
         trips.checkTripsKms(traccarInstance, from, to, devicesToProcess, {trips: tripsData, route: route})
-        allData.devices = processDevices(from, to, devicesToProcess, {trips: tripsData, route: route})
+        allData.devices = processDevices(from, to, devicesToProcess, {trips: tripsData, route: route}, userData)
     }
 
     return allData
 }
 
-async function createKmsReportByDriver(from, to) {
+async function createKmsReportByDriver(from, to, userData, traccarInstance) {
     const devices = await drivers.devicesByDriver(traccarInstance, from, to, userData.drivers, userData.devices)
     console.log(devices.length)
 
@@ -77,10 +72,10 @@ async function createKmsReportByDriver(from, to) {
     const tripsData = await traccar.getTrips(traccarInstance, from, to, devices)
     const routeData = await traccar.getTrips(traccarInstance, from, to, devices)
 
-    return { drivers: processDrivers(from, to, userData.drivers, {trips: tripsData, route: routeData}) }
+    return { drivers: processDrivers(from, to, userData, {trips: tripsData, route: routeData}) }
 }
 
-async function createKmsReportByGroup(from, to) {
+async function createKmsReportByGroup(from, to, userData, traccarInstance) {
     const reportData = []
     for (const g of userData.groups) {
         const devices = userData.devices.filter(d => d.groupId === g.id)
@@ -101,7 +96,7 @@ async function createKmsReportByGroup(from, to) {
 
             if (tripsData.length > 0) {
                 trips.checkTripsKms(traccarInstance, from, to, devices, {trips: tripsData, route: route})
-                groupData.devices = processDevices(from, to, devices, {trips: tripsData, route: route})
+                groupData.devices = processDevices(from, to, devices, {trips: tripsData, route: route}, userData)
             }
 
             reportData.push(groupData)
@@ -114,10 +109,10 @@ async function createKmsReportByGroup(from, to) {
     return reportData
 }
 
-function processDrivers(from, to, drivers, data) {
+function processDrivers(from, to, userData, data) {
     console.log(data)
     const driversResult = []
-    drivers.forEach(d => {
+    userData.drivers.forEach(d => {
         const route = data.route.filter(p => p.attributes.driverUniqueId === d.uniqueId)
         const trips = data.trips.filter(t => t.driverUniqueId === d.uniqueId
             && (userData.allWeek || !userData.weekDays || isInsideTimetable(t, userData) || isPartialInsideTimetable(t, userData, route)))
@@ -152,7 +147,7 @@ function processDrivers(from, to, drivers, data) {
     return driversResult
 }
 
-function processDevices(from, to, devices, data) {
+function processDevices(from, to, devices, data, userData) {
     const devicesResult = []
 
     for (const d of devices) {

package/src/speeding-report.js

@@ -10,38 +10,33 @@ const drivers = require("./util/driver")
 const {distance, point} = require('turf')
 const here = require('./here')
 const {getUserPartner} = require("fleetmap-partners");
-const traccar = require("./util/traccar");
-
-let traccarInstance
-let userData
+const traccarHelper = require("./util/traccar");
 
 const fileName = 'SpeedingReport'
 const eventTypes = ['deviceOverspeed']
 
-async function createSpeedingReport(from, to, reportUserData, traccar) {
-  traccarInstance = traccar
-  userData = reportUserData
+async function createSpeedingReport(from, to, userData, traccarInstance) {
   const reportData = []
 
   if (userData.byDriver) {
     console.log("ByDriver")
-    const allData = await createSpeedingReportByDriver(from, to)
+    const allData = await createSpeedingReportByDriver(from, to, userData, traccarInstance)
     reportData.push(allData)
   }
   else if (userData.byGroup) {
     console.log("ByGroup")
-    const allData = await createSpeedingReportByGroup(from, to)
+    const allData = await createSpeedingReportByGroup(from, to, userData, traccarInstance)
     reportData.push(...allData)
   } else {
     console.log("createSpeedingReportByDevice")
-    const allData = await createSpeedingReportByDevice(from, to, userData.devices)
+    const allData = await createSpeedingReportByDevice(from, to, userData.devices, userData, traccarInstance)
     reportData.push(allData)
   }
 
   return reportData
 }
 
-async function createSpeedingReportByGroup(from, to){
+async function createSpeedingReportByGroup(from, to, userData, traccarInstance){
   const reportData = []
   for (const g of userData.groups) {
     const devices = userData.devices.filter(d => d.groupId === g.id)
@@ -53,8 +48,8 @@ async function createSpeedingReportByGroup(from, to){
         xpert: devices.filter(d => d.attributes.xpert).length > 0
       }
 
-      const events = await traccar.getEvents(traccarInstance, from, to, devices, eventTypes)
-      const routes = await traccar.getRoute(traccarInstance, from, to, devices)
+      const events = await traccarHelper.getEvents(traccarInstance, from, to, devices, eventTypes)
+      const routes = await traccarHelper.getRoute(traccarInstance, from, to, devices)
 
       devices.sort((a, b) => (a.name > b.name) ? 1 : -1)
 
@@ -74,15 +69,15 @@ async function createSpeedingReportByGroup(from, to){
   return reportData
 }
 
-async function createSpeedingReportByDevice(from, to, devices) {
+async function createSpeedingReportByDevice(from, to, devices, userData, traccarInstance) {
   devices.sort((a, b) => (a.name > b.name) ? 1 : -1)
 
-  const routes = await traccar.getRoute(traccarInstance, from, to, devices)
+  const routes = await traccarHelper.getRoute(traccarInstance, from, to, devices)
   const events = []
   if(!userData.useVehicleSpeedLimit && userData.customSpeed){
     events.push(...await getCustomSpeedLimitEvents(devices, routes))
   } else {
-    events.push(...await traccar.getEvents(traccarInstance, from, to, devices, eventTypes))
+    events.push(...await traccarHelper.getEvents(traccarInstance, from, to, devices, eventTypes))
   }
 
   if(userData.roadSpeedLimits){
@@ -100,7 +95,7 @@ async function createSpeedingReportByDevice(from, to, devices) {
   }
 }
 
-async function createSpeedingReportByDriver(from, to) {
+async function createSpeedingReportByDriver(from, to, userData) {
   const devices = await drivers.devicesByDriver(traccarInstance, from, to, userData.drivers, userData.devices)
   console.log('Devices with driver',devices.length)
 
@@ -109,12 +104,12 @@ async function createSpeedingReportByDriver(from, to) {
     return { drivers: [] }
   }
 
-  const routes = await traccar.getRoute(traccarInstance, from, to, devices)
+  const routes = await traccarHelper.getRoute(traccarInstance, from, to, devices)
   const events = []
   if(!userData.useVehicleSpeedLimit && userData.customSpeed){
     events.push(...await getCustomSpeedLimitEvents(devices, routes))
   } else {
-    events.push(...await traccar.getEvents(traccarInstance, from, to, devices, eventTypes))
+    events.push(...await traccarHelper.getEvents(traccarInstance, from, to, devices, eventTypes))
   }
 
   if(userData.roadSpeedLimits){
@@ -126,13 +121,13 @@ async function createSpeedingReportByDriver(from, to) {
     return { drivers: [] }
   }
 
-  return {drivers: await processDrivers(from, to, events, routes)}
+  return {drivers: await processDrivers(from, to, events, routes, userData)}
 }
 
-async function processDrivers(from, to, events, routes) {
+async function processDrivers(from, to, events, routes, userData) {
   const driversResult = []
 
-  await findEventsPosition(from, to, userData.devices, events, routes)
+  await findEventsPosition(from, to, userData.devices, events, routes, userData)
 
   userData.drivers.forEach(d => {
     const driverEvents = events.filter(e => e.position && e.position.attributes.driverUniqueId === d.uniqueId)
@@ -153,9 +148,9 @@ async function processDrivers(from, to, events, routes) {
   return driversResult
 }
 
-async function processDevices(from, to, devices, events, routes) {
+async function processDevices(from, to, devices, events, routes, userData) {
   const devicesResult = []
-  await findEventsPosition(from, to, devices, events, routes)
+  await findEventsPosition(from, to, devices, events, routes, userData)
 
   for (const d of devices) {
     const deviceEvents = events.filter(e => e.deviceId === d.id && e.position)
@@ -176,7 +171,7 @@ async function processDevices(from, to, devices, events, routes) {
   return devicesResult
 }
 
-async function findEventsPosition(from, to, devices, events, routes){
+async function findEventsPosition(from, to, devices, events, routes, userData){
   for (const d of devices) {
     let deviceEvents = events.filter(e => e.deviceId === d.id && e.positionId)
     if (deviceEvents.length > 0) {
@@ -195,7 +190,7 @@ async function findEventsPosition(from, to, devices, events, routes){
           }
 
           a.position = positions[pIndex]
-          pIndex = calculateEventData(positions, pIndex, a, d, geofence)
+          pIndex = calculateEventData(positions, pIndex, a, d, geofence, userData)
           positions.slice(pIndex)
         }
       }
@@ -203,7 +198,7 @@ async function findEventsPosition(from, to, devices, events, routes){
   }
 }
 
-async function getCustomSpeedLimitEvents(devices, routes){
+async function getCustomSpeedLimitEvents(devices, routes, userData){
   console.log('custom speed limit events')
   const events = []
   const maxSpeed = userData.customSpeed / 1.85200
@@ -277,7 +272,7 @@ async function getHereEvents(devices, routes, threshold){
   return events
 }
 
-function calculateEventData(positions, pIndex, alert, device, geofence){
+function calculateEventData(positions, pIndex, alert, device, geofence, userData){
   let endEventPosition = alert.position
   let maxSpeed = alert.position.speed
   let dist = 0

package/src/trip-report.js

@@ -7,41 +7,35 @@ const drivers = require("./util/driver")
 const {getUserPartner} = require("fleetmap-partners")
 const {headerFromUser, addTable} = require("./util/pdfDocument")
 const {getStyle} = require("./reportStyle")
-const traccar = require("./util/traccar")
+const traccarHelper = require("./util/traccar")
 const trips = require("./util/trips");
 const {isInsideTimetable, addNearestPOIs, isPartialInsideTimetable} = require("./util/trips")
 
-
-let traccarInstance
-let userData
-
 const fileName = 'TripReport'
 
-async function createTripReport(from, to, reportUserData, traccar) {
+async function createTripReport(from, to, userData, traccar) {
     console.log('Create TripReport')
-    userData = reportUserData
-    traccarInstance = traccar
     const reportData = []
 
     if (userData.byDriver) {
         console.log("ByDriver")
-        const report = await createTripReportByDriver(from, to)
+        const report = await createTripReportByDriver(from, to, userData, traccar)
         reportData.push(report)
     }
     else if (userData.byGroup) {
         console.log("ByGroup")
-        const allData = await createTripReportByGroup(from, to)
+        const allData = await createTripReportByGroup(from, to, userData, traccar)
         reportData.push(...allData)
     } else {
         console.log("ByDevice")
-        const report = await createTripReportByDevice(from, to)
+        const report = await createTripReportByDevice(from, to, userData, traccar)
         reportData.push(report)
     }
 
     return reportData
 }
 
-async function createTripReportByDevice(from, to) {
+async function createTripReportByDevice(from, to, userData, traccar) {
     const devices = userData.devices
     const allData = {
         devices: [],
@@ -51,21 +45,21 @@ async function createTripReportByDevice(from, to) {
     devices.sort((a, b) => (a.name > b.name) ? 1 : -1)
 
     const devicesToSlice = devices.slice()
-    const tripsData = await traccar.getTrips(traccarInstance, from, to, devicesToSlice)
-    const stopsData = await traccar.getStops(traccarInstance, from, to, devicesToSlice)
-    const routeData = await traccar.getRoute(traccarInstance, from, to, devicesToSlice)
+    const tripsData = await traccarHelper.getTrips(traccar, from, to, devicesToSlice)
+    const stopsData = await traccarHelper.getStops(traccar, from, to, devicesToSlice)
+    const routeData = await traccarHelper.getRoute(traccar, from, to, devicesToSlice)
 
     console.log('Trips:' + tripsData.length)
 
     if (tripsData.length > 0) {
-        trips.checkTripsKms(traccarInstance, from, to, devices, {trips: tripsData, route: routeData})
-        allData.devices = processDevices(from, to, devices, {trips: tripsData, stops: stopsData, route: routeData})
+        trips.checkTripsKms(traccar, from, to, devices, {trips: tripsData, route: routeData})
+        allData.devices = processDevices(from, to, devices, {trips: tripsData, stops: stopsData, route: routeData}, userData)
     }
 
     return allData
 }
 
-async function createTripReportByGroup(from, to) {
+async function createTripReportByGroup(from, to, userData, traccar) {
     const reportData = []
     for (const g of userData.groups) {
         const devices = userData.devices.filter(d => d.groupId === g.id)
@@ -77,20 +71,20 @@ async function createTripReportByGroup(from, to) {
                 xpert: devices.filter(d => d.attributes.xpert).length > 0
             }
 
-            const response = await traccarInstance.reports.reportsTripsGet(from, to, null, [g.id])
+            const response = await traccar.reports.reportsTripsGet(from, to, null, [g.id])
             const tripsData = response.data
 
-            const stopsResponse = await traccarInstance.reports.reportsStopsGet(from, to, null, [g.id])
+            const stopsResponse = await traccar.reports.reportsStopsGet(from, to, null, [g.id])
             const stopsData = stopsResponse.data
 
-            const routeResponse = await traccarInstance.reports.reportsRouteGet(from, to, null, [g.id])
+            const routeResponse = await traccar.reports.reportsRouteGet(from, to, null, [g.id])
             const routeData = routeResponse.data
 
             devices.sort((a, b) => (a.name > b.name) ? 1 : -1)
 
             if (tripsData.length > 0) {
                 console.log('Trips:' + tripsData.length)
-                groupData.devices = processDevices(from, to, devices, {trips: tripsData, stops: stopsData, route: routeData})
+                groupData.devices = processDevices(from, to, devices, {trips: tripsData, stops: stopsData, route: routeData}, userData)
 
                 reportData.push(groupData)
             }
@@ -100,14 +94,14 @@ async function createTripReportByGroup(from, to) {
     const groupIds = userData.groups.map(g => g.id)
     const withoutGroupDevices = userData.devices.filter(d => !groupIds.includes(d.groupId))
 
-    const allData = await createTripReportByDevice(from, to, withoutGroupDevices)
+    const allData = await createTripReportByDevice(from, to, withoutGroupDevices, userData)
     reportData.push(allData)
 
     return reportData
 }
 
-async function createTripReportByDriver(from, to){
-    const devices = await drivers.devicesByDriver(traccarInstance, from, to, userData.drivers, userData.devices)
+async function createTripReportByDriver(from, to, userData, traccar){
+    const devices = await drivers.devicesByDriver(traccar, from, to, userData.drivers, userData.devices)
     console.log(devices.length)
 
     if(!devices.length){
@@ -115,13 +109,13 @@ async function createTripReportByDriver(from, to){
         return { drivers:[] }
     }
 
-    const tripsData = await traccar.getTrips(traccarInstance, from, to, devices)
-    const routeData = await traccar.getRoute(traccarInstance, from, to, devices)
+    const tripsData = await traccarHelper.getTrips(traccar, from, to, devices)
+    const routeData = await traccarHelper.getRoute(traccar, from, to, devices)
 
-    return { drivers: processDrivers(from, to, userData.drivers, {trips: tripsData, route: routeData})}
+    return { drivers: processDrivers(from, to, userData, {trips: tripsData, route: routeData})}
 }
 
-function processDevices(from, to, devices, data) {
+function processDevices(from, to, devices, data, userData) {
     const devicesResult = []
 
     devices.forEach(d => {
@@ -175,10 +169,10 @@ function processDevices(from, to, devices, data) {
     return devicesResult
 }
 
-function processDrivers(from, to, drivers, data) {
+function processDrivers(from, to, userData, data) {
     console.log(data)
     const driversResult = []
-    drivers.forEach(d => {
+    userData.drivers.forEach(d => {
         const route = data.route.filter(p => p.attributes.driverUniqueId === d.uniqueId)
         const trips = data.trips.filter(t => t.driverUniqueId === d.uniqueId
             && (userData.allWeek || !userData.weekDays || isInsideTimetable(t, userData) || isPartialInsideTimetable(t, userData, route)))

package/src/word/index.js

@@ -10,7 +10,7 @@ function formatCellValue(value) {
     return value.toLocaleDateString ? value.toLocaleDateString() : value + ''
 }
 
-exports.reportToWord = async (userData, reportData, excel, title) => {
+exports.reportToWord = async (userData, dateRange, excel, title) => {
     console.log('excel', excel)
     const partnerData = getPartnerData(userData.user)
 
@@ -69,13 +69,13 @@ exports.reportToWord = async (userData, reportData, excel, title) => {
                     alignment: AlignmentType.CENTER,
                 }),
                 new Paragraph({}),
-                new Paragraph(new Date(reportData.from).toLocaleString() + ' - ' + new Date(reportData.to).toLocaleString()),
+                new Paragraph(new Date(dateRange[0]).toLocaleString() + ' - ' + new Date(dateRange[1]).toLocaleString()),
                 new Paragraph({}),
                 table
             ],
         }],
     })
     Packer.toBlob(doc).then(blob => {
-        saveAs(blob, "kmsReport.docx");
+        saveAs(blob, "report.docx");
     })
 }

package/.idea/codeStyles/Project.xml

@@ -1,7 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <ScalaCodeStyleSettings>
-      <option name="MULTILINE_STRING_CLOSING_QUOTES_ON_NEW_LINE" value="true" />
-    </ScalaCodeStyleSettings>
-  </code_scheme>
-</component>

package/.idea/codeStyles/codeStyleConfig.xml

@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </state>
-</component>

package/.idea/jsLibraryMappings.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="JavaScriptLibraryMappings">
-    <file url="file://$PROJECT_DIR$" libraries="{Node.js Core}" />
-  </component>
-</project>