fleetmap-reports 1.0.248 → 1.0.252

package/src/trip-report.js

@@ -6,7 +6,7 @@ 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")
 
@@ -116,7 +116,7 @@ function processDevices(from, to, devices, data, stopsData, userData) {
     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 +146,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 +240,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 +317,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 +442,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

package/src/util/utils.js

@@ -29,6 +29,21 @@ function coordsDistance(lon1, lat1, lon2, lat2) {
     return (turf.distance(from, to, 'meters'))
 }
 
+function getDates(startDate, endDate) {
+    const dates = []
+    let currentDate = new Date(startDate.toISOString().split('T')[0] + ' 12:00 PM')
+    const addDays = function (days) {
+        const date = new Date(this.valueOf())
+        date.setDate(date.getDate() + days)
+        return date
+    }
+    while (currentDate <= endDate) {
+        dates.push(currentDate)
+        currentDate = addDays.call(currentDate, 1)
+    }
+    return dates
+}
+
 async function getImgFromUrl(hostname) {
     try {
         const img = new Image()
@@ -43,4 +58,5 @@ async function getImgFromUrl(hostname) {
 exports.getImgFromUrl = getImgFromUrl
 exports.convertMS = convertMS
 exports.coordsDistance = coordsDistance
+exports.getDates = getDates