fleetmap-reports 1.0.308 → 1.0.309

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fleetmap-reports",
-  "version": "1.0.308",
+  "version": "1.0.309",
   "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 = []

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/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){
@@ -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){