fleetmap-reports 1.0.250 → 1.0.255

package/src/kms-report.js

@@ -1,4 +1,3 @@
-const {createActivityReport} = require("./activity-report");
 const messages = require('../lang')
 const jsPDF = require('jspdf')
 require('jspdf-autotable')
@@ -7,6 +6,7 @@ const {headerFromUser,addTable} = require("./util/pdfDocument");
 const {getUserPartner} = require("fleetmap-partners");
 const traccar = require("./util/traccar");
 const {getDates} = require("./util/utils");
+const trips = require("./util/trips");
 
 
 let traccarInstance
@@ -26,12 +26,13 @@ async function createKmsReportByDevice(from, to) {
 
     devicesToProcess.sort((a, b) => (a.name > b.name) ? 1 : -1)
     const route = userData.allWeek ? [] : await traccar.getRoute(traccarInstance, from, to, devicesToProcess)
-    const trips = await traccar.getTrips(traccarInstance, from, to, devicesToProcess)
+    const tripsData = await traccar.getTrips(traccarInstance, from, to, devicesToProcess)
 
-    console.log('trips:' + trips.length)
+    console.log('trips:' + tripsData.length)
 
-    if (trips.length > 0) {
-        allData.devices = processDevices(from, to, devicesToProcess, route, trips)
+    if (tripsData.length > 0) {
+        await trips.checkTripsKms(traccarInstance, from, to, route, tripsData, devicesToProcess)
+        allData.devices = processDevices(from, to, devicesToProcess, route, tripsData)
     }
 
     return allData
@@ -52,84 +53,102 @@ function processDevices(from, to, devices, route, trips) {
         const deviceTrips = trips.filter(t => t.deviceId === d.id)
 
          if (deviceTrips.length > 0) {
-            deviceTrips.forEach(t => t.tripDay = new Date(t.startTime).toISOString().split('T')[0] + ' 12:00 PM')
-            const groupedTrips = deviceTrips.reduce(
-                (entryMap, e) => entryMap.set(e.tripDay, [...entryMap.get(e.tripDay)||[], e]),
-                new Map()
-            )
-
-            const allDates = getDates(from, to)
-
-            const days = []
-            let keys = Array.from(groupedTrips.keys())
-             allDates.forEach(d => {
-                 const day = d.toISOString().split('T')[0] + ' 12:00 PM'
-                 if(!keys.includes(day)){
-                     groupedTrips.set(day, [])
-                 }
-             })
-
-             keys = Array.from(groupedTrips.keys())
-             keys.sort((a,b)=>new Date(a).getTime()-new Date(b).getTime());
-             keys.forEach(key => {
-                const currentDate = new Date(key)
-                let dayTrips = groupedTrips.get(key)
-                const day = {
-                    date: currentDate,
-                    kms: 0
-                }
-
-                if(userData.allWeek){
-                    day.kms = dayTrips.reduce((a, b) => a + b.distance, 0) || 0
-                } else {
-                    if((currentDate.getDay() === 0 && userData.weekDays.sunday) ||
-                        (currentDate.getDay() === 1 && userData.weekDays.monday) ||
-                        (currentDate.getDay() === 2 && userData.weekDays.tuesday) ||
-                        (currentDate.getDay() === 3 && userData.weekDays.wednesday)  ||
-                        (currentDate.getDay() === 4 && userData.weekDays.thursday) ||
-                        (currentDate.getDay() === 5 && userData.weekDays.friday) ||
-                        (currentDate.getDay() === 6 && userData.weekDays.saturday)) {
-
-                        const startDate = new Date(new Date(key).toISOString().split('T')[0] + ' '+userData.dayHours.startTime)
-                        const endDate = new Date(new Date(key).toISOString().split('T')[0] + ' '+userData.dayHours.endTime)
-
-                        console.log(key, startDate, endDate)
-
-                        //Trips inside time period
-                        const filteredTrips = dayTrips.filter(t => new Date(t.startTime).getTime() > startDate.getTime()
-                                && new Date(t.endTime).getTime() < endDate.getTime())
+            if(userData.groupByDay) {
+                deviceTrips.forEach(t => t.tripDay = new Date(t.startTime).toISOString().split('T')[0] + ' 12:00 PM')
+                const groupedTrips = deviceTrips.reduce(
+                    (entryMap, e) => entryMap.set(e.tripDay, [...entryMap.get(e.tripDay)||[], e]),
+                    new Map()
+                )
 
-                        //Trip starts outside time period and ends inside time period
-                        const startIncompleteTrip = dayTrips.filter(t => new Date(t.startTime).getTime() < startDate.getTime()
-                            && new Date(t.endTime).getTime() > startDate.getTime())
+                const allDates = getDates(from, to)
+
+                const days = []
+                let keys = Array.from(groupedTrips.keys())
+                 allDates.forEach(d => {
+                     const day = d.toISOString().split('T')[0] + ' 12:00 PM'
+                     if(!keys.includes(day)){
+                         groupedTrips.set(day, [])
+                     }
+                 })
+
+                 keys = Array.from(groupedTrips.keys())
+                 keys.sort((a,b)=>new Date(a).getTime()-new Date(b).getTime());
+                 keys.forEach(key => {
+                    const currentDate = new Date(key)
+                    let dayTrips = groupedTrips.get(key)
+                    const day = {
+                        date: currentDate,
+                        kms: 0
+                    }
 
-                        //Trip starts inside time period and ends outside time period
-                        const endIncompleteTrip = dayTrips.filter(t => new Date(t.startTime).getTime() < endDate.getTime()
+                    if(userData.allWeek){
+                        day.kms = dayTrips.reduce((a, b) => a + b.distance, 0) || 0
+                    } else {
+                        if((currentDate.getDay() === 0 && userData.weekDays.sunday) ||
+                            (currentDate.getDay() === 1 && userData.weekDays.monday) ||
+                            (currentDate.getDay() === 2 && userData.weekDays.tuesday) ||
+                            (currentDate.getDay() === 3 && userData.weekDays.wednesday)  ||
+                            (currentDate.getDay() === 4 && userData.weekDays.thursday) ||
+                            (currentDate.getDay() === 5 && userData.weekDays.friday) ||
+                            (currentDate.getDay() === 6 && userData.weekDays.saturday)) {
+
+                            const startDate = new Date(new Date(key).toISOString().split('T')[0] + ' '+userData.dayHours.startTime)
+                            const endDate = new Date(new Date(key).toISOString().split('T')[0] + ' '+userData.dayHours.endTime)
+
+                            console.log(key, startDate, endDate)
+
+                            if(startDate.getTime() < endDate.getTime()) {
+                                //Trips inside time period
+                                const filteredTrips = dayTrips.filter(t => new Date(t.startTime).getTime() > startDate.getTime()
+                                    && new Date(t.endTime).getTime() < endDate.getTime())
+
+                                day.kms = filteredTrips.reduce((a, b) => a + b.distance, 0) || 0
+                                console.log('Inside trips:' + day.kms)
+                            } else {
+                                //Trips inside time period
+                                const filteredTrips = dayTrips.filter(t => new Date(t.startTime).getTime() > startDate.getTime()
+                                    || new Date(t.endTime).getTime() < endDate.getTime())
+
+                                day.kms = filteredTrips.reduce((a, b) => a + b.distance, 0) || 0
+                                console.log('Inside trips:' + day.kms)
+                            }
+
+                            //Trip starts outside time period and ends inside time period
+                            const startIncompleteTrip = dayTrips.filter(t => new Date(t.startTime).getTime() < startDate.getTime()
+                                && new Date(t.endTime).getTime() > startDate.getTime())
+
+                            //Trip starts inside time period and ends outside time period
+                            const endIncompleteTrip = dayTrips.filter(t => new Date(t.startTime).getTime() < endDate.getTime()
                                 && new Date(t.endTime).getTime() > endDate.getTime())
 
-                        day.kms = filteredTrips.reduce((a, b) => a + b.distance, 0) || 0
-                        console.log('Inside trips:'+day.kms)
-
-                        if(startIncompleteTrip.length){
-                            const routeInside = route.filter(p => new Date(p.fixTime).getTime() > startDate.getTime() && new Date(p.fixTime).getTime() < new Date(startIncompleteTrip[0].endTime).getTime())
-                            day.kms = day.kms + (routeInside.reduce((a, b) => a + b.distance, 0) || 0)
-                            console.log('startIncompleteTrip:'+day.kms)
-                        }
-
-                        if(endIncompleteTrip.length){
-                            const routeInside = route.filter(p => new Date(p.fixTime).getTime() < endDate.getTime() && new Date(p.fixTime).getTime() > new Date(endIncompleteTrip[0].startTime).getTime())
-                            day.kms = day.kms + (routeInside.reduce((a, b) => a + b.distance, 0) || 0)
-                            console.log('endIncompleteTrip:'+day.kms)
+                            if (startIncompleteTrip.length) {
+                                const routeInside = route.filter(p => new Date(p.fixTime).getTime() > startDate.getTime() && new Date(p.fixTime).getTime() < new Date(startIncompleteTrip[0].endTime).getTime())
+                                day.kms = day.kms + (routeInside.reduce((a, b) => a + b.distance, 0) || 0)
+                                console.log('startIncompleteTrip:' + day.kms)
+                            }
+
+                            if (endIncompleteTrip.length) {
+                                const routeInside = route.filter(p => new Date(p.fixTime).getTime() < endDate.getTime() && new Date(p.fixTime).getTime() > new Date(endIncompleteTrip[0].startTime).getTime())
+                                day.kms = day.kms + (routeInside.reduce((a, b) => a + b.distance, 0) || 0)
+                                console.log('endIncompleteTrip:' + day.kms)
+                            }
                         }
                     }
-                }
 
-                days.push(day)
-            })
-            devicesResult.push({
-             device: d,
-             days: days
-            })
+                    days.push(day)
+                })
+                devicesResult.push({
+                 device: d,
+                 days: days
+                })
+            } else {
+                devicesResult.push({
+                    device: d,
+                    summary: {
+                        distance: deviceTrips.filter(t => t.distance > 0).reduce((a, b) => a + b.distance, 0),
+                    }
+                })
+            }
         }
     }
 
@@ -142,27 +161,22 @@ async function createKmsReport(from, to, reportUserData, traccar) {
     console.log(from, to)
     traccarInstance = traccar
     userData = reportUserData
-    if(userData.groupByDay){
-        const reportData = []
-
-        if(userData.byDriver){
-            const allData = await createKmsReportByDriver(from, to)
-            reportData.push(allData)
-        }
-        else if(userData.byGroup){
-            const allGroupsData = await createKmsReportByGroup(from, to)
-            allGroupsData.forEach(data => reportData.push(data))
-            const withoutGroupDevices = await createKmsReportByDevice(from, to)
-            reportData.push(withoutGroupDevices)
-        } else {
-            const allData = await createKmsReportByDevice(from, to)
-            reportData.push(allData)
-        }
-
-        return reportData
+    const reportData = []
+    if(userData.byDriver){
+        const allData = await createKmsReportByDriver(from, to)
+        reportData.push(allData)
+    }
+    else if(userData.byGroup){
+        const allGroupsData = await createKmsReportByGroup(from, to)
+        allGroupsData.forEach(data => reportData.push(data))
+        const withoutGroupDevices = await createKmsReportByDevice(from, to)
+        reportData.push(withoutGroupDevices)
     } else {
-        return await createActivityReport(from, to, userData, traccar)
+        const allData = await createKmsReportByDevice(from, to)
+        reportData.push(allData)
     }
+
+    return reportData
 }
 
 async function exportKmsReportToPDF(userData, reportData) {
@@ -170,6 +184,16 @@ async function exportKmsReportToPDF(userData, reportData) {
     const translations = messages[lang] ? messages[lang] : messages['en-GB']
     const kmsData = userData.byDriver ? reportData.drivers : reportData.devices
 
+    const weekDays = [
+        translations.report.sunday,
+        translations.report.monday,
+        translations.report.tuesday,
+        translations.report.wednesday,
+        translations.report.thursday,
+        translations.report.friday,
+        translations.report.saturday
+    ]
+
     const headers = []
     if(userData.groupByDay) {
         headers.push(translations.report.date,
@@ -186,32 +210,42 @@ async function exportKmsReportToPDF(userData, reportData) {
             translations.report.distance)
     }
     if (kmsData) {
-        let first = true
-        const doc = userData.groupByDay ? new jsPDF.jsPDF('p') : new jsPDF.jsPDF('l')
-        await headerFromUser(doc, translations.report.titleKmsReport, userData.user, 'p')
+        const orientation = userData.groupByDay ? 'p' : 'l'
+        const doc = new jsPDF.jsPDF(orientation)
+        await headerFromUser(doc, translations.report.titleKmsReport, userData.user, orientation)
 
         if (userData.groupByDay) {
-            for (const d of kmsData) {
+            kmsData.forEach(function (d, index) {
                 const name = userData.byDriver ? d.driver.name : d.device.name
                 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 = 8
                 }
+
                 doc.setFontSize(13)
                 doc.text(name, 20, space + 20)
                 doc.setFontSize(11)
                 doc.text(group ? translations.report.group + ': ' + group.name : '', 150, space + 20)
                 doc.text(new Date(reportData.from).toLocaleString() + ' - ' + new Date(reportData.to).toLocaleString(), 20, space + 25)
 
+                if(!userData.allWeek) {
+                    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)
+                }
+
                 const data = []
                 d.days.forEach(day => {
                     const temp = [
-                        new Date(day.date).toLocaleDateString(),
+                        new Date(day.date).toLocaleDateString() + ' - ' + weekDays[day.date.getDay()],
                         (day.kms/1000).toFixed(0)
                     ]
 
@@ -225,9 +259,8 @@ async function exportKmsReportToPDF(userData, reportData) {
                 )
 
                 const style = getStyle(getUserPartner(userData.user))
-
-                addTable(doc, headers, data, footValues, style, 35)
-            }
+                addTable(doc, headers, data, footValues, style, 40)
+            })
         } else {
             const data = []
             if (userData.byDriver) {
@@ -246,7 +279,7 @@ async function exportKmsReportToPDF(userData, reportData) {
                     const group = userData.groups.find(g => d.device.groupId === g.id)
 
                     const temp = [
-                        d.summary.deviceName,
+                        d.device.name,
                         d.device.model,
                         group ? group.name : '',
                         Number((d.summary.distance / 1000).toFixed(0))
@@ -285,6 +318,16 @@ function exportKmsReportToExcel(userData, reportData) {
     const lang = userData.user.attributes.lang || (navigator && navigator.language)
     const translations = messages[lang] ? messages[lang] : messages['en-GB']
 
+    const weekDays = [
+        translations.report.sunday,
+        translations.report.monday,
+        translations.report.tuesday,
+        translations.report.wednesday,
+        translations.report.thursday,
+        translations.report.friday,
+        translations.report.saturday
+    ]
+
     const settings = {
         sheetName: translations.report.titleKmsReport, // The name of the sheet
         fileName: fileName // The name of the spreadsheet
@@ -298,6 +341,7 @@ function exportKmsReportToExcel(userData, reportData) {
             {label: translations.report.licensePlate, value: 'licenseplate'},
             {label: translations.report.group, value: 'group'},
             {label: translations.report.date, value: 'date'},
+            {label: translations.report.weekDay, value: 'weekday'},
             {label: translations.report.distance, value: 'distance'})
     } else if(userData.byDriver) {
         headers.push(
@@ -326,12 +370,13 @@ function exportKmsReportToExcel(userData, reportData) {
                     group: group ? group.name : '',
                     licenseplate: d.device.attributes.license_plate,
                     date: a.date,
+                    weekday: weekDays[a.date.getDay()],
                     distance: Number((a.kms / 1000).toFixed(0))
                 }
             }))
         } else {
             data = data.concat([{
-                name: userData.byDriver ? d.driver.name : d.summary.deviceName,
+                name: userData.byDriver ? d.driver.name : d.device.name,
                 group: group ? group.name : '',
                 licenseplate: userData.byDriver ? '' : d.device.attributes.license_plate,
                 distance: Number((d.summary.distance / 1000).toFixed(0))

package/src/speeding-report.js

@@ -331,7 +331,7 @@ async function exportSpeedingReportToPDF(userData, reportData) {
     translations.report.duration,
   ]
 
-  if(userData.useRoadSpeedLimits) {
+  if(userData.roadSpeedLimits) {
     headers.splice(2, 0, translations.report.roadSpeedLimit)
   }
 
@@ -366,7 +366,7 @@ async function exportSpeedingReportToPDF(userData, reportData) {
         doc.text(group ? translations.report.group + ': ' + group.name : '', 150, space+20 )
         doc.text(new Date(d.from).toLocaleString() + ' - ' + new Date(d.to).toLocaleString(), 20, space+25 )
         if (d.alerts[0] && !userData.byDriver) {
-          doc.text(translations.report.speedLimit + ": " + Math.round(d.alerts[0].attributes.speedLimit * 1.85200) + ' Km/h', 20, space + 30)
+          doc.text(translations.report.speedLimit + ": " + (userData.useVehicleSpeedLimit ? Math.round(d.alerts[0].attributes.speedLimit * 1.85200) : userData.customSpeed) + ' Km/h', 20, space + 30)
         }
         d.alerts.map(a => {
           const temp = [
@@ -379,7 +379,7 @@ async function exportSpeedingReportToPDF(userData, reportData) {
             userData.byDriver ? a.deviceName : a.driver
           ]
 
-          if(userData.useRoadSpeedLimits){
+          if(userData.roadSpeedLimits){
             temp.splice(2, 0, a.roadSpeedLimit)
           }
 
@@ -395,7 +395,7 @@ async function exportSpeedingReportToPDF(userData, reportData) {
           convertMS(d.alerts.reduce((a, b) => a + b.eventTime, 0), true)
         ]
 
-        if(userData.useRoadSpeedLimits){
+        if(userData.roadSpeedLimits){
           footValues.splice(2, 0, '')
         }
 
@@ -454,7 +454,7 @@ function exportSpeedingReportToExcel(userData, reportData) {
     userData.byDriver ? {label: translations.report.vehicle, value:'name'} : {label: translations.report.driver, value:'driver'}
   ]
 
-  if (userData.useRoadSpeedLimits){
+  if (userData.roadSpeedLimits){
     headers.splice(3, 0, {label: translations.report.roadSpeedLimit, value:'roadSpeedLimit'})
   }
 

package/src/trip-report.js

@@ -6,40 +6,43 @@ require('jspdf-autotable')
 const {coordsDistance} = require("./util/utils")
 const drivers = require("./util/driver")
 const {getUserPartner} = require("fleetmap-partners")
-const {headerFromUser} = require("./util/pdfDocument")
+const {headerFromUser, addTable} = require("./util/pdfDocument")
 const {getStyle} = require("./reportStyle")
 const traccar = require("./util/traccar")
+const trips = 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)
+        const allData = await createTripReportByDriver(from, to)
         reportData.push(allData)
     }
     else if(userData.byGroup){
         console.log("ByGroup")
-        const allData = await createTripReportByGroup(from, to, userData)
+        const allData = await createTripReportByGroup(from, to)
         reportData.push(...allData)
     }
 
     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, userData, withoutGroupDevices)
+    const allData = await createTripReportByDevice(from, to, withoutGroupDevices)
     reportData.push(allData)
 
     return reportData
 }
 
-async function createTripReportByDevice(from, to, userData, devices) {
+async function createTripReportByDevice(from, to, devices) {
     const allData = {
         devices: [],
         xpert: devices.filter(d => d.attributes.xpert).length > 0
@@ -54,14 +57,14 @@ async function createTripReportByDevice(from, to, userData, devices) {
     console.log('Trips:' + data.length)
 
     if (data.length > 0) {
-        allData.devices = processDevices(from, to, devices, data, stopsData, userData)
-
+        await trips.checkTripsKms(traccarInstance, from, to,[], data, devices)
+        allData.devices = processDevices(from, to, devices, data, stopsData)
     }
 
     return allData
 }
 
-async function createTripReportByGroup(from, to, userData) {
+async function createTripReportByGroup(from, to) {
     const reportData = []
     for (const g of userData.groups) {
         const devices = userData.devices.filter(d => d.groupId === g.id)
@@ -93,7 +96,7 @@ async function createTripReportByGroup(from, to, userData) {
     return reportData
 }
 
-async function createTripReportByDriver(from, to, userData){
+async function createTripReportByDriver(from, to){
     const deviceIds = await drivers.devicesByDriver(traccarInstance, from, to, userData.drivers, userData.devices)
     console.log(deviceIds.length)
 
@@ -112,11 +115,11 @@ async function createTripReportByDriver(from, to, userData){
     return allData
 }
 
-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 || isInsideTimetable(t, userData)))
         const stops = stopsData.filter(s => s.deviceId === d.id)
 
         trips.forEach(t => {
@@ -146,8 +149,8 @@ function processDevices(from, to, devices, data, stopsData, userData) {
         })
 
         if (trips.length > 0) {
-            trips.forEach(function(trip, index) {
-                const stop = stops.length+1 > index ? stops[index+1] : null
+            trips.forEach(trip => {
+                const stop = getStop(new Date(trip.startTime), stops)
 
                 if (stop) {
                     trip.stopDuration = (new Date(stop.endTime) - new Date(stop.startTime))
@@ -240,27 +243,38 @@ async function exportTripReportToPDF(userData, reportData) {
     }
 
     if (tripsData) {
-        let first = true
         const doc = new jsPDF.jsPDF('l');
         await headerFromUser(doc, translations.report.titleTripReport, userData.user)
-        for(const d of tripsData){
+
+        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 = 8
             }
+
             doc.setFontSize(13)
             doc.text(name, 20, space+20 )
             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 )
+            if(!userData.allWeek) {
+                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 = [
@@ -306,28 +320,8 @@ async function exportTripReportToPDF(userData, reportData) {
             }
 
             const style = getStyle(getUserPartner(userData.user))
-            doc.autoTable({
-                head: [headers],
-                body: data,
-                foot: [footValues],
-                showFoot: 'lastPage',
-                headStyles: {
-                    fillColor: style.pdfHeaderColor,
-                    textColor: style.pdfHeaderTextColor,
-                    fontSize: 10
-                },
-                bodyStyles: {
-                    fillColor: style.pdfBodyColor,
-                    textColor: style.pdfBodyTextColor,
-                    fontSize: 8
-                },
-                footStyles: {
-                    fillColor: style.pdfFooterColor,
-                    textColor: style.pdfFooterTextColor,
-                    fontSize: 9
-                },
-                startY: space+35 })
-        }
+            addTable(doc, headers, data, footValues, style, space + (userData.allWeek ? 40 : 45))
+        })
         return doc
     }
 }
@@ -451,6 +445,39 @@ 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
+}
+
+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/traccar.js

@@ -52,7 +52,21 @@ async function getEvents(traccar, from, to, devices, events){
     return result.map(r => r.data).flat()
 }
 
+async function getSummary(traccar, from, to, devices){
+    const devicesToSlice = devices.slice()
+    const arrayOfArrays = automaticReports.sliceArray(devicesToSlice)
+    let requests = []
+    for (const a of arrayOfArrays) {
+        const promise = traccar.reports.reportsSummaryGet(from, to, a.map(d => d.id))
+        requests = requests.concat(promise)
+    }
+
+    const result = await Promise.all(requests)
+    return result.map(r => r.data).flat()
+}
+
 exports.getRoute = getRoute
 exports.getTrips = getTrips
 exports.getStops = getStops
 exports.getEvents = getEvents
+exports.getSummary = getSummary