fleetmap-reports 1.0.288 → 1.0.292

package/src/trip-report.js

@@ -1,158 +1,151 @@
-const automaticReports = require("./automaticReports");
-const messages = require('../lang');
-const jsPDF = require('jspdf');
-const {convertMS} = require("./util/utils");
-const autotable =  require('jspdf-autotable');
-const {coordsDistance} = require("./util/utils");
-const reportStyle = require("./reportStyle")
-const drivers = require("./util/driver");
+const automaticReports = require("./automaticReports")
+const messages = require('../lang')
+const jsPDF = require('jspdf')
+const {convertMS, convertToLocaleString, convertToLocaleDateString, convertToLocaleTimeString} = require("./util/utils")
+require('jspdf-autotable')
+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
+let userData
 
 const fileName = 'TripReport'
 
-async function createTripReport(from, to, userData, traccar) {
+async function createTripReport(from, to, reportUserData, traccar) {
     console.log('Create TripReport')
-
+    userData = reportUserData
     traccarInstance = traccar
     const reportData = []
 
-    if(userData.byDriver){
-        const allData = await createTripReportByDriver(from, to, userData)
-        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")
-        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 allData = await createTripReportByGroup(from, to)
+        reportData.push(...allData)
+    } else {
+        console.log("ByDevice")
+        const report = await createTripReportByDevice(from, to)
+        reportData.push(report)
+    }
 
-                const response = await traccarInstance.reports.reportsTripsGet(from, to, null, [g.id])
-                const data = response.data
+    return reportData
+}
 
-                const stopsResponse = await traccarInstance.reports.reportsStopsGet(from, to, null, [g.id])
-                const stopsData = stopsResponse.data
+async function createTripReportByDevice(from, to) {
+    const devices = userData.devices
+    const allData = {
+        devices: [],
+        xpert: devices.filter(d => d.attributes.xpert).length > 0
+    }
 
-                devices.sort((a, b) => (a.name > b.name) ? 1 : -1)
+    devices.sort((a, b) => (a.name > b.name) ? 1 : -1)
 
-                if (data.length > 0) {
+    const devicesToSlice = devices.slice()
+    const data = await traccar.getTrips(traccarInstance, from, to, devicesToSlice)
+    const stopsData = await traccar.getStops(traccarInstance, from, to, devicesToSlice)
 
-                    console.log('Trips:' + data.length)
-                    groupData.devices = processDevices(from, to, devices, data, stopsData)
+    console.log('Trips:' + data.length)
 
-                    reportData.push(groupData)
-                }
-            }
-        }
+    if (data.length > 0) {
+        await trips.checkTripsKms(traccarInstance, from, to,[], data, devices)
+        allData.devices = processDevices(from, to, devices, data, stopsData)
     }
 
-    const groupIds = userData.groups.map(g => g.id)
-    const withoutGroupDevices = userData.byGroup ? userData.devices.filter(d => !groupIds.includes(d.groupId)) : userData.devices
+    return allData
+}
 
-    const allData = {
-        devices: [],
-        xpert: withoutGroupDevices.filter(d => d.attributes.xpert).length > 0
-    }
+async function createTripReportByGroup(from, to) {
+    const reportData = []
+    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
+            }
 
-    withoutGroupDevices.sort((a, b) => (a.name > b.name) ? 1 : -1)
-    const devicesToSlice = withoutGroupDevices.slice()
+            const response = await traccarInstance.reports.reportsTripsGet(from, to, null, [g.id])
+            const tripsData = response.data
 
-    const arrayOfArrays = automaticReports.sliceArray(devicesToSlice)
-    let data = []
-    let stopsData = []
-    for (const a of arrayOfArrays) {
-        const response = await traccarInstance.reports.reportsTripsGet(from, to, a.map(d => d.id))
-        data = data.concat(response.data)
+            const stopsResponse = await traccarInstance.reports.reportsStopsGet(from, to, null, [g.id])
+            const stopsData = stopsResponse.data
 
-        const stopsResponse = await traccarInstance.reports.reportsStopsGet(from, to, a.map(d => d.id))
-        stopsData = stopsResponse.data
-    }
+            devices.sort((a, b) => (a.name > b.name) ? 1 : -1)
 
-    console.log('Trips:' + data.length)
+            if (tripsData.length > 0) {
+                console.log('Trips:' + tripsData.length)
+                groupData.devices = processDevices(from, to, devices, tripsData, stopsData, userData)
 
-    if (data.length === 0) {
-        return reportData
+                reportData.push(groupData)
+            }
+        }
     }
 
-    allData.devices = processDevices(from, to, withoutGroupDevices, data, stopsData, userData)
+    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, userData){
-
-    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
-    }
+async function createTripReportByDriver(from, to){
+    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, userData) {
+function processDevices(from, to, devices, data, stopsData) {
     const devicesResult = []
 
     devices.forEach(d => {
-        const trips = data.filter(t => t.deviceId === d.id)
+        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((trip.spentFuel * d.attributes.fuel_tank_capacity) / 100)
+                trip.avgFuelConsumption = trip.totalKms > 0 ? Math.round(trip.fuelConsumption * 100 / trip.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(function(trip, index) {
-                const stop = stops.length+1 > index ? stops[index+1] : null
-
-                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,
@@ -180,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 = {
@@ -193,22 +187,22 @@ 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
 }
 
-function exportTripReportToPDF(userData, reportData) {
+async function exportTripReportToPDF(userData, reportData) {
     console.log('Export to PDF')
 
     const lang = userData.user.attributes.lang
+    const timezone = userData.user.attributes.timezone
     const translations = messages[lang] ? messages[lang] : messages['en-GB']
     const tripsData = userData.byDriver ? reportData.drivers : reportData.devices
 
@@ -235,29 +229,38 @@ function exportTripReportToPDF(userData, reportData) {
     }
 
     if (tripsData) {
-        let first = true
         const doc = new jsPDF.jsPDF('l');
-        doc.setFontSize(14)
-        doc.text(translations.report.titleTripReport, 15, 15 )
+        await headerFromUser(doc, translations.report.titleTripReport, userData.user)
 
-        for(const d of tripsData){
-            let data = []
+        tripsData.forEach(function (d, index) {
+            const data = []
             const name = userData.byDriver ? d.driver.name : deviceName(d.device)
             const group = userData.byDriver ? userData.groups.find(g => g.drivers.includes(d.id)) : userData.groups.find(g => d.device.groupId === g.id)
 
-            let space = 0
-            if(!first) {
+            let space = index === 0 ? 8 : 0
+            if(index){
                 doc.addPage()
-            } else {
-                first = false
-                space = 10
             }
-            doc.setFontSize(12)
+
+            doc.setFontSize(13)
             doc.text(name, 20, space+20 )
-            doc.setFontSize(10)
+            doc.setFontSize(11)
             doc.text(group ? translations.report.group + ': ' + group.name : '', 200, space+20 )
-            doc.text(new Date(d.from).toLocaleString() + ' - ' + new Date(d.to).toLocaleString(), 20, space+25 )
-            doc.text(translations.report.headerStartAddress + ': ' + d.trips[0].startAddress, 20, space+30 )
+            doc.text(convertToLocaleString(d.from, lang, timezone) + ' - ' + convertToLocaleString(d.to, lang, timezone), 20, space+25 )
+            if(!userData.allWeek && userData.weekDays) {
+                doc.text((userData.weekDays.monday ? ' ' + translations.report.monday + ',' : '')
+                    + (userData.weekDays.tuesday ? ' ' + translations.report.tuesday + ',' : '')
+                    + (userData.weekDays.wednesday ? ' ' + translations.report.wednesday + ',' : '')
+                    + (userData.weekDays.thursday ? ' ' + translations.report.thursday + ',' : '')
+                    + (userData.weekDays.friday ? ' ' + translations.report.friday + ',' : '')
+                    + (userData.weekDays.saturday ? ' ' + translations.report.saturday + ',' : '')
+                    + (userData.weekDays.sunday ? ' ' + translations.report.sunday + ',' : '')
+                    + ' das '
+                    + userData.dayHours.startTime + ' - ' + userData.dayHours.endTime, 20, space + 30)
+                doc.text(translations.report.headerStartAddress + ': ' + d.trips[0].startAddress, 20, space+40 )
+            } else {
+                doc.text(translations.report.headerStartAddress + ': ' + d.trips[0].startAddress, 20, space+35 )
+            }
 
             d.trips.map(a => {
                 const temp = [
@@ -288,7 +291,6 @@ function exportTripReportToPDF(userData, reportData) {
                 'Total:' + d.trips.length,
                 '','','',
                 convertMS(d.trips.reduce((a, b) => a + b.duration, 0)),
-
             ]
 
             if(userData.byDriver) {
@@ -303,25 +305,9 @@ function exportTripReportToPDF(userData, reportData) {
                     getMaxSpeed(d.trips))
             }
 
-            doc.autoTable({
-                head: [headers],
-                body: data,
-                foot: [footValues],
-                showFoot: 'lastPage',
-                headStyles: {
-                    fillColor: reportStyle.pdfHeaderColor,
-                    textColor: reportStyle.pdfHeaderTextColor
-                },
-                bodyStyles: {
-                    fillColor: reportStyle.pdfBodyColor,
-                    textColor: reportStyle.pdfBodyTextColor
-                },
-                footStyles: {
-                    fillColor: reportStyle.pdfFooterColor,
-                    textColor: reportStyle.pdfFooterTextColor
-                },
-                startY: space+40 })
-        }
+            const style = getStyle(getUserPartner(userData.user))
+            addTable(doc, headers, data, footValues, style, space + (userData.allWeek ? 40 : 45))
+        })
         return doc
     }
 }
@@ -398,23 +384,17 @@ function deviceName(device){
 }
 
 function getTripDate(user, trip){
-    return new Date(trip.startTime).toLocaleDateString(user.attributes.lang, {
-        timeZone: user.attributes.timezone,
-        hour12: false
-    })
+    return convertToLocaleDateString(trip.startTime, user.attributes.lang, user.attributes.timezone)
 }
+
 function getTripStart(user, trip){
-    return new Date(trip.startTime).toLocaleTimeString(user.attributes.lang, {
-        timeZone: user.attributes.timezone,
-        hour12: false
-    })
+    return convertToLocaleTimeString(trip.startTime, user.attributes.lang, user.attributes.timezone)
 }
+
 function getTripEnd(user, trip){
-    return new Date(trip.endTime).toLocaleTimeString(user.attributes.lang, {
-        timeZone: user.attributes.timezone,
-        hour12: false
-    })
+    return convertToLocaleTimeString(trip.endTime, user.attributes.lang, user.attributes.timezone)
 }
+
 function getDriverName(drivers, driverUniqueId) {
     if(driverUniqueId) {
         const driver = drivers.find(d => d.uniqueId === driverUniqueId)
@@ -423,18 +403,22 @@ function getDriverName(drivers, driverUniqueId) {
 
     return ''
 }
+
 function getSumTotalKms(user, data) {
     const values = data.map(item => {
         return item.totalKms ? parseFloat(item.totalKms) : 0
     })
     return Intl.NumberFormat(user.attributes.lang, {maximumFractionDigits: 2}).format(values.reduce((a, b) => a + b, 0))
 }
+
 function getSumAvgSpeed(data) {
     const values = data.map(item => {
-        return Math.round(item.averageSpeed * 1.85200)
+        return Math.round(item.averageSpeed * 1.85200) * item.totalKms
     })
-    return Math.round((values.reduce((a, b) => a + b, 0)) / data.length)
+    const totalKms = data.reduce((a, b) => a + b.totalKms, 0)
+    return totalKms > 0 ? Math.round((values.reduce((a, b) => a + b, 0)) / totalKms) : 0
 }
+
 function getMaxSpeed(data) {
     const values = data.map(item => {
         return item.maxSpeed
@@ -445,6 +429,15 @@ function getMaxSpeed(data) {
     return Math.round(max * 1.85200)
 }
 
+function getStop(tripEndDate, stops){
+    const stopList = stops.filter(s => new Date(s.startTime).getTime() >= tripEndDate.getTime())
+    if(stopList.length){
+        return stopList[0]
+    }
+
+    return null
+}
+
 exports.createTripReport = createTripReport;
 exports.exportTripReportToPDF = exportTripReportToPDF;
 exports.exportTripReportToExcel = exportTripReportToExcel;

package/src/util/driver.js

@@ -1,25 +1,17 @@
-const automaticReports = require("../automaticReports")
+const traccar = require("./traccar");
 
 //get devices used by each driver between two dates
-async function devicesByDriver(traccar, from, to, drivers, devices){
-    let eventsData = []
-    let tripsData = []
-    const arrayOfArrays = automaticReports.sliceArray(devices)
-    for (const a of arrayOfArrays) {
-        const response = await traccar.reports.reportsEventsGet(from, to, a.map(d => d.id), null, ['driverChanged'])
-        eventsData = eventsData.concat(response.data)
-    }
-
+async function devicesByDriver(traccarInstance, from, to, drivers, devices){
+    const eventsData = await traccar.getEvents(traccarInstance, from, to , devices, ['driverChanged'])
     const deviceIds = []
     for(const d of drivers) {
         const events = eventsData.filter(e => {
             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