fleetmap-reports 1.0.287 → 1.0.288

package/src/trip-report.js

@@ -1,151 +1,158 @@
-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");
-
+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");
 
 let traccarInstance
-let userData
 
 const fileName = 'TripReport'
 
-async function createTripReport(from, to, reportUserData, traccar) {
+async function createTripReport(from, to, userData, traccar) {
     console.log('Create TripReport')
-    userData = reportUserData
+
     traccarInstance = traccar
     const reportData = []
 
-    if (userData.byDriver) {
-        console.log("ByDriver")
-        const report = await createTripReportByDriver(from, to)
-        reportData.push(report)
+    if(userData.byDriver){
+        const allData = await createTripReportByDriver(from, to, userData)
+        reportData.push(allData)
     }
-    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)
-    }
+        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
+                }
 
-    return reportData
-}
+                const response = await traccarInstance.reports.reportsTripsGet(from, to, null, [g.id])
+                const data = response.data
 
-async function createTripReportByDevice(from, to) {
-    const devices = userData.devices
-    const allData = {
-        devices: [],
-        xpert: devices.filter(d => d.attributes.xpert).length > 0
-    }
+                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)
+                devices.sort((a, b) => (a.name > b.name) ? 1 : -1)
 
-    const devicesToSlice = devices.slice()
-    const data = await traccar.getTrips(traccarInstance, from, to, devicesToSlice)
-    const stopsData = await traccar.getStops(traccarInstance, from, to, devicesToSlice)
+                if (data.length > 0) {
 
-    console.log('Trips:' + data.length)
+                    console.log('Trips:' + data.length)
+                    groupData.devices = processDevices(from, to, devices, data, stopsData)
 
-    if (data.length > 0) {
-        await trips.checkTripsKms(traccarInstance, from, to,[], data, devices)
-        allData.devices = processDevices(from, to, devices, data, stopsData)
+                    reportData.push(groupData)
+                }
+            }
+        }
     }
 
-    return allData
-}
+    const groupIds = userData.groups.map(g => g.id)
+    const withoutGroupDevices = userData.byGroup ? userData.devices.filter(d => !groupIds.includes(d.groupId)) : userData.devices
 
-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
-            }
+    const allData = {
+        devices: [],
+        xpert: withoutGroupDevices.filter(d => d.attributes.xpert).length > 0
+    }
 
-            const response = await traccarInstance.reports.reportsTripsGet(from, to, null, [g.id])
-            const tripsData = response.data
+    withoutGroupDevices.sort((a, b) => (a.name > b.name) ? 1 : -1)
+    const devicesToSlice = withoutGroupDevices.slice()
 
-            const stopsResponse = await traccarInstance.reports.reportsStopsGet(from, to, null, [g.id])
-            const stopsData = stopsResponse.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)
 
-            devices.sort((a, b) => (a.name > b.name) ? 1 : -1)
+        const stopsResponse = await traccarInstance.reports.reportsStopsGet(from, to, a.map(d => d.id))
+        stopsData = stopsResponse.data
+    }
 
-            if (tripsData.length > 0) {
-                console.log('Trips:' + tripsData.length)
-                groupData.devices = processDevices(from, to, devices, tripsData, stopsData, userData)
+    console.log('Trips:' + data.length)
 
-                reportData.push(groupData)
-            }
-        }
+    if (data.length === 0) {
+        return reportData
     }
 
-    const groupIds = userData.groups.map(g => g.id)
-    const withoutGroupDevices = userData.devices.filter(d => !groupIds.includes(d.groupId))
+    allData.devices = processDevices(from, to, withoutGroupDevices, data, stopsData, userData)
 
-    const allData = await createTripReportByDevice(from, to, withoutGroupDevices)
     reportData.push(allData)
 
     return reportData
 }
 
-async function createTripReportByDriver(from, to){
-    const devices = await drivers.devicesByDriver(traccarInstance, from, to, userData.drivers, userData.devices)
-    console.log(devices.length)
+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
+    }
 
-    if(!devices.length){
-        //Empty report
-        return { drivers:[] }
+    const allData = {
+        drivers: []
     }
 
-    const tripsData = await traccar.getTrips(traccarInstance, from, to, devices)
+    allData.drivers = processDrivers(from, to, userData.drivers, tripsData)
 
-    return { drivers: processDrivers(from, to, userData.drivers, tripsData)}
+    return allData
 }
 
-function processDevices(from, to, devices, data, stopsData) {
+function processDevices(from, to, devices, data, stopsData, userData) {
     const devicesResult = []
 
     devices.forEach(d => {
-        const trips = data.filter(t => t.deviceId === d.id
-            && (userData.allWeek || !userData.weekDays || isInsideTimetable(t, userData)))
+        const trips = data.filter(t => t.deviceId === d.id)
         const stops = stopsData.filter(s => s.deviceId === d.id)
 
-        addNearestPOIs(trips, userData)
-
-        trips.forEach(trip => {
+        trips.forEach(t => {
+            t.totalKms = t.distance / 1000
             if (automaticReports.deviceWithFuelInfo(d)) {
-                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
+                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
             } else {
-                trip.fuelConsumption = '-'
-                trip.avgFuelConsumption = '-'
+                t.fuelConsumption = '-'
+                t.avgFuelConsumption = '-'
             }
 
-            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 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
             }
         })
 
         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,
@@ -173,12 +180,11 @@ function processDrivers(from, to, drivers, data) {
     console.log(data)
     const driversResult = []
     drivers.forEach(d => {
-        const trips = data.filter(t => t.driverUniqueId === d.uniqueId
-            && (userData.allWeek || !userData.weekDays || isInsideTimetable(t, userData)))
-
-        trips.sort((a,b)=>new Date(a.startTime).getTime()-new Date(b.startTime).getTime())
+        const trips = data.filter(t => t.driverUniqueId === d.uniqueId)
 
-        addNearestPOIs(trips, userData)
+        trips.forEach(t => {
+            t.totalKms = t.distance / 1000
+        })
 
         if (trips.length > 0) {
             const driverData = {
@@ -187,22 +193,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
 }
 
-async function exportTripReportToPDF(userData, reportData) {
+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
 
@@ -229,38 +235,29 @@ async function exportTripReportToPDF(userData, reportData) {
     }
 
     if (tripsData) {
+        let first = true
         const doc = new jsPDF.jsPDF('l');
-        await headerFromUser(doc, translations.report.titleTripReport, userData.user)
+        doc.setFontSize(14)
+        doc.text(translations.report.titleTripReport, 15, 15 )
 
-        tripsData.forEach(function (d, index) {
-            const data = []
+        for(const d of tripsData){
+            let 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 = index === 0 ? 8 : 0
-            if(index){
+            let space = 0
+            if(!first) {
                 doc.addPage()
+            } else {
+                first = false
+                space = 10
             }
-
-            doc.setFontSize(13)
+            doc.setFontSize(12)
             doc.text(name, 20, space+20 )
-            doc.setFontSize(11)
+            doc.setFontSize(10)
             doc.text(group ? translations.report.group + ': ' + group.name : '', 200, space+20 )
-            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 )
-            }
+            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 )
 
             d.trips.map(a => {
                 const temp = [
@@ -291,6 +288,7 @@ async function exportTripReportToPDF(userData, reportData) {
                 'Total:' + d.trips.length,
                 '','','',
                 convertMS(d.trips.reduce((a, b) => a + b.duration, 0)),
+
             ]
 
             if(userData.byDriver) {
@@ -305,9 +303,25 @@ async function exportTripReportToPDF(userData, reportData) {
                     getMaxSpeed(d.trips))
             }
 
-            const style = getStyle(getUserPartner(userData.user))
-            addTable(doc, headers, data, footValues, style, space + (userData.allWeek ? 40 : 45))
-        })
+            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 })
+        }
         return doc
     }
 }
@@ -384,17 +398,23 @@ function deviceName(device){
 }
 
 function getTripDate(user, trip){
-    return convertToLocaleDateString(trip.startTime, user.attributes.lang, user.attributes.timezone)
+    return new Date(trip.startTime).toLocaleDateString(user.attributes.lang, {
+        timeZone: user.attributes.timezone,
+        hour12: false
+    })
 }
-
 function getTripStart(user, trip){
-    return convertToLocaleTimeString(trip.startTime, user.attributes.lang, user.attributes.timezone)
+    return new Date(trip.startTime).toLocaleTimeString(user.attributes.lang, {
+        timeZone: user.attributes.timezone,
+        hour12: false
+    })
 }
-
 function getTripEnd(user, trip){
-    return convertToLocaleTimeString(trip.endTime, user.attributes.lang, user.attributes.timezone)
+    return new Date(trip.endTime).toLocaleTimeString(user.attributes.lang, {
+        timeZone: user.attributes.timezone,
+        hour12: false
+    })
 }
-
 function getDriverName(drivers, driverUniqueId) {
     if(driverUniqueId) {
         const driver = drivers.find(d => d.uniqueId === driverUniqueId)
@@ -403,22 +423,18 @@ 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) * item.totalKms
+        return Math.round(item.averageSpeed * 1.85200)
     })
-    const totalKms = data.reduce((a, b) => a + b.totalKms, 0)
-    return totalKms > 0 ? Math.round((values.reduce((a, b) => a + b, 0)) / totalKms) : 0
+    return Math.round((values.reduce((a, b) => a + b, 0)) / data.length)
 }
-
 function getMaxSpeed(data) {
     const values = data.map(item => {
         return item.maxSpeed
@@ -429,15 +445,6 @@ 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,17 +1,25 @@
-const traccar = require("./traccar");
+const automaticReports = require("../automaticReports")
 
 //get devices used by each driver between two dates
-async function devicesByDriver(traccarInstance, from, to, drivers, devices){
-    const eventsData = await traccar.getEvents(traccarInstance, from, to , devices, ['driverChanged'])
+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)
+    }
+
     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 devices.filter(d => deviceIds.includes(d.id))
+
+    return [...new Set(deviceIds.flat())]
 }
 
 exports.devicesByDriver = devicesByDriver

package/src/util/utils.js

@@ -1,4 +1,4 @@
-const axios = require('axios')
+
 const turf = require('turf')
 
 function convertMS(duration, withSeconds) {
@@ -29,72 +29,6 @@ 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()
-        img.src = '/img/logos/' + hostname + '.png'
-        return img
-    } catch (e) {
-        const response = await axios.get('https://' + hostname + '/img/logos/' + hostname + '.png', { responseType: 'arraybuffer' })
-        return Buffer.from(response.data, 'binary').toString('base64')
-    }
-}
-
-function isClientSide() { return (typeof window !== "undefined") }
-
-function convertToLocaleString(value, lang, timezone){
-    if(isClientSide()){
-        return new Date(value).toLocaleString()
-    } else {
-        return new Date(value).toLocaleString(lang, {
-            timeZone: timezone,
-            hour12: false
-        })
-    }
-}
-
-function convertToLocaleDateString(value, lang, timezone){
-    if(isClientSide){
-        return new Date(value).toLocaleDateString()
-    } else {
-        return new Date(value).toLocaleDateString(lang, {
-            timeZone: timezone,
-            hour12: false
-        })
-    }
-}
-
-function convertToLocaleTimeString(value, lang, timezone){
-    if(isClientSide){
-        return new Date(value).toLocaleTimeString()
-    } else {
-        return new Date(value).toLocaleTimeString(lang, {
-            timeZone: timezone,
-            hour12: false
-        })
-    }
-}
-
-exports.getImgFromUrl = getImgFromUrl
 exports.convertMS = convertMS
 exports.coordsDistance = coordsDistance
-exports.getDates = getDates
-exports.convertToLocaleString = convertToLocaleString
-exports.convertToLocaleDateString = convertToLocaleDateString
-exports.convertToLocaleTimeString = convertToLocaleTimeString
 

package/src/zone-report.js

@@ -1,12 +1,10 @@
 const moment = require('moment')
 const messages = require('../lang')
 const automaticReports = require("./automaticReports");
-const {convertMS, convertToLocaleString} = require("./util/utils")
+const {convertMS} = require("./util/utils")
 const jsPDF = require('jspdf')
 require('jspdf-autotable')
-const {headerFromUser} = require("./util/pdfDocument");
-const {getStyle} = require("./reportStyle")
-const {getUserPartner} = require("fleetmap-partners");
+const reportStyle = require("./reportStyle")
 
 const fileName = 'ZoneReport'
 
@@ -146,11 +144,10 @@ async function processDevices(from, to, devices, drivers, geofences, data, tracc
     return devicesResult
 }
 
-async function exportZoneReportToPDF(userData, reportData) {
+function exportZoneReportToPDF(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 headers = [
@@ -163,7 +160,9 @@ async function exportZoneReportToPDF(userData, reportData) {
     if (reportData.devices) {
         let first = true
         const doc = new jsPDF.jsPDF('l')
-        await headerFromUser(doc, translations.report.titleZoneReport, userData.user)
+        doc.setFontSize(14)
+        doc.text(translations.report.titleActivityReport, 15, 15 )
+
 
         reportData.devices.forEach(d => {
             let data = []
@@ -177,11 +176,11 @@ async function exportZoneReportToPDF(userData, reportData) {
                 first = false
                 space = 10
             }
-            doc.setFontSize(13)
+            doc.setFontSize(12)
             doc.text(name, 20, space+20 )
-            doc.setFontSize(11)
+            doc.setFontSize(10)
             doc.text(group ? translations.report.group + ': ' + group.name : '', 200, space+20 )
-            doc.text(convertToLocaleString(d.from, lang, timezone) + ' - ' + convertToLocaleString(d.to, lang, timezone), 20, space+25 )
+            doc.text(new Date(d.from).toLocaleString() + ' - ' + new Date(d.to).toLocaleString(), 20, space+25 )
             d.geofences.map(a => {
                 const temp = [
                     geofenceEnter(userData.user, a),
@@ -197,26 +196,22 @@ async function exportZoneReportToPDF(userData, reportData) {
                 'Total:' + d.geofences.length
             ]
 
-            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
+                    fillColor: reportStyle.pdfHeaderColor,
+                    textColor: reportStyle.pdfHeaderTextColor
                 },
                 bodyStyles: {
-                    fillColor: style.pdfBodyColor,
-                    textColor: style.pdfBodyTextColor,
-                    fontSize: 8
+                    fillColor: reportStyle.pdfBodyColor,
+                    textColor: reportStyle.pdfBodyTextColor
                 },
                 footStyles: {
-                    fillColor: style.pdfFooterColor,
-                    textColor: style.pdfFooterTextColor,
-                    fontSize: 9
+                    fillColor: reportStyle.pdfFooterColor,
+                    textColor: reportStyle.pdfFooterTextColor
                 },
                 startY: space+35 });
         })
@@ -272,10 +267,16 @@ function deviceName(device){
 }
 
 function geofenceEnter(user, row){
-    return row.inTime ? convertToLocaleString(row.inTime.fixTime, user.attributes.lang, user.attributes.timezone) : ''
+    return row.inTime ? new Date(row.inTime.fixTime).toLocaleString(user.attributes.lang, {
+        timeZone: user.attributes.timezone,
+        hour12: false
+    }) : ''
 }
 function geofenceExit(user, row){
-    return row.outTime ? convertToLocaleString(row.outTime.fixTime, user.attributes.lang, user.attributes.timezone) : ''
+    return row.outTime ? new Date(row.outTime.fixTime).toLocaleString(user.attributes.lang, {
+        timeZone: user.attributes.timezone,
+        hour12: false
+    }) : ''
 }
 
 exports.createZoneReport = createZoneReport