fleetmap-reports 1.0.261 → 1.0.265

package/src/trip-report.js

@@ -3,13 +3,13 @@ const messages = require('../lang')
 const jsPDF = require('jspdf')
 const {convertMS, convertToLocaleString, convertToLocaleDateString, convertToLocaleTimeString} = require("./util/utils")
 require('jspdf-autotable')
-const {coordsDistance} = require("./util/utils")
 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 trips = require("./util/trips");
+const {isInsideTimetable, addNearestPOIs} = require("./util/trips");
 
 
 let traccarInstance
@@ -23,26 +23,26 @@ async function createTripReport(from, to, reportUserData, traccar) {
     traccarInstance = traccar
     const reportData = []
 
-    if(userData.byDriver){
-        const allData = await createTripReportByDriver(from, to)
-        reportData.push(allData)
+    if (userData.byDriver) {
+        console.log("ByDriver")
+        const report = await createTripReportByDriver(from, to)
+        reportData.push(report)
     }
-    else if(userData.byGroup){
+    else if (userData.byGroup) {
         console.log("ByGroup")
         const allData = await createTripReportByGroup(from, to)
         reportData.push(...allData)
+    } else {
+        console.log("ByDevice")
+        const report = await createTripReportByDevice(from, to)
+        reportData.push(report)
     }
 
-    const groupIds = userData.groups.map(g => g.id)
-    const withoutGroupDevices = userData.byGroup ? userData.devices.filter(d => !groupIds.includes(d.groupId)) : userData.devices
-
-    const allData = await createTripReportByDevice(from, to, withoutGroupDevices)
-    reportData.push(allData)
-
     return reportData
 }
 
-async function createTripReportByDevice(from, to, devices) {
+async function createTripReportByDevice(from, to) {
+    const devices = userData.devices
     const allData = {
         devices: [],
         xpert: devices.filter(d => d.attributes.xpert).length > 0
@@ -77,90 +77,75 @@ async function createTripReportByGroup(from, to) {
             }
 
             const response = await traccarInstance.reports.reportsTripsGet(from, to, null, [g.id])
-            const data = response.data
+            const tripsData = response.data
 
             const stopsResponse = await traccarInstance.reports.reportsStopsGet(from, to, null, [g.id])
             const stopsData = stopsResponse.data
 
             devices.sort((a, b) => (a.name > b.name) ? 1 : -1)
 
-            if (data.length > 0) {
-
-                console.log('Trips:' + data.length)
-                groupData.devices = processDevices(from, to, devices, data, stopsData, userData)
+            if (tripsData.length > 0) {
+                console.log('Trips:' + tripsData.length)
+                groupData.devices = processDevices(from, to, devices, tripsData, stopsData, userData)
 
                 reportData.push(groupData)
             }
         }
     }
+
+    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)
+    reportData.push(allData)
+
     return reportData
 }
 
 async function createTripReportByDriver(from, to){
-    const deviceIds = await drivers.devicesByDriver(traccarInstance, from, to, userData.drivers, userData.devices)
-    console.log(deviceIds.length)
-
-    let tripsData = []
-    if(deviceIds.length > 0) {
-        const response = await traccarInstance.reports.reportsTripsGet(from, to, deviceIds)
-        tripsData = response.data
-    }
+    const devices = await drivers.devicesByDriver(traccarInstance, from, to, userData.drivers, userData.devices)
+    console.log(devices.length)
 
-    const allData = {
-        drivers: []
+    if(!devices.length){
+        //Empty report
+        return { drivers:[] }
     }
 
-    allData.drivers = processDrivers(from, to, userData.drivers, tripsData)
+    const tripsData = await traccar.getTrips(traccarInstance, from, to, devices)
 
-    return allData
+    return { drivers: processDrivers(from, to, userData.drivers, tripsData)}
 }
 
 function processDevices(from, to, devices, data, stopsData) {
     const devicesResult = []
 
     devices.forEach(d => {
-        const trips = data.filter(t => t.deviceId === d.id && (userData.allWeek || isInsideTimetable(t, userData)))
+        const trips = data.filter(t => t.deviceId === d.id
+            && (userData.allWeek || !userData.weekDays || isInsideTimetable(t, userData)))
         const stops = stopsData.filter(s => s.deviceId === d.id)
 
-        trips.forEach(t => {
-            t.totalKms = t.distance / 1000
+        addNearestPOIs(trips, userData)
+
+        trips.forEach(trip => {
             if (automaticReports.deviceWithFuelInfo(d)) {
-                t.fuelConsumption = Math.round((t.spentFuel * d.attributes.fuel_tank_capacity) / 100)
-                t.avgFuelConsumption = t.totalKms > 0 ? Math.round(t.fuelConsumption * 100 / t.totalKms) : 0
+                trip.fuelConsumption = Math.round((t.spentFuel * d.attributes.fuel_tank_capacity) / 100)
+                trip.avgFuelConsumption = t.totalKms > 0 ? Math.round(t.fuelConsumption * 100 / t.totalKms) : 0
             } else {
-                t.fuelConsumption = '-'
-                t.avgFuelConsumption = '-'
+                trip.fuelConsumption = '-'
+                trip.avgFuelConsumption = '-'
             }
 
-            const distance = userData.geofences
-                .filter(g => g && g.area.startsWith('CIRCLE'))
-                .map(g => {
-                    const str = g.area.substring('CIRCLE ('.length, g.area.indexOf(','))
-                    const coord = str.trim().split(' ')
-                    return {
-                    p: g,
-                    distance: Math.round(coordsDistance(parseFloat(coord[1]), parseFloat(coord[0]), t.endLon, t.endLat))
-                }
-            })
-            const nearestPOIs = distance.filter(a => a.distance < 100).sort((a, b) => (a.distance > b.distance) ? 1 : -1)
-            if (nearestPOIs.length > 0) {
-                t.endPOIName = nearestPOIs[0].p.name
+            const stop = getStop(new Date(trip.startTime), stops)
+            if (stop) {
+                trip.stopDuration = (new Date(stop.endTime) - new Date(stop.startTime))
+                trip.stopEngineHours = stop.engineHours
+            } else {
+                trip.stopDuration = 0
+                trip.stopEngineHours = 0
             }
         })
 
         if (trips.length > 0) {
-            trips.forEach(trip => {
-                const stop = getStop(new Date(trip.startTime), stops)
-
-                if (stop) {
-                    trip.stopDuration = (new Date(stop.endTime) - new Date(stop.startTime))
-                    trip.stopEngineHours = stop.engineHours
-                } else {
-                    trip.stopDuration = 0
-                    trip.stopEngineHours = 0
-                }
-            })
-
             const deviceData = {
                 device: d,
                 from: from,
@@ -188,11 +173,12 @@ function processDrivers(from, to, drivers, data) {
     console.log(data)
     const driversResult = []
     drivers.forEach(d => {
-        const trips = data.filter(t => t.driverUniqueId === d.uniqueId)
+        const trips = data.filter(t => t.driverUniqueId === d.uniqueId
+            && (userData.allWeek || !userData.weekDays || isInsideTimetable(t, userData)))
 
-        trips.forEach(t => {
-            t.totalKms = t.distance / 1000
-        })
+        trips.sort((a,b)=>new Date(a.startTime).getTime()-new Date(b.startTime).getTime())
+
+        addNearestPOIs(trips, userData)
 
         if (trips.length > 0) {
             const driverData = {
@@ -201,14 +187,13 @@ function processDrivers(from, to, drivers, data) {
                 to: to,
                 totalDuration: trips.reduce((a, b) => a + b.duration, 0),
                 totalDistance: trips.reduce((a, b) => a + b.distance, 0),
-                maxSpeed: trips.reduce((a, b) => {
-                    return a > b.maxSpeed ? a : b.maxSpeed
-                }, 0),
+                maxSpeed: trips.reduce((a, b) => { return a > b.maxSpeed ? a : b.maxSpeed }, 0),
                 trips: trips,
             }
             driversResult.push(driverData)
         }
     })
+    console.log(driversResult)
 
     return driversResult
 }
@@ -453,30 +438,6 @@ function getStop(tripEndDate, stops){
     return null
 }
 
-function isInsideTimetable(t, userData){
-    const tripStart  = new Date(t.startTime)
-    const tripEnd  = new Date(t.endTime)
-
-    if((tripStart.getDay() === 0 && userData.weekDays.sunday) ||
-        (tripStart.getDay() === 1 && userData.weekDays.monday) ||
-        (tripStart.getDay() === 2 && userData.weekDays.tuesday) ||
-        (tripStart.getDay() === 3 && userData.weekDays.wednesday)  ||
-        (tripStart.getDay() === 4 && userData.weekDays.thursday) ||
-        (tripStart.getDay() === 5 && userData.weekDays.friday) ||
-        (tripStart.getDay() === 6 && userData.weekDays.saturday)) {
-
-        const startDate = new Date(new Date(tripStart).toISOString().split('T')[0] + ' '+userData.dayHours.startTime)
-        const endDate = new Date(new Date(tripStart).toISOString().split('T')[0] + ' '+userData.dayHours.endTime)
-
-        console.log(tripStart, startDate, endDate)
-
-        //Trips inside time period
-        return tripStart.getTime() > startDate.getTime() && tripEnd.getTime() < endDate.getTime()
-    }
-
-    return false
-}
-
 exports.createTripReport = createTripReport;
 exports.exportTripReportToPDF = exportTripReportToPDF;
 exports.exportTripReportToExcel = exportTripReportToExcel;

package/src/util/driver.js

@@ -9,10 +9,9 @@ async function devicesByDriver(traccarInstance, from, to, drivers, devices){
             return e.attributes.driverUniqueId === d.uniqueId
         })
 
-        deviceIds.push(events.map(e => e.deviceId))
+        deviceIds.push(...events.map(e => e.deviceId))
     }
-
-    return [...new Set(deviceIds.flat())]
+    return devices.filter(d => deviceIds.includes(d.id))
 }
 
 exports.devicesByDriver = devicesByDriver

package/src/util/trips.js

@@ -1,8 +1,30 @@
 const traccar = require("./traccar");
+const {coordsDistance} = require("./utils");
 
 const minDistance = 0
 const minAvgSpeed = 0
 
+function addNearestPOIs(trips, userData){
+    trips.forEach(t => {
+        t.totalKms = t.distance / 1000
+
+        const distance = userData.geofences
+            .filter(g => g && g.area.startsWith('CIRCLE'))
+            .map(g => {
+                const str = g.area.substring('CIRCLE ('.length, g.area.indexOf(','))
+                const coord = str.trim().split(' ')
+                return {
+                    p: g,
+                    distance: Math.round(coordsDistance(parseFloat(coord[1]), parseFloat(coord[0]), t.endLon, t.endLat))
+                }
+            })
+        const nearestPOIs = distance.filter(a => a.distance < 100).sort((a, b) => (a.distance > b.distance) ? 1 : -1)
+        if (nearestPOIs.length > 0) {
+            t.endPOIName = nearestPOIs[0].p.name
+        }
+    })
+}
+
 async function checkTripsKms(traccarInstance, from, to, routeData, tripsData, devices) {
     console.log('checkTripsKms')
     const trips = tripsData.filter(t => t.distance === minDistance && t.averageSpeed > minAvgSpeed)
@@ -20,4 +42,35 @@ async function checkTripsKms(traccarInstance, from, to, routeData, tripsData, de
     }
 }
 
+function isInsideTimetable(t, userData){
+    const tripStart  = new Date(t.startTime)
+    const tripEnd  = new Date(t.endTime)
+
+    if((tripStart.getDay() === 0 && userData.weekDays.sunday) ||
+        (tripStart.getDay() === 1 && userData.weekDays.monday) ||
+        (tripStart.getDay() === 2 && userData.weekDays.tuesday) ||
+        (tripStart.getDay() === 3 && userData.weekDays.wednesday)  ||
+        (tripStart.getDay() === 4 && userData.weekDays.thursday) ||
+        (tripStart.getDay() === 5 && userData.weekDays.friday) ||
+        (tripStart.getDay() === 6 && userData.weekDays.saturday)) {
+
+        const startDate = new Date(new Date(tripStart).toISOString().split('T')[0] + ' '+userData.dayHours.startTime)
+        const endDate = new Date(new Date(tripStart).toISOString().split('T')[0] + ' '+userData.dayHours.endTime)
+
+        console.log(tripStart, startDate, endDate)
+
+        //Trips inside time period
+        if(startDate.getTime() < endDate.getTime()) {
+            return tripStart.getTime() > startDate.getTime() && tripEnd.getTime() < endDate.getTime()
+        } else {
+            return (tripStart.getTime() < endDate.getTime() && tripEnd.getTime() < endDate.getTime()) ||
+                (tripStart.getTime() > startDate.getTime())
+        }
+    }
+
+    return false
+}
+
 exports.checkTripsKms = checkTripsKms
+exports.isInsideTimetable = isInsideTimetable
+exports.addNearestPOIs = addNearestPOIs