fleetmap-reports 1.0.309 → 1.0.310

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.309",
+  "version": "1.0.310",
   "description": "",
   "main": "src/index.js",
   "scripts": {

package/src/activity-report.js

@@ -138,13 +138,13 @@ async function createActivityReportByDriver(from, to, userData, traccarInstance)
         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 => {
@@ -211,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 => {
@@ -264,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)',
@@ -309,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,
@@ -354,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,
@@ -420,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'},
@@ -484,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)',
@@ -552,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'},
@@ -627,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'},
@@ -664,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']
 
@@ -676,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)
@@ -697,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
@@ -711,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/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/trip-report.js

@@ -11,37 +11,31 @@ const traccar = 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, traccarInstance) {
     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, traccarInstance)
         reportData.push(report)
     }
     else 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, userDatauserData, traccarInstance)
         reportData.push(report)
     }
 
     return reportData
 }
 
-async function createTripReportByDevice(from, to) {
+async function createTripReportByDevice(from, to, userData, traccarInstance) {
     const devices = userData.devices
     const allData = {
         devices: [],
@@ -59,13 +53,13 @@ async function createTripReportByDevice(from, to) {
 
     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})
+        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, traccarInstance) {
     const reportData = []
     for (const g of userData.groups) {
         const devices = userData.devices.filter(d => d.groupId === g.id)
@@ -90,7 +84,7 @@ async function createTripReportByGroup(from, to) {
 
             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,13 +94,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)
     reportData.push(allData)
 
     return reportData
 }
 
-async function createTripReportByDriver(from, to){
+async function createTripReportByDriver(from, to, userData, traccarInstance){
     const devices = await drivers.devicesByDriver(traccarInstance, from, to, userData.drivers, userData.devices)
     console.log(devices.length)
 
@@ -118,10 +112,10 @@ async function createTripReportByDriver(from, to){
     const tripsData = await traccar.getTrips(traccarInstance, from, to, devices)
     const routeData = await traccar.getRoute(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})}
 }
 
-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/.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>