fleetmap-reports 1.0.284 → 1.0.288

package/src/kms-report.js

@@ -1,392 +1,100 @@
+const {createActivityReport} = require("./activity-report");
 const messages = require('../lang')
 const jsPDF = require('jspdf')
 require('jspdf-autotable')
-const {getStyle} = require("./reportStyle");
-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");
-const drivers = require("./util/driver");
-const {isInsideTimetable} = require("./util/trips");
+const reportStyle = require("./reportStyle")
 
 
 let traccarInstance
-let userData
 
 const fileName = 'KmsReport'
 
-async function createKmsReport(from, to, reportUserData, traccar) {
+async function createKmsReport(from, to, userData, traccar) {
     console.log('Create KmsReport')
-
-    console.log(from, to)
     traccarInstance = traccar
-    userData = reportUserData
-    const reportData = []
-    if(userData.byDriver){
-        console.log("ByDriver")
-        const allData = await createKmsReportByDriver(from, to)
-        reportData.push(allData)
-    }
-    else if(userData.byGroup){
-        console.log("ByGroup")
-        const allData = await createKmsReportByGroup(from, to)
-        reportData.push(...allData)
-    } else {
-        console.log("ByDevice")
-        const allData = await createKmsReportByDevice(from, to)
-        reportData.push(allData)
-    }
-
-    return reportData
-}
-
-async function createKmsReportByDevice(from, to) {
-    const groupIds = userData.groups.map(g => g.id)
-    const devicesToProcess = userData.byGroup ? userData.devices.filter(d => !groupIds.includes(d.groupId)) : userData.devices
-
-    const allData = {
-        devices: [],
-        from: from,
-        to: to
-    }
-
-    devicesToProcess.sort((a, b) => (a.name > b.name) ? 1 : -1)
-    const route = userData.allWeek ? [] : await traccar.getRoute(traccarInstance, from, to, devicesToProcess)
-    const tripsData = await traccar.getTrips(traccarInstance, from, to, devicesToProcess)
-
-    console.log('trips:' + tripsData.length)
-
-    if (tripsData.length > 0) {
-        await trips.checkTripsKms(traccarInstance, from, to, route, tripsData, devicesToProcess)
-        allData.devices = processDevices(from, to, devicesToProcess, route, tripsData)
-    }
-
-    return allData
-}
-
-async function createKmsReportByDriver(from, to) {
-    const devices = await drivers.devicesByDriver(traccarInstance, from, to, userData.drivers, userData.devices)
-    console.log(devices.length)
-
-    if(!devices.length) {
-        //empty report
-        return { drivers: [] }
-    }
-
-    const tripsData = await traccar.getTrips(traccarInstance, from, to, devices)
-    return { drivers: processDrivers(from, to, userData.drivers, tripsData) }
-}
-
-async function createKmsReportByGroup(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 route = userData.allWeek ? [] : await traccar.getRoute(traccarInstance, from, to, devices)
-            const tripsData = await traccar.getTrips(traccarInstance, from, to, devices)
-
-            devices.sort((a, b) => (a.name > b.name) ? 1 : -1)
-
-            console.log('trips:' + tripsData.length)
-
-            if (tripsData.length > 0) {
-                await trips.checkTripsKms(traccarInstance, from, to, route, tripsData, devices)
-                groupData.devices = processDevices(from, to, devices, route, tripsData)
-            }
-
-            reportData.push(groupData)
-        }
-    }
-
-    const withoutGroupData = await createKmsReportByDevice(from, to)
-    reportData.push(withoutGroupData)
-
-    return reportData
-}
-
-function processDrivers(from, to, drivers, data) {
-    console.log(data)
-    const driversResult = []
-    drivers.forEach(d => {
-        const trips = data.filter(t => t.driverUniqueId === d.uniqueId)
-        if (trips.length > 0) {
-            const driverData = {
-                driver: d
-            }
-            if(userData.groupByDay) {
-                driverData.days = []
-                const dates = getDates(from, to)
-                for(const date of dates){
-                    const fromByDay = new Date(date.getFullYear(), date.getMonth(), date.getDate(), 0, 0, 0)
-                    const toByDay = new Date(date.getFullYear(), date.getMonth(), date.getDate(), 23, 59, 59)
-
-                    const tripsByDay = trips.filter(t => (new Date(t.startTime) > fromByDay && new Date(t.endTime) < toByDay)
-                        && (userData.allWeek || !userData.weekDays || isInsideTimetable(t, userData)))
-
-                    driverData.days.push({
-                        date: date,
-                        kms: tripsByDay.filter(t => t.distance > 0).reduce((a, b) => a + b.distance, 0)
-                    })
-                }
-            } else {
-                driverData.summary = {
-                    distance: trips.filter(t => t.distance > 0).reduce((a, b) => a + b.distance, 0)
-                }
-            }
-            driversResult.push(driverData)
-        }
-    })
-
-    return driversResult
-}
-
-
-function processDevices(from, to, devices, route, trips) {
-    const devicesResult = []
-
-    for (const d of devices) {
-        const deviceTrips = trips.filter(t => t.deviceId === d.id)
-
-         if (deviceTrips.length > 0) {
-            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()
-                )
-
-                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 || !userData.weekDays){
-                        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())
-
-                            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
-                })
-            } else {
-                devicesResult.push({
-                    device: d,
-                    summary: {
-                        distance: deviceTrips.filter(t => t.distance > 0).reduce((a, b) => a + b.distance, 0),
-                    }
-                })
-            }
-        }
-    }
-
-    return devicesResult
+    return await createActivityReport(from, to, userData, traccar)
 }
 
-async function exportKmsReportToPDF(userData, reportData) {
-    const lang = userData.user.attributes.lang || (navigator && navigator.language)
+function exportKmsReportToPDF(userData, reportData) {
+    const lang = userData.user.attributes.lang
     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,
-            translations.report.distance)
-    }
-    else if(userData.byDriver) {
+    if(userData.byDriver) {
         headers.push(translations.report.driver,
             translations.report.group,
             translations.report.distance)
     } else {
         headers.push(translations.report.name,
-            translations.settings.vehicle_model,
             translations.report.group,
             translations.report.distance)
     }
-    if (kmsData) {
-        const orientation = userData.groupByDay ? 'p' : 'l'
-        const doc = new jsPDF.jsPDF(orientation)
-        await headerFromUser(doc, translations.report.titleKmsReport, userData.user, orientation)
-
-        if (userData.groupByDay) {
-            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 = index === 0 ? 8 : 0
-                if(index){
-                    doc.addPage()
-                }
-
-                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 && 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)
-                }
-
-                const data = []
-                d.days.forEach(day => {
-                    const temp = [
-                        new Date(day.date).toLocaleDateString() + ' - ' + weekDays[day.date.getDay()],
-                        (day.kms/1000).toFixed(0)
-                    ]
-
-                    data.push(temp)
-                })
-
-                const footValues = []
-                footValues.push(
-                    '',
-                    (d.days.reduce((a, b) => a + b.kms, 0)/1000).toFixed(0)
-                )
-
-                const style = getStyle(getUserPartner(userData.user))
-                addTable(doc, headers, data, footValues, style, 40)
+    if (reportData.devices || reportData.drivers) {
+        const doc = new jsPDF.jsPDF('l');
+        doc.setFontSize(14)
+        doc.text(translations.report.titleKmsReport, 15, 15 )
+
+        let data = []
+        doc.setFontSize(10)
+        doc.text(new Date(reportData.from).toLocaleString() + ' - ' + new Date(reportData.to).toLocaleString(), 20, 30 )
+        if(userData.byDriver) {
+            reportData.drivers.forEach(d => {
+                const group = userData.groups.find(g => g.drivers.includes(d.driver.id))
+
+                const temp = [
+                    d.driver.name,
+                    group ? group.name : '',
+                    Number((d.summary.distance / 1000).toFixed(0)),
+                ]
+                data.push(temp)
             })
         } else {
-            const data = []
-            if (userData.byDriver) {
-                reportData.drivers.forEach(d => {
-                    const group = userData.groups.find(g => g.drivers.includes(d.driver.id))
-
-                    const temp = [
-                        d.driver.name,
-                        group ? group.name : '',
-                        Number((d.summary.distance / 1000).toFixed(0)),
-                    ]
-                    data.push(temp)
-                })
-            } else {
-                reportData.devices.forEach(d => {
-                    const group = userData.groups.find(g => d.device.groupId === g.id)
-
-                    const temp = [
-                        d.device.name,
-                        d.device.model,
-                        group ? group.name : '',
-                        Number((d.summary.distance / 1000).toFixed(0))
-                    ]
-                    data.push(temp)
-                })
-            }
+            reportData.devices.forEach(d => {
+                const group = userData.groups.find(g => d.device.groupId === g.id)
+
+                const temp = [
+                    d.summary.deviceName,
+                    group ? group.name : '',
+                    Number((d.summary.distance / 1000).toFixed(0))
+                ]
+                data.push(temp)
+            })
+        }
 
-            const footValues = []
-            if(userData.byDriver) {
-                footValues.push(
-                    'Total:' + reportData.drivers.length,
-                    '',
-                    (reportData.drivers.reduce((a, b) => a + b.summary.distance, 0)/1000).toFixed(0)
-                )
-            } else {
-                footValues.push(
-                    'Total:' + reportData.devices.length,
-                    '',
-                    '',
-                    (reportData.devices.reduce((a, b) => a + b.summary.distance, 0)/1000).toFixed(0),
-                )
-            }
+        const footValues = []
+        if(userData.byDriver) {
+            footValues.push(
+                'Total:' + reportData.drivers.length,
+                '',
+                (reportData.drivers.reduce((a, b) => a + b.summary.distance, 0)/1000).toFixed(0)
+            )
+        } else {
+            footValues.push(
+                'Total:' + reportData.devices.length,
+                '',
+                (reportData.devices.reduce((a, b) => a + b.summary.distance, 0)/1000).toFixed(0),
+            )
+        }
 
-            const style = getStyle(getUserPartner(userData.user))
+        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: 35 });
 
-            addTable(doc, headers, data, footValues, style, 35)
-        }
         return doc
     }
 }
@@ -394,19 +102,9 @@ async function exportKmsReportToPDF(userData, reportData) {
 function exportKmsReportToExcel(userData, reportData) {
     console.log('Export to Excel')
 
-    const lang = userData.user.attributes.lang || (navigator && navigator.language)
+    const lang = userData.user.attributes.lang
     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
@@ -414,59 +112,55 @@ function exportKmsReportToExcel(userData, reportData) {
 
     const headers = []
 
-    if(userData.groupByDay) {
-        headers.push(
-            {label: translations.report.vehicle, value: 'name'},
-            {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) {
+    if(userData.byDriver) {
         headers.push(
-            {label: translations.report.driver, value: 'name'},
+            {label: translations.report.driver, value: 'driver'},
             {label: translations.report.group, value: 'group'},
             {label: translations.report.distance, value: 'distance'})
     } else {
         headers.push(
             {label: translations.report.vehicle, value: 'name'},
-            {label: translations.settings.vehicle_licenseplate, value: 'licenseplate'},
             {label: translations.report.group, value: 'group'},
             {label: translations.report.distance, value: 'distance'})
     }
 
     let data = []
-    const info = userData.byDriver ? reportData.drivers : reportData.devices
-    info.forEach(d => {
-        const group = userData.byDriver ? userData.groups.find(g => g.drivers.includes(d.driver.id)) :
-            userData.groups.find(g => d.device.groupId === g.id)
+    if(userData.byDriver){
+        if (reportData.drivers) {
+            reportData.drivers.forEach(d => {
+                const group = userData.groups.find(g => g.drivers.includes(d.driver.id))
 
-        if (userData.groupByDay) {
-            data = data.concat([{}])
-            data = data.concat(d.days.map(a => {
-                return {
-                    name: d.device.name,
+                data = data.concat([{
+                    driver: d.driver.name,
                     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.device.name,
-                group: group ? group.name : '',
-                licenseplate: userData.byDriver ? '' : d.device.attributes.license_plate,
-                distance: Number((d.summary.distance / 1000).toFixed(0))
-            }])
+                    distance: Number((d.summary.distance / 1000).toFixed(0))
+                }])
+            })
+            console.log(data)
+            return {
+                headers,
+                data,
+                settings
+            }
         }
-    })
+    } else {
+        if (reportData.devices) {
+            reportData.devices.forEach(d => {
+                const group = userData.groups.find(g => d.device.groupId === g.id)
 
-    return {
-        headers,
-        data,
-        settings
+                data = data.concat([{
+                    name: d.summary.deviceName,
+                    group: group ? group.name : '',
+                    distance: Number((d.summary.distance / 1000).toFixed(0))
+                }])
+            })
+            console.log(data)
+            return {
+                headers,
+                data,
+                settings
+            }
+        }
     }
 }
 

package/src/location-report.js

@@ -2,10 +2,7 @@ const automaticReports = require("./automaticReports");
 const messages = require('../lang')
 const jsPDF = require('jspdf')
 require('jspdf-autotable')
-const {headerFromUser} = require("./util/pdfDocument");
-const {getStyle} = require("./reportStyle")
-const {getUserPartner} = require("fleetmap-partners");
-const {convertToLocaleString} = require("./util/utils");
+const reportStyle = require("./reportStyle")
 
 const fileName = 'LocationReport'
 
@@ -101,11 +98,10 @@ function processDevices(from, to, devices, drivers, data) {
     return devicesResult
 }
 
-async function exportLocationReportToPDF(userData, reportData) {
+function exportLocationReportToPDF(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 = [
@@ -114,13 +110,14 @@ async function exportLocationReportToPDF(userData, reportData) {
         translations.report.speed,
         translations.report.ignition,
         translations.report.driver,
-        translations.report.temperature
+        translations.temperature
     ]
 
     if (reportData.devices) {
         let first = true
         const doc = new jsPDF.jsPDF('l');
-        await headerFromUser(doc, translations.report.titleLocationReport, userData.user)
+        doc.setFontSize(14)
+        doc.text(translations.report.titleLocationReport, 15, 15)
 
         reportData.devices.forEach(d => {
             let data = []
@@ -134,11 +131,11 @@ async function exportLocationReportToPDF(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, 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.positions.map(a => {
                 const temp = [
                     getLocationDate(a, userData.user),
@@ -156,26 +153,22 @@ async function exportLocationReportToPDF(userData, reportData) {
                 '', getMaxSpeed(d.positions)
             ]
 
-            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
             });
@@ -253,7 +246,10 @@ function deviceName(device){
 }
 
 function getLocationDate(location, user){
-    return convertToLocaleString(location.fixTime, user.attributes.lang, user.attributes.timezone)
+    return new Date(location.fixTime).toLocaleString(user.attributes.lang, {
+        timeZone: user.attributes.timezone,
+        hour12: false
+    })
 }
 
 function getDriverName(location, drivers) {