fleetmap-reports 1.0.241 → 1.0.245

package/.idea/runConfigurations.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RunConfigurationProducerService">
+    <option name="ignoredProducers">
+      <set>
+        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
+      </set>
+    </option>
+  </component>
+</project>

package/.idea/shelf/Uncommitted_changes_before_Update_at_25_11_2021,_13_06_[Changes]/shelved.patch

@@ -0,0 +1,302 @@
+Index: src/kms-report.js
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
+<+>const {createActivityReport} = require(\"./activity-report\");\nconst messages = require('../lang')\nconst jsPDF = require('jspdf')\nrequire('jspdf-autotable')\nconst {getStyle} = require(\"./reportStyle\");\nconst {headerFromUser,addTable} = require(\"./util/pdfDocument\");\nconst {getUserPartner} = require(\"fleetmap-partners\");\nconst automaticReports = require(\"./automaticReports\");\n\n\nlet traccarInstance\n\nconst fileName = 'KmsReport'\n\nasync function createKmsReportByDevice(from, to, userData) {\n    const groupIds = userData.groups.map(g => g.id)\n    const devicesToProcess = userData.byGroup ? userData.devices.filter(d => !groupIds.includes(d.groupId)) : userData.devices\n\n    const allData = {\n        devices: [],\n        from: from,\n        to: to\n    }\n\n    devicesToProcess.sort((a, b) => (a.name > b.name) ? 1 : -1)\n    const devicesToSlice = devicesToProcess.slice()\n\n    const arrayOfArrays = automaticReports.sliceArray(devicesToSlice)\n    let data = []\n    for (const a of arrayOfArrays) {\n        const response = await traccarInstance.reports.reportsRouteGet(from, to, a.map(d => d.id))\n        data = data.concat(response.data)\n    }\n\n    console.log('locations:' + data.length)\n\n    if (data.length > 0) {\n        allData.devices = processDevices(from, to, devicesToProcess, data)\n    }\n\n    return allData\n}\n\nasync function createKmsReportByDriver(from, to, userData) {\n\n}\n\nasync function createKmsReportByGroup(from, to, userData) {\n\n}\n\nfunction processDevices(from, to, devices, data) {\n    const devicesResult = []\n\n    for (const d of devices) {\n        const locations = data.filter(t => t.deviceId === d.id)\n\n        if (locations.length > 0) {\n            locations.forEach(l => l.locationDate = l.fixTime.substring(0, 10))\n            const groupedLocations = locations.reduce(\n                (entryMap, e) => entryMap.set(e.locationDate, [...entryMap.get(e.locationDate)||[], e]),\n                new Map()\n            )\n\n            const days = []\n            const keys = Array.from(groupedLocations.keys())\n\n            keys.forEach(key => {\n                const dayLocations = groupedLocations.get(key)\n                const day = {\n                    date: new Date(key).toLocaleDateString(),\n                    kms: dayLocations.reduce((a, b) => a + b.attributes.distance, 0) || 0\n                }\n                days.push(day)\n            })\n\n            devicesResult.push({\n                device: d,\n                days: days\n            })\n        }\n    }\n\n    return devicesResult\n}\n\nasync function createKmsReport(from, to, userData, traccar) {\n    console.log('Create KmsReport')\n    traccarInstance = traccar\n    if(userData.groupByDay){\n        const reportData = []\n\n        if(userData.byDriver){\n            const allData = await createKmsReportByDriver(from, to, userData)\n            reportData.push(allData)\n        }\n        else if(userData.byGroup){\n            const allGroupsData = await createKmsReportByGroup(from, to, userData)\n            allGroupsData.forEach(data => reportData.push(data))\n            const withoutGroupDevices = await createKmsReportByDevice(from, to, userData)\n            reportData.push(withoutGroupDevices)\n        } else {\n            const allData = await createKmsReportByDevice(from, to, userData)\n            reportData.push(allData)\n        }\n\n        return reportData\n    } else {\n        return await createActivityReport(from, to, userData, traccar)\n    }\n}\n\nasync function exportKmsReportToPDF(userData, reportData) {\n    const lang = userData.user.attributes.lang\n    const translations = messages[lang] ? messages[lang] : messages['en-GB']\n    const kmsData = userData.byDriver ? reportData.drivers : reportData.devices\n\n    const headers = []\n    if(userData.groupByDay) {\n        headers.push(translations.report.date,\n            translations.report.distance)\n    }\n    else if(userData.byDriver) {\n        headers.push(translations.report.driver,\n            translations.report.group,\n            translations.report.distance)\n    } else {\n        headers.push(translations.report.name,\n            translations.settings.vehicle_model,\n            translations.report.group,\n            translations.report.distance)\n    }\n    if (kmsData) {\n        let first = true\n        const doc = userData.groupByDay ? new jsPDF.jsPDF() : new jsPDF.jsPDF('l')\n        await headerFromUser(doc, translations.report.titleKmsReport, userData.user)\n\n        if (userData.groupByDay) {\n            for (const d of kmsData) {\n                const name = userData.byDriver ? d.driver.name : d.device.name\n                const group = userData.byDriver ? userData.groups.find(g => g.drivers.includes(d.id)) : userData.groups.find(g => d.device.groupId === g.id)\n\n                let space = 0\n                if (!first) {\n                    doc.addPage()\n                } else {\n                    first = false\n                    space = 8\n                }\n                doc.setFontSize(13)\n                doc.text(name, 20, space + 20)\n                doc.setFontSize(11)\n                doc.text(group ? translations.report.group + ': ' + group.name : '', 150, space + 20)\n                doc.text(new Date(reportData.from).toLocaleString() + ' - ' + new Date(reportData.to).toLocaleString(), 20, space + 25)\n\n                const data = []\n                d.days.forEach(day => {\n                    const temp = [\n                        new Date(day.date).toLocaleDateString(),\n                        (day.kms/1000).toFixed(0)\n                    ]\n\n                    data.push(temp)\n                })\n\n                const footValues = []\n                footValues.push(\n                    '',\n                    (d.days.reduce((a, b) => a + b.kms, 0)/1000).toFixed(0)\n                )\n\n                const style = getStyle(getUserPartner(userData.user))\n\n                addTable(doc, headers, data, footValues, style, 35)\n            }\n        } else {\n            const data = []\n            if (userData.byDriver) {\n                reportData.drivers.forEach(d => {\n                    const group = userData.groups.find(g => g.drivers.includes(d.driver.id))\n\n                    const temp = [\n                        d.driver.name,\n                        group ? group.name : '',\n                        Number((d.summary.distance / 1000).toFixed(0)),\n                    ]\n                    data.push(temp)\n                })\n            } else {\n                reportData.devices.forEach(d => {\n                    const group = userData.groups.find(g => d.device.groupId === g.id)\n\n                    const temp = [\n                        d.summary.deviceName,\n                        d.device.model,\n                        group ? group.name : '',\n                        Number((d.summary.distance / 1000).toFixed(0))\n                    ]\n                    data.push(temp)\n                })\n            }\n\n            const footValues = []\n            if(userData.byDriver) {\n                footValues.push(\n                    'Total:' + reportData.drivers.length,\n                    '',\n                    (reportData.drivers.reduce((a, b) => a + b.summary.distance, 0)/1000).toFixed(0)\n                )\n            } else {\n                footValues.push(\n                    'Total:' + reportData.devices.length,\n                    '',\n                    '',\n                    (reportData.devices.reduce((a, b) => a + b.summary.distance, 0)/1000).toFixed(0),\n                )\n            }\n\n            const style = getStyle(getUserPartner(userData.user))\n\n            addTable(doc, headers, data, footValues, style, 35)\n        }\n        return doc\n    }\n}\n\nfunction exportKmsReportToExcel(userData, reportData) {\n    console.log('Export to Excel')\n\n    const lang = userData.user.attributes.lang || (navigator && navigator.language)\n    const translations = messages[lang] ? messages[lang] : messages['en-GB']\n\n    const settings = {\n        sheetName: translations.report.titleKmsReport, // The name of the sheet\n        fileName: fileName // The name of the spreadsheet\n    }\n\n    const headers = []\n\n    if(userData.groupByDay) {\n        headers.push(\n            {label: translations.report.vehicle, value: 'name'},\n            {label: translations.report.group, value: 'group'},\n            {label: translations.report.date, value: 'date'},\n            {label: translations.report.distance, value: 'distance'})\n    } else if(userData.byDriver) {\n        headers.push(\n            {label: translations.report.driver, value: 'name'},\n            {label: translations.report.group, value: 'group'},\n            {label: translations.report.distance, value: 'distance'})\n    } else {\n        headers.push(\n            {label: translations.report.driver, value: 'name'},\n            {label: translations.settings.vehicle_licenseplate, value: 'licenseplate'},\n            {label: translations.report.group, value: 'group'},\n            {label: translations.report.distance, value: 'distance'})\n    }\n\n    let data = []\n    const info = userData.byDriver ? reportData.drivers : reportData.devices\n    info.forEach(d => {\n        const group = userData.byDriver ? userData.groups.find(g => g.drivers.includes(d.driver.id)) :\n            userData.groups.find(g => d.device.groupId === g.id)\n\n            if (userData.groupByDay) {\n                data = data.concat([{}])\n                data = data.concat(d.days.map(a => {\n                    return {\n                        name: userData.byDriver ? d.driver.name : d.device.name,\n                        group: group ? group.name : '',\n                        licenseplate: d.device.attributes.license_plate,\n                        date: a.date,\n                        distance: Number((a.kms / 1000).toFixed(0))\n                    }\n                }))\n            } else {\n                data = data.concat([{\n                    name: userData.byDriver ? d.driver.name : d.summary.deviceName,\n                    group: group ? group.name : '',\n                    licenseplate: d.device.attributes.license_plate,\n                    distance: Number((d.summary.distance / 1000).toFixed(0))\n                }])\n            }\n    })\n\n    return {\n        headers,\n        data,\n        settings\n    }\n}\n\nexports.createKmsReport = createKmsReport\nexports.exportKmsReportToPDF = exportKmsReportToPDF\nexports.exportKmsReportToExcel = exportKmsReportToExcel\n
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/src/kms-report.js b/src/kms-report.js
+--- a/src/kms-report.js	(revision 58228cbbf2fb1d2086aedd420a0492cca40a9e64)
++++ b/src/kms-report.js	(date 1637843169450)
+@@ -6,6 +6,7 @@
+ const {headerFromUser,addTable} = require("./util/pdfDocument");
+ const {getUserPartner} = require("fleetmap-partners");
+ const automaticReports = require("./automaticReports");
++const {jsPDFOptions} = require("jspdf");
+ 
+ 
+ let traccarInstance
+@@ -132,8 +133,8 @@
+     }
+     if (kmsData) {
+         let first = true
+-        const doc = userData.groupByDay ? new jsPDF.jsPDF() : new jsPDF.jsPDF('l')
+-        await headerFromUser(doc, translations.report.titleKmsReport, userData.user)
++        const doc = userData.groupByDay ? new jsPDF.jsPDF('p') : new jsPDF.jsPDF('l')
++        await headerFromUser(doc, translations.report.titleKmsReport, userData.user, 'p')
+ 
+         if (userData.groupByDay) {
+             for (const d of kmsData) {
+@@ -156,7 +157,7 @@
+                 const data = []
+                 d.days.forEach(day => {
+                     const temp = [
+-                        new Date(day.date).toLocaleDateString(),
++                        day.date,
+                         (day.kms/1000).toFixed(0)
+                     ]
+ 
+@@ -240,6 +241,7 @@
+     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.distance, value: 'distance'})
+@@ -250,8 +252,8 @@
+             {label: translations.report.distance, value: 'distance'})
+     } else {
+         headers.push(
+-            {label: translations.report.driver, value: 'name'},
+-            {label: translations.settings.vehicle_licenseplate, value: 'licenseplate'},
++            {label: translations.report.vehicle, value: 'name'},
++            {label: translations.report.licensePlate, value: 'licenseplate'},
+             {label: translations.report.group, value: 'group'},
+             {label: translations.report.distance, value: 'distance'})
+     }
+@@ -262,25 +264,25 @@
+         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.groupByDay) {
+-                data = data.concat([{}])
+-                data = data.concat(d.days.map(a => {
+-                    return {
+-                        name: userData.byDriver ? d.driver.name : d.device.name,
+-                        group: group ? group.name : '',
+-                        licenseplate: d.device.attributes.license_plate,
+-                        date: a.date,
+-                        distance: Number((a.kms / 1000).toFixed(0))
+-                    }
+-                }))
+-            } else {
+-                data = data.concat([{
+-                    name: userData.byDriver ? d.driver.name : d.summary.deviceName,
+-                    group: group ? group.name : '',
+-                    licenseplate: d.device.attributes.license_plate,
+-                    distance: Number((d.summary.distance / 1000).toFixed(0))
+-                }])
+-            }
++        if (userData.groupByDay) {
++            data = data.concat([{}])
++            data = data.concat(d.days.map(a => {
++                return {
++                    name: d.device.name,
++                    group: group ? group.name : '',
++                    licenseplate: d.device.attributes.license_plate,
++                    date: a.date,
++                    distance: Number((a.kms / 1000).toFixed(0))
++                }
++            }))
++        } else {
++            data = data.concat([{
++                name: userData.byDriver ? d.driver.name : d.summary.deviceName,
++                group: group ? group.name : '',
++                licenseplate: userData.byDriver ? '' : d.device.attributes.license_plate,
++                distance: Number((d.summary.distance / 1000).toFixed(0))
++            }])
++        }
+     })
+ 
+     return {
+Index: src/util/pdfDocument.js
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
+<+>require('jspdf-autotable')\nconst {getStyle} = require(\"../reportStyle\");\nconst {getUserPartner} = require(\"fleetmap-partners\");\nconst {getImgFromUrl} = require(\"./utils\")\n\nasync function header(doc, title, hostname, style) {\n    doc.setFontSize(16)\n    doc.setFont('helvetica', 'bold')\n    doc.text(title, 15, 15 )\n\n    if(style.imgWidth && style.imgHeight) {\n        try{\n            const image = await getImgFromUrl(hostname)\n            if(image){\n                doc.addImage(image, 'PNG', 220 + (style.imgWidth < 50 ? 25 : 0), 5, style.imgWidth, style.imgHeight)\n            }\n        } catch (e) {\n        }\n    }\n    doc.setFont('helvetica', 'normal')\n}\n\nasync function headerFromUser(doc, title, user) {\n    const partner = getUserPartner(user)\n    return header(doc, title, partner.host, getStyle(partner))\n}\n\nfunction addTable(doc, headers, data, footValues, style, startY){\n    doc.autoTable({\n        head: [headers],\n        body: data,\n        foot: [footValues],\n        showFoot: 'lastPage',\n        headStyles: {\n            fillColor: style.pdfHeaderColor,\n            textColor: style.pdfHeaderTextColor,\n            fontSize: 10\n        },\n        bodyStyles: {\n            fillColor: style.pdfBodyColor,\n            textColor: style.pdfBodyTextColor,\n            fontSize: 8\n        },\n        footStyles: {\n            fillColor: style.pdfFooterColor,\n            textColor: style.pdfFooterTextColor,\n            fontSize: 9\n        },\n        startY: startY });\n}\n\nexports.header = header\nexports.headerFromUser = headerFromUser\nexports.addTable = addTable\n
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/src/util/pdfDocument.js b/src/util/pdfDocument.js
+--- a/src/util/pdfDocument.js	(revision 58228cbbf2fb1d2086aedd420a0492cca40a9e64)
++++ b/src/util/pdfDocument.js	(date 1637843134108)
+@@ -3,7 +3,7 @@
+ const {getUserPartner} = require("fleetmap-partners");
+ const {getImgFromUrl} = require("./utils")
+ 
+-async function header(doc, title, hostname, style) {
++async function header(doc, title, hostname, style, orientation) {
+     doc.setFontSize(16)
+     doc.setFont('helvetica', 'bold')
+     doc.text(title, 15, 15 )
+@@ -12,7 +12,7 @@
+         try{
+             const image = await getImgFromUrl(hostname)
+             if(image){
+-                doc.addImage(image, 'PNG', 220 + (style.imgWidth < 50 ? 25 : 0), 5, style.imgWidth, style.imgHeight)
++                doc.addImage(image, 'PNG', (orientation === 'l' ? 220 : 175) + (style.imgWidth < 50 ? 25 : 0), 5, style.imgWidth, style.imgHeight)
+             }
+         } catch (e) {
+         }
+@@ -20,9 +20,9 @@
+     doc.setFont('helvetica', 'normal')
+ }
+ 
+-async function headerFromUser(doc, title, user) {
++async function headerFromUser(doc, title, user, orientation='l') {
+     const partner = getUserPartner(user)
+-    return header(doc, title, partner.host, getStyle(partner))
++    return header(doc, title, partner.host, getStyle(partner), orientation)
+ }
+ 
+ function addTable(doc, headers, data, footValues, style, startY){
+Index: src/index.test.js
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
+<+>const Index = require('./index')\nconst {SessionApi} = require(\"traccar-api\");\nconst axios = require('axios')\nconst axiosCookieJarSupport = require('axios-cookiejar-support').default;\nconst tough = require('tough-cookie');\nconst cookieJar = new tough.CookieJar();\n\naxiosCookieJarSupport(axios)\n\ntest('speedingReport', async () => {\n    const traccarConfig = {\n        basePath: 'https://api.pinme.io/api',\n        baseOptions: {\n            withCredentials: true,\n            jar: cookieJar\n        }\n    }\n\n    await new SessionApi(traccarConfig, null, axios).sessionPost('-','-')\n    const report = new Index(traccarConfig,  axios)\n    const userData = await report.getUserData()\n\n    await report.speedingReport(new Date(2021, 2, 30, 0, 0, 0, 0),\n        new Date(2021, 2, 30, 23, 59, 59, 0),\n        userData)\n\n}, 10000)\n
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/src/index.test.js b/src/index.test.js
+--- a/src/index.test.js	(revision 58228cbbf2fb1d2086aedd420a0492cca40a9e64)
++++ b/src/index.test.js	(date 1637711242723)
+@@ -3,25 +3,42 @@
+ const axios = require('axios')
+ const axiosCookieJarSupport = require('axios-cookiejar-support').default;
+ const tough = require('tough-cookie');
++const style = require("./reportStyle");
+ const cookieJar = new tough.CookieJar();
+ 
+ axiosCookieJarSupport(axios)
+ 
+-test('speedingReport', async () => {
+-    const traccarConfig = {
+-        basePath: 'https://api.pinme.io/api',
+-        baseOptions: {
+-            withCredentials: true,
+-            jar: cookieJar
+-        }
+-    }
++
++describe('test reports', function() {
++    this.timeout(9000000)
++    it('test queue', async () => {
++        const traccarConfig = {
++            basePath: 'https://api.fleetmap.io/api',
++            baseOptions: {
++                withCredentials: true,
++                jar: cookieJar
++            }
++        }
+ 
+-    await new SessionApi(traccarConfig, null, axios).sessionPost('-','-')
+-    const report = new Index(traccarConfig,  axios)
+-    const userData = await report.getUserData()
+-
+-    await report.speedingReport(new Date(2021, 2, 30, 0, 0, 0, 0),
+-        new Date(2021, 2, 30, 23, 59, 59, 0),
+-        userData)
++        await new SessionApi(traccarConfig, null, axios).sessionPost('jppenas@gmail.com', 'penas46881')
++        const report = new Index(traccarConfig, axios)
++        const userData = await report.getUserData()
++        userData.groupByDay = true
++        const reportData = await report.kmsReport(new Date(2021, 10, 19, 0, 0, 0, 0),
++            new Date(2021, 10, 21, 23, 59, 59, 0),
++            userData)
+ 
+-}, 10000)
++        const reportResult = reportData[0]
++        reportResult.devices.forEach(d => {
++            console.log(d.device.name)
++            d.days.forEach(day => {
++                console.log(day.date + ' - ' + day.kms)
++            })
++        })
++
++
++        const pdf = report.kmsReportToPDF(userData, reportResult)
++
++        console.log(pdf)
++    })
++})
+Index: lang/enGB.js
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
+<+>module.exports = {\n  route: {\n    map: 'Map',\n    dashboard: 'Dashboard',\n    reports: 'Reports',\n    report: 'Report',\n    report_trip_title: 'Trip Report',\n    report_location_title: 'Location Report',\n    report_zone_crossing: 'Zone Report',\n    report_speeding: 'Relatório de Excessos de Velocidade',\n    report_speeding_beta: 'Relatório de Excessos de Velocidade BETA',\n    report_tolls: 'Relatório de Portagens',\n    settings: 'Settings',\n    duration: 'Duration'\n  },\n  map: {\n    geofence_create_title: 'New geofence',\n    geofence_create_name: 'Please enter the name of this geofence...',\n    geofence_created: 'Geofence created sucessfully!',\n    geofence_create_canceled: 'Input canceled',\n    poi_create_title: 'New POI',\n    poi_create_name: 'Please enter the name of this POI...',\n    poi_created: 'POI created sucessfully!',\n    poi_create_canceled: 'Input canceled',\n    create_confirm: 'OK',\n    create_cancel: 'Cancel',\n    loading: 'Loading',\n    totalDistance: 'Distância total'\n  },\n  vehicleList: {\n    title: 'Vehicle',\n    search: 'Search...',\n    column_name: 'Name',\n    column_speed: 'Km/h',\n    column_lastUpdate: 'Last update'\n  },\n  vehicleTable: {\n    immobilize: 'Immobilize',\n    de_immobilize: 'De-Immobilize',\n    send_immobilization: 'Send immobilization command?',\n    send_de_immobilization: 'Send de-immobilization command?',\n    all_vehicles: 'All',\n    moving_vehicles: 'Moving',\n    idle_vehicles: 'Idle',\n    stopped_vehicles: 'Stopped',\n    disconnected_vehicles: 'Disconnected'\n  },\n  vehicleDetail: {\n    show_route: 'Show route'\n  },\n  poiTable: {\n    showPOIs: 'Show POIs',\n    edit_poi: 'Edit',\n    delete_poi: 'Delete'\n  },\n  dashboard: {\n    startdate: 'Start date',\n    enddate: 'End Date',\n    period_lastweek: 'Last week',\n    period_lastmonth: 'Last month',\n    period_last3month: 'Last 3 months'\n  },\n  navbar: {\n    profile: 'Profile',\n    notifications: 'Notifications',\n    settings: 'Settings',\n    logout: 'Log Out'\n  },\n  login: {\n    login_user: 'Email',\n    login_password: 'Password',\n    login_button: 'Login',\n    login_password_warn: 'The password can not be less than 6 digits'\n  },\n  profile: {\n    user_account: 'Account',\n    user_name: 'Name',\n    user_email: 'E-mail',\n    user_password: 'Password',\n    user_phone: 'Phone',\n    user_language: 'Language',\n    user_timezone: 'Timezone',\n    user_update_button: 'Update',\n    user_updated: 'User information has been updated successfully.',\n    user_name_required: 'Name field is required',\n    user_email_required: 'Please input a valid email',\n    user_password_lengh: 'The password can not be less than 6 digits'\n  },\n  settings: {\n    map: 'Map',\n    vehicles: 'Vehicles',\n    title: 'Settings',\n    route_match: 'Route match',\n    alerts: 'Alerts',\n    alerts_type: 'Type',\n    alerts_notificators: 'Notificators',\n    alert_ignitionOff: 'Ignition Off',\n    alert_ignitionOn: 'Ignition On',\n    alert_geofenceEnter: 'Geofence Enter',\n    alert_geofenceExit: 'Geofence Exit',\n    alert_deviceOverspeed: 'Device Overspeed',\n    alert_deleted: 'Alert has been deleted',\n    alert_delete_info: 'Do you want to delete the alert ',\n    alert_delete_title: 'Delete Alert',\n    alert_edit_confirm: 'Confirm',\n    alert_edit_cancel: 'Cancel',\n    alert_created: 'Alert created sucessfully!',\n    alert_updated: 'Alert updated sucessfully!',\n    alert_add: 'Add Alert',\n    alert_edit: 'Edit Alert',\n    alert_delete: 'Delete Alert',\n    alert_overspeed_warning: 'Vehicle without defined top speed',\n    alert_geofences_warning: 'Vehicle without associated geofences',\n    alert_associate_geofences: 'Associate Geofences',\n    alert_form_type: 'Type:',\n    alert_form_type_placeholder: 'Select alert type',\n    alert_form_vehicles: 'Vehicles:',\n    alert_form_geofences: 'Geofences:',\n    alert_form_all_vehicles: 'All vehicles',\n    alert_form_vehicles_placeholder: 'Select vehicles',\n    alert_form_notificator_web: 'Web',\n    alert_form_notificator_email: 'E-mail',\n    alert_form_notificator_sms: 'SMS',\n    alert_form_confirm: 'Save',\n    alert_form_cancel: 'Cancel',\n    alert_form_geofences_placeholder: 'Select geofences',\n    vehicle_edit: 'Edit Vehicle',\n    vehicle_name: 'Name',\n    vehicle_licenseplate: 'License Plate',\n    vehicle_model: 'Model',\n    vehicle_speed_limit: 'Speed Limit',\n    vehicle_form_cancel: 'Cancel',\n    vehicle_form_confirm: 'Save',\n    vehicle_form_name: 'Name',\n    vehicle_form_model: 'Model',\n    vehicle_form_speed_limit: 'Speed Limit (Km/h)',\n    vehicle_updated: 'Vehicle updated sucessfully!'\n  },\n  geofence: {\n    showGeofences: 'Show Geofences',\n    geofence_name: 'Name',\n    geofence_edit: 'Edit',\n    geofence_delete: 'Delete',\n    geofence_deleted: 'Geofence has been deleted',\n    geofence_delete_info: 'Do you want to delete geofence ',\n    geofence_delete_title: 'Delete Geofence',\n    geofence_edit_title: 'Edit Geofence',\n    geofence_edit_name: 'Please enter the name of this geofence...',\n    geofence_edit_confirm: 'Confirm',\n    geofence_edit_cancel: 'Cancel',\n    geofence_edit_canceled: 'Edit canceled',\n    geofence_edited: 'Geofence edited sucessfully!',\n    poi_delete_info: 'Do you want to delete POI ',\n    poi_delete_title: 'Delete POI',\n    poi_edited: 'POI edited sucessfully!',\n    poi_deleted: 'POI has been deleted',\n    poi_edit_title: 'Edit POI',\n    poi_edit_name: 'Please enter the name of this POI...',\n    searchGeofence: 'Search geofence',\n    edit_geofence: 'Edit',\n    delete_geofence: 'Delete'\n  },\n  report: {\n    temperature: 'Temperatura',\n    temperature2: 'Temperatura2',\n    select_vehicles: 'Select vehicles',\n    select_vehicles_placeholder: 'Vehicles',\n    select_geofences: 'Select geofences',\n    select_geofences_placeholder: 'Geofences',\n    select_period: 'Select period',\n    period: 'Period',\n    date_start: 'Start date',\n    date_end: 'End date',\n    generate_report: 'Generate report',\n    validate_period: 'Por favor seleccione o período',\n    user: 'User',\n    titleTripReport: 'Trip Report',\n    titleLocationReport: 'Locations Report',\n    titleSpeedingReport: 'Overspeed Report',\n    titleZoneReport: 'Zone Report',\n    titleRefuelReport: 'Refueling Report',\n    titleFuelDropReport: 'Fuel Drop Report',\n    titleEventsReport: 'Events Report',\n    titleActivityReport: 'Activity Report',\n    titleKmsReport: 'Kms Report',\n    from: 'From',\n    to: 'to',\n    headerStartAddress: 'Start address',\n    headerDistance: 'Distance',\n    headerDrivingTime: 'Driving Time',\n    headerMaxSpeed: 'Max Speed',\n    date: 'Date',\n    start: 'Start',\n    end: 'End',\n    endAddress: 'Destination',\n    tripTime: 'Duration',\n    idleTime: 'Idle',\n    stopTime: 'Stop',\n    distance: 'Distance',\n    speed: 'Speed',\n    roadSpeedLimit: 'Limite da estrada',\n    overspeed: 'Alert On',\n    avgSpeed: 'Avg Speed',\n    maxSpeed: 'Max Speed',\n    driver: 'Driver',\n    group: 'Group',\n    address: 'Address',\n    ignition: 'Ignition',\n    ignitionOn: 'On',\n    ignitionOff: 'Off',\n    enter: 'Enter',\n    exit: 'Exit',\n    geofence: 'Geofence',\n    duration: 'Duration',\n    vehicles: 'Vehicles',\n    vehicle: 'Vehicle',\n    odometer: 'Odometer',\n    startOdometer: 'Start (Km)',\n    endOdometer: 'End (Km)',\n    spentFuel: 'Spent Fuel',\n    engineHours: 'Use (H:m)',\n    driverHours: 'Driving Time (H:m)',\n    refueling: 'Refueling',\n    totalRefueled: 'Total Refueled',\n    totalFuelDrops: 'Total Fuel Drops',\n    totalFuelDropLiters: 'Total Fuel Lost',\n    speedLimit: 'Speed Limit',\n    eventType: 'Event',\n    info: 'Information',\n    event_ignitionOff: 'Ignition Off',\n    event_ignitionOn: 'Ignition On',\n    event_deviceOverspeed: 'Device Overspeed',\n    event_geofenceEnter: 'Geofence Enter',\n    event_geofenceExit: 'Geofence Exit',\n    event_deviceFuelDrop: 'Fuel Drop',\n    event_driverChanged: 'Driver Changed',\n    event_sos: 'SOS',\n    event_powerOn: 'Power TakeOff',\n    event_powerCute: 'Power Cut',\n    unsubscribeTripReport: 'If you no longer wish to receive these emails, please go to %url% and remove the option \"Trip report\" in the settings in the \"Reports\" section.',\n    unsubscribeLocationsReport: 'If you no longer wish to receive these emails, please go to %url% and remove the option \"Locations report\" in the settings in the \"Reports\" section.',\n    unsubscribeSpeedingReport: 'If you no longer wish to receive these emails, please go to %url% and remove the option \"Overspeed report\" in the settings in the \"Reports\" section.',\n    unsubscribeZoneReport: 'If you no longer wish to receive these emails, please go to %url% and remove the option \"Zone report\" in the settings in the \"Reports\" section.',\n    unsubscribeRefuelingReport: 'If you no longer wish to receive these emails, please go to %url% and remove the option \"Refueling report\" in the settings in the \"Reports\" section.',\n    unsubscribeFuelDropReport: 'If you no longer wish to receive these emails, please go to %url% and remove the option \"Fuel drop report\" in the settings in the \"Reports\" section.'\n  },\n  layout: {\n    deviceOnline: 'Device Online',\n    deviceMoving: 'Device Moving',\n    deviceStopped: 'Device Stopped',\n    ignitionOff: 'Ignition Off',\n    ignitionOn: 'Ignition On',\n    deviceOverspeed: 'Device Overspeed',\n    geofenceEnter: 'Geofence Enter',\n    geofenceExit: 'Geofence Exit',\n    deviceFuelDrop: 'Fuel Drop',\n    driverChanged: 'Driver Changed',\n    test: 'Test Notification',\n    sos: 'Panic',\n    powerOn: 'Power Take-Off',\n    device: 'Device',\n    time: 'Time',\n    address: 'Address',\n    driver: 'Driver',\n    group: 'Group',\n    in: 'in',\n    fuelDropInfo: 'Fuel drop greater than '\n  }\n};\n
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/lang/enGB.js b/lang/enGB.js
+--- a/lang/enGB.js	(revision 58228cbbf2fb1d2086aedd420a0492cca40a9e64)
++++ b/lang/enGB.js	(date 1637757399425)
+@@ -214,6 +214,7 @@
+     duration: 'Duration',
+     vehicles: 'Vehicles',
+     vehicle: 'Vehicle',
++    licensePlate: 'License Plate',
+     odometer: 'Odometer',
+     startOdometer: 'Start (Km)',
+     endOdometer: 'End (Km)',
+Index: lang/ptBR.js
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
+<+>module.exports = {\n  route: {\n    map: 'Mapa',\n    dashboard: 'Central de Controlo',\n    reports: 'Relatórios',\n    report_trip_title: 'Relatório de viagens',\n    report_location_title: 'Relatório de posições',\n    report_zone_crossing: 'Relatório de zonas',\n    settings: 'Configurações',\n    duration: 'Duração'\n  },\n  map: {\n    geofence_create_title: 'Nova Cerca Eletrônica',\n    geofence_create_name: 'Por favor indique o nome da cerca eletrônica...',\n    geofence_created: 'Cerca eletrônica criada com sucesso!',\n    geofence_create_canceled: 'Criação de cerca eletrônica cancelada!',\n    poi_create_title: 'Novo POI',\n    poi_create_name: 'Por favor indique o nome do POI...',\n    poi_created: 'POI criado com sucesso!',\n    poi_create_canceled: 'Criação do POI cancelada!',\n    create_confirm: 'Confirmar',\n    create_cancel: 'Cancelar'\n  },\n  vehicleList: {\n    title: 'Veículos',\n    search: 'Pesquisar...',\n    column_name: 'Nome',\n    column_speed: 'Km/h',\n    column_lastUpdate: 'Última Actualização'\n  },\n  vehicleTable: {\n    immobilize: 'Imobilizar',\n    de_immobilize: 'Remobilizar',\n    send_immobilization: 'Enviar comando de imobilização para o veículo',\n    send_de_immobilization: 'Enviar comando de remobilização para veículo',\n    all_vehicles: 'Todos',\n    moving_vehicles: 'Em Movimento',\n    idle_vehicles: 'Ralenti',\n    stopped_vehicles: 'Parado',\n    disconnected_vehicles: 'Desconectado'\n  },\n  vehicleDetail: {\n    show_route: 'Mostrar rota'\n  },\n  poiTable: {\n    showPOIs: 'Ver POIs'\n  },\n  dashboard: {\n    startdate: 'Data de Início',\n    enddate: 'Data de Fim',\n    period_lastweek: 'Última semana',\n    period_lastmonth: 'Último mês',\n    period_last3month: 'Últimos 3 meses'\n  },\n  navbar: {\n    profile: 'Perfil',\n    notifications: 'Notificações',\n    settings: 'Configurações',\n    logout: 'Sair'\n  },\n  login: {\n    login_password: 'Palavra-chave',\n    login_button: 'Entrar',\n    login_password_warn: 'A Palavra-chave não pode ter menos de 6 dígitos',\n    login_user: 'Utilizador'\n  },\n  profile: {\n    user_account: 'Utilizador',\n    user_name: 'Nome',\n    user_email: 'E-mail',\n    user_password: 'Palavra-chave',\n    user_phone: 'Telefone',\n    user_language: 'Idioma',\n    user_timezone: 'Fuso horário',\n    user_update_button: 'Gravar',\n    user_updated: 'Informação do utilizador foi actualizada.',\n    user_name_required: 'O campo nome é obrigatório',\n    user_email_required: 'Por favor indique um e-mail válido',\n    user_password_lengh: 'A Palavra-chave não pode ter menos de 6 dígitos'\n  },\n  settings: {\n    map: 'Mapa',\n    vehicles: 'Veículos',\n    title: 'Configurações',\n    route_match: 'Rota na estrada',\n    alerts: 'Alertas',\n    alerts_type: 'Tipo',\n    alerts_notificators: 'Vias',\n    alert_ignitionOff: 'Ignição Desligada',\n    alert_ignitionOn: 'Ignição Ligada',\n    alert_geofenceEnter: 'Entrada em Baliza',\n    alert_geofenceExit: 'Saída de Baliza',\n    alert_deviceOverspeed: 'Excesso de Velocidade',\n    alert_deleted: 'O Alerta foi apagado.',\n    alert_delete_info: 'Pretende apagar o alerta de ',\n    alert_delete_title: 'Apagar Alerta',\n    alert_edit_confirm: 'Confirmar',\n    alert_edit_cancel: 'Cancelar',\n    alert_created: 'Alerta criado com sucesso!',\n    alert_updated: 'Alerta actualizado com sucesso!',\n    alert_add: 'Adicioncar Alerta',\n    alert_edit: 'Editar Alerta',\n    alert_delete: 'Apagar Alerta',\n    alert_overspeed_warning: 'Veículo sem velocidade máxima definida',\n    alert_geofences_warning: 'Veículo sem balizas associadas',\n    alert_associate_geofences: 'Associar Balizas',\n    alert_form_type: 'Tipo:',\n    alert_form_type_placeholder: 'Seleccionar o tipo de alerta',\n    alert_form_vehicles: 'Veículos:',\n    alert_form_geofences: 'Balizas:',\n    alert_form_all_vehicles: 'Todos os veículos',\n    alert_form_vehicles_placeholder: 'Seleccionar veículos',\n    alert_form_notificator_web: 'Web',\n    alert_form_notificator_email: 'E-mail',\n    alert_form_notificator_sms: 'SMS',\n    alert_form_confirm: 'Gravar',\n    alert_form_cancel: 'Cancelar',\n    alert_form_geofences_placeholder: 'Seleccionar balizas',\n    vehicle_edit: 'Editar Veículo',\n    vehicle_name: 'Nome',\n    vehicle_licenseplate: 'Matrícula',\n    vehicle_model: 'Modelo',\n    vehicle_speed_limit: 'Limite de Velocidade',\n    vehicle_form_cancel: 'Cancelar',\n    vehicle_form_confirm: 'Guardar',\n    vehicle_form_name: 'Nome',\n    vehicle_form_model: 'Modelo',\n    vehicle_form_speed_limit: 'Limite de Velocidade (Km/h)',\n    vehicle_updated: 'Veículo actualizado com sucesso!'\n  },\n  geofence: {\n    showGeofences: 'Ver Cercas Eletrônicas',\n    geofence_name: 'Nome',\n    geofence_edit: 'Editar',\n    geofence_delete: 'Apagar',\n    geofence_deleted: 'A cerca eletrônica foi apagada',\n    geofence_delete_info: 'Pretende apagar a cerca eletrônica ',\n    geofence_delete_title: 'Apagar Cerca Eletrônica',\n    geofence_edit_title: 'Editar Cerca Eletrônica',\n    geofence_edit_name: 'Por favor indique o nome da cerca eletrônica...',\n    geofence_edit_confirm: 'Confirmar',\n    geofence_edit_cancel: 'Cancelar',\n    geofence_edit_canceled: 'Edição cancelada',\n    geofence_edited: 'Cerca Eletrônica editada com sucesso!',\n    poi_delete_info: 'Pretende apagar o POI ',\n    poi_delete_title: 'Apagar POI',\n    poi_edited: 'POI editada com sucesso!',\n    poi_deleted: 'POI  foi apagada',\n    poi_edit_title: 'Editar POI',\n    poi_edit_name: 'Por favor indique o nome do POI...',\n    searchGeofence: 'Procurar Cerca Eletrônica',\n    edit_geofence: 'Editar',\n    delete_geofence: 'Apagar'\n  },\n  report: {\n    temperature: 'Temperatura',\n    temperature2: 'Temperatura2',\n    select_vehicles: 'Seleccionar veículos',\n    select_vehicles_placeholder: 'Veículos',\n    select_geofences: 'Seleccionar balizas',\n    select_geofences_placeholder: 'Balizas',\n    select_period: 'Seleccionar período',\n    date_start: 'Data de início',\n    date_end: 'Data de fim',\n    generate_report: 'Gerar relatório',\n    user: 'Utilizador',\n    titleTripReport: 'Relatório de Viagens',\n    titleLocationReport: 'Relatório de Posições',\n    titleSpeedingReport: 'Relatório de Excessos de Velocidade',\n    titleZoneReport: 'Relatório de Zonas',\n    titleRefuelingReport: 'Relatório de Abastecimentos',\n    titleFuelDropReport: 'Relatório de Perdas de Combustível',\n    titleEventsReport: 'Relatório de Eventos',\n    titleActivityReport: 'Relatório de Actividade',\n    titleKmsReport: 'Relatórios de Kms',\n    from: 'De',\n    to: 'a',\n    headerStartAddress: 'Local de início',\n    headerDistance: 'Distância percorrida',\n    headerDrivingTime: 'Tempo de condução',\n    headerMaxSpeed: 'Velocidade Máx.',\n    date: 'Data',\n    start: 'Início',\n    end: 'Fim',\n    endAddress: 'Destino',\n    tripTime: 'Duração',\n    idleTime: 'Ralenti',\n    stopTime: 'Paragem',\n    distance: 'Distância',\n    speed: 'Velocidade',\n    overspeed: 'Alerta Ligado',\n    avgSpeed: 'Vel.Média',\n    maxSpeed: 'Vel.Max',\n    driver: 'Motorista',\n    group: 'Grupo',\n    address: 'Local',\n    ignition: 'Ignição',\n    ignitionOn: 'Ligada',\n    ignitionOff: 'Desligada',\n    enter: 'Entrada',\n    exit: 'Saida',\n    geofence: 'Zona',\n    duration: 'Duração',\n    vehicles: 'Veículos',\n    vehicle: 'Veículo',\n    odometer: 'Conta-Quilómetros',\n    startOdometer: 'Início (Km)',\n    endOdometer: 'Fim (Km)',\n    spentFuel: 'Consumo (L)',\n    engineHours: 'Utilização (H:m)',\n    driverHours: 'Tempo de Condução (H:m)',\n    refueling: 'Abastecimentos',\n    totalRefueled: 'Total Abastecido',\n    totalFuelDrops: 'Total de Ocorrências',\n    totalFuelDropLiters: 'Combustível Perdido',\n    speedLimit: 'Limite de Velocidade',\n    eventType: 'Evento',\n    info: 'Informação',\n    event_ignitionOff: 'Ignição Desligada',\n    event_ignitionOn: 'Ignição Ligada',\n    event_deviceOverspeed: 'Excesso de Velocidade',\n    event_geofenceEnter: 'Entrada em Zona',\n    event_geofenceExit: 'Saída em Zona',\n    event_deviceFuelDrop: 'Perda de Combustível',\n    event_driverChanged: 'Mudança de Motorista',\n    event_sos: 'SOS',\n    event_powerOn: 'Tomada de Força',\n    event_powerCut: 'Corte de Corrente',\n    unsubscribeTripReport: 'Se não deseja receber estes emails por favor aceda a %url% e remova a opção \"Relatório de viagens\" nas definições na secção \"Relatórios\".',\n    unsubscribeLocationsReport: 'Se não deseja receber estes emails por favor aceda a %url% e remova a opção \"Relatório de posições\" nas definições na secção \"Relatórios\".',\n    unsubscribeSpeedingReport: 'Se não deseja receber estes emails por favor aceda a %url% e remova a opção \"Relatório de excesso de velocidade\" nas definições na secção \"Relatórios\".',\n    unsubscribeZoneReport: 'Se não deseja receber estes emails por favor aceda a %url% e remova a opção \"Relatório de zonas\" nas definições na secção \"Relatórios\".',\n    unsubscribeRefuelingReport: 'Se não deseja receber estes emails por favor aceda a %url% e remova a opção \"Relatório de abastecimentos\" nas definições na secção \"Relatórios\".',\n    unsubscribeFuelDropReport: 'Se não deseja receber estes emails por favor aceda a %url% e remova a opção \"Relatório de perdas de combustível\" nas definições na secção \"Relatórios\".'\n  },\n  layout: {\n    deviceOnline: 'Dispositivo Online',\n    deviceMoving: 'Veículo em Movimento',\n    deviceStopped: 'Veículo Parado',\n    ignitionOff: 'Ignição Desligada',\n    ignitionOn: 'Ignição Ligada',\n    deviceOverspeed: 'Excesso de Velocidade',\n    geofenceEnter: 'Entrada de Baliza',\n    geofenceExit: 'Saída de Baliza',\n    deviceFuelDrop: 'Perda de Combustível',\n    driverChanged: 'Mudança de Motorista',\n    test: 'Test Notification',\n    sos: 'SOS',\n    powerOn: 'Tomada de Força',\n    device: 'Veículo',\n    time: 'Data',\n    address: 'Local',\n    driver: 'Motorista',\n    group: 'Grupo',\n    in: 'em',\n    fuelDropInfo: 'Perda de combustível superior a '\n  }\n};\n
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/lang/ptBR.js b/lang/ptBR.js
+--- a/lang/ptBR.js	(revision 58228cbbf2fb1d2086aedd420a0492cca40a9e64)
++++ b/lang/ptBR.js	(date 1637757399701)
+@@ -203,6 +203,7 @@
+     duration: 'Duração',
+     vehicles: 'Veículos',
+     vehicle: 'Veículo',
++    licensePlate: 'Placa',
+     odometer: 'Conta-Quilómetros',
+     startOdometer: 'Início (Km)',
+     endOdometer: 'Fim (Km)',
+Index: package.json
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
+<+>{\n  \"name\": \"fleetmap-reports\",\n  \"version\": \"1.0.230\",\n  \"description\": \"\",\n  \"main\": \"src/index.js\",\n  \"scripts\": {\n    \"test\": \"jest\"\n  },\n  \"keywords\": [],\n  \"author\": \"\",\n  \"license\": \"ISC\",\n  \"dependencies\": {\n    \"axios\": \"^0.21.1\",\n    \"axios-cookiejar-support\": \"^1.0.1\",\n    \"fleetmap-partners\": \"^1.0.42\",\n    \"json-as-xlsx\": \"^1.2.1\",\n    \"jspdf\": \"^2.3.1\",\n    \"jspdf-autotable\": \"^3.5.14\",\n    \"moment\": \"^2.29.1\",\n    \"tough-cookie\": \"^4.0.0\",\n    \"traccar-api\": \"^1.0.5\",\n    \"turf\": \"^3.0.14\",\n    \"turf-point\": \"^2.0.1\",\n    \"wkt\": \"^0.1.1\"\n  },\n  \"devDependencies\": {\n    \"axios-debug-log\": \"^0.8.4\",\n    \"mocha\": \"^9.0.3\",\n    \"webpack\": \"^5.24.3\",\n    \"webpack-cli\": \"^4.5.0\"\n  }\n}\n
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/package.json b/package.json
+--- a/package.json	(revision 58228cbbf2fb1d2086aedd420a0492cca40a9e64)
++++ b/package.json	(date 1637761358619)
+@@ -1,6 +1,6 @@
+ {
+   "name": "fleetmap-reports",
+-  "version": "1.0.230",
++  "version": "1.0.232",
+   "description": "",
+   "main": "src/index.js",
+   "scripts": {
+Index: lang/ptPT.js
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
+<+>module.exports = {\n  route: {\n    map: 'Mapa',\n    dashboard: 'Central de Controlo',\n    reports: 'Relatórios',\n    report: 'Relatório',\n    report_trip_title: 'Relatório de viagens',\n    report_location_title: 'Relatório de posições',\n    report_zone_crossing: 'Relatório de zonas',\n    settings: 'Configurações',\n    duration: 'Duração'\n  },\n  map: {\n    geofence_create_title: 'Nova Geofence',\n    geofence_create_name: 'Por favor indique o nome da baliza...',\n    geofence_created: 'Geofence criada com sucesso!',\n    geofence_create_canceled: 'Criação de baliza cancelada!',\n    poi_create_title: 'Novo POI',\n    poi_create_name: 'Por favor indique o nome do POI...',\n    poi_created: 'POI criado com sucesso!',\n    poi_create_canceled: 'Criação do POI cancelada!',\n    create_confirm: 'Confirmar',\n    create_cancel: 'Cancelar',\n    loading: 'A carregar'\n  },\n  vehicleList: {\n    title: 'Veículos',\n    search: 'Pesquisar...',\n    column_name: 'Nome',\n    column_speed: 'Km/h',\n    column_lastUpdate: 'Última Actualização'\n  },\n  vehicleTable: {\n    immobilize: 'Imobilizar',\n    de_immobilize: 'Remobilizar',\n    send_immobilization: 'Enviar comando de imobilização para o veículo ',\n    send_de_immobilization: 'Enviar comando de remobilização para o veículo ',\n    all_vehicles: 'Todos',\n    moving_vehicles: 'Em Movimento',\n    idle_vehicles: 'Ralenti',\n    stopped_vehicles: 'Parado',\n    disconnected_vehicles: 'Desconhecido'\n  },\n  vehicleDetail: {\n    show_route: 'Rota'\n  },\n  poiTable: {\n    showPOIs: 'Ver POIs',\n    edit_poi: 'Editar',\n    delete_poi: 'Apagar'\n  },\n  dashboard: {\n    startdate: 'Data de Início',\n    enddate: 'Data de Fim',\n    period_lastweek: 'Última semana',\n    period_lastmonth: 'Último mês',\n    period_last3month: 'Últimos 3 meses'\n  },\n  navbar: {\n    profile: 'Perfil',\n    notifications: 'Notificações',\n    settings: 'Configurações',\n    logout: 'Sair'\n  },\n  login: {\n    login_password: 'Palavra-chave',\n    login_button: 'Entrar',\n    login_password_warn: 'A Palavra-chave não pode ter menos de 6 dígitos',\n    login_user: 'Utilizador'\n  },\n  profile: {\n    user_account: 'Utilizador',\n    user_name: 'Nome',\n    user_email: 'E-mail',\n    user_password: 'Palavra-chave',\n    user_phone: 'Telefone',\n    user_language: 'Idioma',\n    user_timezone: 'Fuso horário',\n    user_update_button: 'Gravar',\n    user_updated: 'Informação do utilizador foi actualizada.',\n    user_name_required: 'O campo nome é obrigatório',\n    user_email_required: 'Por favor indique um e-mail válido',\n    user_password_lengh: 'A Palavra-chave não pode ter menos de 6 dígitos'\n  },\n  settings: {\n    map: 'Mapa',\n    vehicles: 'Veículos',\n    title: 'Configurações',\n    route_match: 'Rota na estrada',\n    alerts: 'Alertas',\n    alerts_type: 'Tipo',\n    alerts_notificators: 'Vias',\n    alert_ignitionOff: 'Ignição Desligada',\n    alert_ignitionOn: 'Ignição Ligada',\n    alert_geofenceEnter: 'Entrada em Baliza',\n    alert_geofenceExit: 'Saída de Baliza',\n    alert_deviceOverspeed: 'Excesso de Velocidade',\n    alert_deleted: 'O Alerta foi apagado.',\n    alert_delete_info: 'Pretende apagar o alerta de ',\n    alert_delete_title: 'Apagar Alerta',\n    alert_edit_confirm: 'Confirmar',\n    alert_edit_cancel: 'Cancelar',\n    alert_created: 'Alerta criado com sucesso!',\n    alert_updated: 'Alerta actualizado com sucesso!',\n    alert_add: 'Adicionar Alerta',\n    alert_edit: 'Editar Alerta',\n    alert_delete: 'Apagar Alerta',\n    alert_overspeed_warning: 'Veículo sem velocidade máxima definida',\n    alert_geofences_warning: 'Veículo sem balizas associadas',\n    alert_associate_geofences: 'Associar Balizas',\n    alert_form_type: 'Tipo:',\n    alert_form_type_placeholder: 'Seleccionar o tipo de alerta',\n    alert_form_vehicles: 'Veículos:',\n    alert_form_geofences: 'Balizas:',\n    alert_form_all_vehicles: 'Todos os veículos',\n    alert_form_vehicles_placeholder: 'Seleccionar veículos',\n    alert_form_notificator_web: 'Web',\n    alert_form_notificator_email: 'E-mail',\n    alert_form_notificator_sms: 'SMS',\n    alert_form_confirm: 'Gravar',\n    alert_form_cancel: 'Cancelar',\n    alert_form_geofences_placeholder: 'Seleccionar balizas',\n    vehicle_edit: 'Editar Veículo',\n    vehicle_name: 'Nome',\n    vehicle_licenseplate: 'Matrícula',\n    vehicle_model: 'Modelo',\n    vehicle_speed_limit: 'Limite de Velocidade',\n    vehicle_form_cancel: 'Cancelar',\n    vehicle_form_confirm: 'Guardar',\n    vehicle_form_name: 'Nome',\n    vehicle_form_model: 'Modelo',\n    vehicle_form_speed_limit: 'Limite de Velocidade (Km/h)',\n    vehicle_updated: 'Veículo actualizado com sucesso!'\n  },\n  geofence: {\n    showGeofences: 'Ver Balizas',\n    geofence_name: 'Nome',\n    geofence_edit: 'Editar',\n    geofence_delete: 'Apagar',\n    geofence_deleted: 'A baliza foi apagada',\n    geofence_delete_info: 'Pretende apagar a baliza ',\n    geofence_delete_title: 'Apagar Baliza',\n    geofence_edit_title: 'Editar Baliza',\n    geofence_edit_name: 'Por favor indique o nome da baliza...',\n    geofence_edit_confirm: 'Confirmar',\n    geofence_edit_cancel: 'Cancelar',\n    geofence_edit_canceled: 'Edição cancelada',\n    geofence_edited: 'Baliza editada com sucesso!',\n    poi_delete_info: 'Pretende apagar o POI ',\n    poi_delete_title: 'Apagar POI',\n    poi_edited: 'POI editada com sucesso!',\n    poi_deleted: 'POI  foi apagada',\n    poi_edit_title: 'Editar POI',\n    poi_edit_name: 'Por favor indique o nome do POI...',\n    searchGeofence: 'Procurar baliza',\n    edit_geofence: 'Editar',\n    delete_geofence: 'Apagar'\n  },\n  report: {\n    temperature: 'Temperatura',\n    temperature2: 'Temperatura2',\n    select_vehicles: 'Seleccionar veículos',\n    select_vehicles_placeholder: 'Veículos',\n    select_geofences: 'Seleccionar balizas',\n    select_geofences_placeholder: 'Balizas',\n    select_period: 'Seleccionar período',\n    date_start: 'Data de início',\n    date_end: 'Data de fim',\n    generate_report: 'Gerar relatório',\n    period: 'Período',\n    validate_period: 'Por favor seleccione o período.',\n    user: 'Utilizador',\n    titleTripReport: 'Relatório de Viagens',\n    titleLocationReport: 'Relatório de Posições',\n    titleSpeedingReport: 'Relatório de Excessos de Velocidade',\n    titleZoneReport: 'Relatório de Zonas',\n    titleRefuelingReport: 'Relatório de Abastecimentos',\n    titleFuelDropReport: 'Relatório de Perdas de Combustível',\n    titleEventsReport: 'Relatório de Eventos',\n    titleActivityReport: 'Relatório de Actividade',\n    titleKmsReport: 'Relatórios de Kms',\n    from: 'De',\n    to: 'a',\n    headerStartAddress: 'Local de início',\n    headerDistance: 'Distância percorrida',\n    headerDrivingTime: 'Tempo de condução',\n    headerMaxSpeed: 'Velocidade Máx.',\n    date: 'Data',\n    start: 'Início',\n    end: 'Fim',\n    endAddress: 'Destino',\n    tripTime: 'Duração',\n    idleTime: 'Ralenti',\n    stopTime: 'Paragem',\n    distance: 'Distância',\n    speed: 'Velocidade',\n    overspeed: 'Alerta Ligado',\n    roadSpeedLimit: 'Limite da estrada',\n    avgSpeed: 'Vel.Média',\n    maxSpeed: 'Vel.Max',\n    driver: 'Motorista',\n    group: 'Grupo',\n    address: 'Local',\n    ignition: 'Ignição',\n    ignitionOn: 'Ligada',\n    ignitionOff: 'Desligada',\n    enter: 'Entrada',\n    exit: 'Saida',\n    geofence: 'Zona',\n    duration: 'Duração',\n    vehicles: 'Veículos',\n    vehicle: 'Veículo',\n    odometer: 'Conta-Quilómetros',\n    startOdometer: 'Início (Km)',\n    endOdometer: 'Fim (Km)',\n    spentFuel: 'Consumo (L)',\n    engineHours: 'Utilização (H:m)',\n    driverHours: 'Tempo de Condução (H:m)',\n    refueling: 'Abastecimentos',\n    totalRefueled: 'Total Abastecido',\n    totalFuelDrops: 'Total de Ocorrências',\n    totalFuelDropLiters: 'Combustível Perdido',\n    deviceOnline: 'Dispositivo Online',\n    deviceMoving: 'Veículo em Movimento',\n    deviceStopped: 'Veículo Parado',\n    speedLimit: 'Limite de Velocidade',\n    eventType: 'Evento',\n    info: 'Informação',\n    event_ignitionOff: 'Ignição Desligada',\n    event_ignitionOn: 'Ignição Ligada',\n    event_deviceOverspeed: 'Excesso de Velocidade',\n    event_geofenceEnter: 'Entrada em Zona',\n    event_geofenceExit: 'Saída em Zona',\n    event_deviceFuelDrop: 'Perda de Combustível',\n    event_driverChanged: 'Mudança de Motorista',\n    event_sos: 'SOS',\n    event_powerOn: 'Tomada de Força',\n    event_powerCut: 'Corte de Corrente',\n    unsubscribeTripReport: 'Se não deseja receber estes emails por favor aceda a %url% e remova a opção \"Relatório de viagens\" nas definições na secção \"Relatórios\".',\n    unsubscribeLocationsReport: 'Se não deseja receber estes emails por favor aceda a %url% e remova a opção \"Relatório de posições\" nas definições na secção \"Relatórios\".',\n    unsubscribeSpeedingReport: 'Se não deseja receber estes emails por favor aceda a %url% e remova a opção \"Relatório de excesso de velocidade\" nas definições na secção \"Relatórios\".',\n    unsubscribeZoneReport: 'Se não deseja receber estes emails por favor aceda a %url% e remova a opção \"Relatório de zonas\" nas definições na secção \"Relatórios\".',\n    unsubscribeRefuelingReport: 'Se não deseja receber estes emails por favor aceda a %url% e remova a opção \"Relatório de abastecimentos\" nas definições na secção \"Relatórios\".',\n    unsubscribeFuelDropReport: 'Se não deseja receber estes emails por favor aceda a %url% e remova a opção \"Relatório de perdas de combustível\" nas definições na secção \"Relatórios\".',\n  },\n  layout: {\n    deviceOnline: 'Dispositivo Online',\n    deviceMoving: 'Veículo em Movimento',\n    deviceStopped: 'Veículo Parado',\n    ignitionOff: 'Ignição Desligada',\n    ignitionOn: 'Ignição Ligada',\n    deviceOverspeed: 'Excesso de Velocidade',\n    geofenceEnter: 'Entrada em Zona',\n    geofenceExit: 'Saída em Zona',\n    deviceFuelDrop: 'Perda de Combustível',\n    driverChanged: 'Mudança de Motorista',\n    sos: 'SOS',\n    powerOn: 'Tomada de Força',\n    device: 'Veículo',\n    time: 'Data',\n    address: 'Local',\n    driver: 'Motorista',\n    group: 'Grupo',\n    in: 'em',\n    fuelDropInfo: 'Perda de combustível superior a '\n  }\n};\n
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/lang/ptPT.js b/lang/ptPT.js
+--- a/lang/ptPT.js	(revision 58228cbbf2fb1d2086aedd420a0492cca40a9e64)
++++ b/lang/ptPT.js	(date 1637757399486)
+@@ -210,6 +210,7 @@
+     duration: 'Duração',
+     vehicles: 'Veículos',
+     vehicle: 'Veículo',
++    licensePlate: 'Matrícula',
+     odometer: 'Conta-Quilómetros',
+     startOdometer: 'Início (Km)',
+     endOdometer: 'Fim (Km)',
+Index: src/index.js
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
+<+>function Reports(config, axios) {\n    const {ReportsApi, PositionsApi, SessionApi, DevicesApi, GroupsApi, DriversApi, GeofencesApi} = require('traccar-api')\n    this.traccar = {\n        reports: new ReportsApi(config, null, axios),\n        positions: new PositionsApi(config, null, axios),\n        session: new SessionApi(config, null, axios),\n        devices: new DevicesApi(config, null, axios),\n        groups: new GroupsApi(config, null, axios),\n        drivers: new DriversApi(config, null, axios),\n        geofences: new GeofencesApi(config, null, axios)\n    }\n    this.getUserData = async () => {\n        return {\n            user: await this.traccar.session.sessionGet().then(d => d.data),\n            devices: await this.traccar.devices.devicesGet().then(d => d.data),\n            groups: await this.traccar.groups.groupsGet().then(d => d.data),\n            drivers: await this.traccar.drivers.driversGet().then(d => d.data),\n            geofences: await this.traccar.geofences.geofencesGet().then(d => d.data),\n            byGroup: false\n        }\n    }\n    this.speedingReport = (from, to, userData, roadSpeedLimits) => {\n        return require('./speeding-report').createSpeedingReport(from, to, userData, this.traccar, roadSpeedLimits)\n    }\n\n    this.speedingReportToPDF = (userData, reportData) => {\n        return require('./speeding-report').exportSpeedingReportToPDF(userData, reportData)\n    }\n\n    this.speedingReportToExcel = (userData, reportData) => {\n        return require('./speeding-report').exportSpeedingReportToExcel(userData, reportData)\n    }\n\n    this.tripReport = (from, to, userData) => {\n        return require('./trip-report').createTripReport(from, to, userData, this.traccar)\n    }\n    this.tripReportToPDF = (userData, reportData) => {\n        return require('./trip-report').exportTripReportToPDF(userData, reportData)\n    }\n    this.tripReportToExcel = (userData, reportData) => {\n        return require('./trip-report').exportTripReportToExcel(userData, reportData)\n    }\n\n    this.zoneReport = (from, to, userData) => {\n        return require('./zone-report').createZoneReport(from, to, userData, this.traccar)\n    }\n\n    this.zoneReportToPDF = (userData, reportData) => {\n        return require('./zone-report').exportZoneReportToPDF(userData, reportData)\n    }\n\n    this.zoneReportToExcel = (userData, reportData) => {\n        return require('./zone-report').exportZoneReportToExcel(userData, reportData)\n    }\n\n    this.refuelingReport = (from, to, userData) => {\n        return require('./refueling-report').createRefuelingReport(from, to, userData, this.traccar)\n    }\n\n    this.fuelDropReport = (from, to, userData) => {\n        return require('./fueldrop-report').createFuelDropReport(from, to, userData, this.traccar)\n    }\n\n    this.eventsReport = (from, to, userData) => {\n        return require('./events-report').createEventsReport(from, to, userData, this.traccar)\n    }\n\n    this.eventsReportToPDF = (userData, reportData) => {\n        return require('./events-report').exportSpeedingReportToPDF(userData, reportData)\n    }\n\n    this.eventsReportToExcel = (userData, reportData) => {\n        return require('./events-report').exportSpeedingReportToExcel(userData, reportData)\n    }\n\n    this.fuelConsumptionReport = (from, to, userData) => {\n        return require('./fuelconsumption-report').createFuelConsumptionReport(from, to, userData, this.traccar)\n    }\n\n    this.locationReport = (from, to, userData) => {\n        return require('./location-report').createLocationReport(from, to, userData, this.traccar)\n    }\n\n    this.locationReportToPDF = (userData, reportData) => {\n        return require('./location-report').exportLocationReportToPDF(userData, reportData)\n    }\n\n    this.locationReportToExcel = (userData, reportData) => {\n        return require('./location-report').exportLocationReportToExcel(userData, reportData)\n    }\n\n    this.activityReport = (from, to, userData) => {\n        return require('./activity-report').createActivityReport(from, to, userData, this.traccar)\n    }\n\n    this.activityReportToPDF = (userData, reportData) => {\n        return require('./activity-report').exportActivityReportToPDF(userData, reportData)\n    }\n\n    this.activityReportToExcel = (userData, reportData) => {\n        return require('./activity-report').exportActivityReportToExcel(userData, reportData)\n    }\n\n    this.kmsReport = (from, to, userData) => {\n        return require('./kms-report').createKmsReport(from, to, userData, this.traccar)\n    }\n\n    this.kmsReportToPDF = (userData, reportData) => {\n        return require('./kms-report').exportKmsReportToPDF(userData, reportData)\n    }\n\n    this.kmsReportToExcel = (userData, reportData) => {\n        return require('./kms-report').exportKmsReportToExcel(userData, reportData)\n    }\n\n    this.vistaWasteActivityReport = (from, to, userData) => {\n        return require('./custom/vistawasteActivity-report').createVistaWasteActivityReport(from, to, userData, this.traccar)\n    }\n\n    this.vistaWasteActivityReportToPDF = (userData, reportData) => {\n        return require('./custom/vistawasteActivity-report').exportVistaWasteActivityReportToPDF(userData, reportData)\n    }\n\n    this.vistaWasteActivityReportToExcel = (userData, reportData) => {\n        return require('./custom/vistawasteActivity-report').exportVistaWasteActivityReportToExcel(userData, reportData)\n    }\n}\nmodule.exports = Reports\n\n
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/src/index.js b/src/index.js
+--- a/src/index.js	(revision 58228cbbf2fb1d2086aedd420a0492cca40a9e64)
++++ b/src/index.js	(date 1637711506389)
+@@ -23,7 +23,7 @@
+         return require('./speeding-report').createSpeedingReport(from, to, userData, this.traccar, roadSpeedLimits)
+     }
+ 
+-    this.speedingReportToPDF = (userData, reportData) => {
++    this.speedingReportToPDF = async (userData, reportData) => {
+         return require('./speeding-report').exportSpeedingReportToPDF(userData, reportData)
+     }
+ 

package/.idea/shelf/Uncommitted_changes_before_Update_at_25_11_2021,_13_10_[Changes]/shelved.patch

@@ -0,0 +1,233 @@
+Index: src/kms-report.js
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
+<+>const {createActivityReport} = require(\"./activity-report\");\nconst messages = require('../lang')\nconst jsPDF = require('jspdf')\nrequire('jspdf-autotable')\nconst {getStyle} = require(\"./reportStyle\");\nconst {headerFromUser,addTable} = require(\"./util/pdfDocument\");\nconst {getUserPartner} = require(\"fleetmap-partners\");\nconst automaticReports = require(\"./automaticReports\");\n\n\nlet traccarInstance\n\nconst fileName = 'KmsReport'\n\nasync function createKmsReportByDevice(from, to, userData) {\n    const groupIds = userData.groups.map(g => g.id)\n    const devicesToProcess = userData.byGroup ? userData.devices.filter(d => !groupIds.includes(d.groupId)) : userData.devices\n\n    const allData = {\n        devices: [],\n        from: from,\n        to: to\n    }\n\n    devicesToProcess.sort((a, b) => (a.name > b.name) ? 1 : -1)\n    const devicesToSlice = devicesToProcess.slice()\n\n    const arrayOfArrays = automaticReports.sliceArray(devicesToSlice)\n    let data = []\n    for (const a of arrayOfArrays) {\n        const response = await traccarInstance.reports.reportsRouteGet(from, to, a.map(d => d.id))\n        data = data.concat(response.data)\n    }\n\n    console.log('locations:' + data.length)\n\n    if (data.length > 0) {\n        allData.devices = processDevices(from, to, devicesToProcess, data)\n    }\n\n    return allData\n}\n\nasync function createKmsReportByDriver(from, to, userData) {\n\n}\n\nasync function createKmsReportByGroup(from, to, userData) {\n\n}\n\nfunction processDevices(from, to, devices, data) {\n    const devicesResult = []\n\n    for (const d of devices) {\n        const locations = data.filter(t => t.deviceId === d.id)\n\n        if (locations.length > 0) {\n            locations.forEach(l => l.locationDate = l.fixTime.substring(0, 10))\n            const groupedLocations = locations.reduce(\n                (entryMap, e) => entryMap.set(e.locationDate, [...entryMap.get(e.locationDate)||[], e]),\n                new Map()\n            )\n\n            const days = []\n            const keys = Array.from(groupedLocations.keys())\n\n            keys.forEach(key => {\n                const dayLocations = groupedLocations.get(key)\n                const day = {\n                    date: new Date(key).toLocaleDateString(),\n                    kms: dayLocations.reduce((a, b) => a + b.attributes.distance, 0) || 0\n                }\n                days.push(day)\n            })\n\n            devicesResult.push({\n                device: d,\n                days: days\n            })\n        }\n    }\n\n    return devicesResult\n}\n\nasync function createKmsReport(from, to, userData, traccar) {\n    console.log('Create KmsReport')\n    traccarInstance = traccar\n    if(userData.groupByDay){\n        const reportData = []\n\n        if(userData.byDriver){\n            const allData = await createKmsReportByDriver(from, to, userData)\n            reportData.push(allData)\n        }\n        else if(userData.byGroup){\n            const allGroupsData = await createKmsReportByGroup(from, to, userData)\n            allGroupsData.forEach(data => reportData.push(data))\n            const withoutGroupDevices = await createKmsReportByDevice(from, to, userData)\n            reportData.push(withoutGroupDevices)\n        } else {\n            const allData = await createKmsReportByDevice(from, to, userData)\n            reportData.push(allData)\n        }\n\n        return reportData\n    } else {\n        return await createActivityReport(from, to, userData, traccar)\n    }\n}\n\nasync function exportKmsReportToPDF(userData, reportData) {\n    const lang = userData.user.attributes.lang\n    const translations = messages[lang] ? messages[lang] : messages['en-GB']\n    const kmsData = userData.byDriver ? reportData.drivers : reportData.devices\n\n    const headers = []\n    if(userData.groupByDay) {\n        headers.push(translations.report.date,\n            translations.report.distance)\n    }\n    else if(userData.byDriver) {\n        headers.push(translations.report.driver,\n            translations.report.group,\n            translations.report.distance)\n    } else {\n        headers.push(translations.report.name,\n            translations.settings.vehicle_model,\n            translations.report.group,\n            translations.report.distance)\n    }\n    if (kmsData) {\n        let first = true\n        const doc = userData.groupByDay ? new jsPDF.jsPDF() : new jsPDF.jsPDF('l')\n        await headerFromUser(doc, translations.report.titleKmsReport, userData.user)\n\n        if (userData.groupByDay) {\n            for (const d of kmsData) {\n                const name = userData.byDriver ? d.driver.name : d.device.name\n                const group = userData.byDriver ? userData.groups.find(g => g.drivers.includes(d.id)) : userData.groups.find(g => d.device.groupId === g.id)\n\n                let space = 0\n                if (!first) {\n                    doc.addPage()\n                } else {\n                    first = false\n                    space = 8\n                }\n                doc.setFontSize(13)\n                doc.text(name, 20, space + 20)\n                doc.setFontSize(11)\n                doc.text(group ? translations.report.group + ': ' + group.name : '', 150, space + 20)\n                doc.text(new Date(reportData.from).toLocaleString() + ' - ' + new Date(reportData.to).toLocaleString(), 20, space + 25)\n\n                const data = []\n                d.days.forEach(day => {\n                    const temp = [\n                        new Date(day.date).toLocaleDateString(),\n                        (day.kms/1000).toFixed(0)\n                    ]\n\n                    data.push(temp)\n                })\n\n                const footValues = []\n                footValues.push(\n                    '',\n                    (d.days.reduce((a, b) => a + b.kms, 0)/1000).toFixed(0)\n                )\n\n                const style = getStyle(getUserPartner(userData.user))\n\n                addTable(doc, headers, data, footValues, style, 35)\n            }\n        } else {\n            const data = []\n            if (userData.byDriver) {\n                reportData.drivers.forEach(d => {\n                    const group = userData.groups.find(g => g.drivers.includes(d.driver.id))\n\n                    const temp = [\n                        d.driver.name,\n                        group ? group.name : '',\n                        Number((d.summary.distance / 1000).toFixed(0)),\n                    ]\n                    data.push(temp)\n                })\n            } else {\n                reportData.devices.forEach(d => {\n                    const group = userData.groups.find(g => d.device.groupId === g.id)\n\n                    const temp = [\n                        d.summary.deviceName,\n                        d.device.model,\n                        group ? group.name : '',\n                        Number((d.summary.distance / 1000).toFixed(0))\n                    ]\n                    data.push(temp)\n                })\n            }\n\n            const footValues = []\n            if(userData.byDriver) {\n                footValues.push(\n                    'Total:' + reportData.drivers.length,\n                    '',\n                    (reportData.drivers.reduce((a, b) => a + b.summary.distance, 0)/1000).toFixed(0)\n                )\n            } else {\n                footValues.push(\n                    'Total:' + reportData.devices.length,\n                    '',\n                    '',\n                    (reportData.devices.reduce((a, b) => a + b.summary.distance, 0)/1000).toFixed(0),\n                )\n            }\n\n            const style = getStyle(getUserPartner(userData.user))\n\n            addTable(doc, headers, data, footValues, style, 35)\n        }\n        return doc\n    }\n}\n\nfunction exportKmsReportToExcel(userData, reportData) {\n    console.log('Export to Excel')\n\n    const lang = userData.user.attributes.lang || (navigator && navigator.language)\n    const translations = messages[lang] ? messages[lang] : messages['en-GB']\n\n    const settings = {\n        sheetName: translations.report.titleKmsReport, // The name of the sheet\n        fileName: fileName // The name of the spreadsheet\n    }\n\n    const headers = []\n\n    if(userData.groupByDay) {\n        headers.push(\n            {label: translations.report.vehicle, value: 'name'},\n            {label: translations.report.group, value: 'group'},\n            {label: translations.report.date, value: 'date'},\n            {label: translations.report.distance, value: 'distance'})\n    } else if(userData.byDriver) {\n        headers.push(\n            {label: translations.report.driver, value: 'name'},\n            {label: translations.report.group, value: 'group'},\n            {label: translations.report.distance, value: 'distance'})\n    } else {\n        headers.push(\n            {label: translations.report.driver, value: 'name'},\n            {label: translations.settings.vehicle_licenseplate, value: 'licenseplate'},\n            {label: translations.report.group, value: 'group'},\n            {label: translations.report.distance, value: 'distance'})\n    }\n\n    let data = []\n    const info = userData.byDriver ? reportData.drivers : reportData.devices\n    info.forEach(d => {\n        const group = userData.byDriver ? userData.groups.find(g => g.drivers.includes(d.driver.id)) :\n            userData.groups.find(g => d.device.groupId === g.id)\n\n            if (userData.groupByDay) {\n                data = data.concat([{}])\n                data = data.concat(d.days.map(a => {\n                    return {\n                        name: userData.byDriver ? d.driver.name : d.device.name,\n                        group: group ? group.name : '',\n                        licenseplate: d.device.attributes.license_plate,\n                        date: a.date,\n                        distance: Number((a.kms / 1000).toFixed(0))\n                    }\n                }))\n            } else {\n                data = data.concat([{\n                    name: userData.byDriver ? d.driver.name : d.summary.deviceName,\n                    group: group ? group.name : '',\n                    licenseplate: d.device.attributes.license_plate,\n                    distance: Number((d.summary.distance / 1000).toFixed(0))\n                }])\n            }\n    })\n\n    return {\n        headers,\n        data,\n        settings\n    }\n}\n\nexports.createKmsReport = createKmsReport\nexports.exportKmsReportToPDF = exportKmsReportToPDF\nexports.exportKmsReportToExcel = exportKmsReportToExcel\n
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/src/kms-report.js b/src/kms-report.js
+--- a/src/kms-report.js	(revision 0ae69bd1e224b6db3b69f61e65035315b96f9788)
++++ b/src/kms-report.js	(date 1637845589031)
+@@ -6,6 +6,7 @@
+ const {headerFromUser,addTable} = require("./util/pdfDocument");
+ const {getUserPartner} = require("fleetmap-partners");
+ const automaticReports = require("./automaticReports");
++const {jsPDFOptions} = require("jspdf");
+ 
+ 
+ let traccarInstance
+@@ -132,8 +133,8 @@
+     }
+     if (kmsData) {
+         let first = true
+-        const doc = userData.groupByDay ? new jsPDF.jsPDF() : new jsPDF.jsPDF('l')
+-        await headerFromUser(doc, translations.report.titleKmsReport, userData.user)
++        const doc = userData.groupByDay ? new jsPDF.jsPDF('p') : new jsPDF.jsPDF('l')
++        await headerFromUser(doc, translations.report.titleKmsReport, userData.user, 'p')
+ 
+         if (userData.groupByDay) {
+             for (const d of kmsData) {
+@@ -156,7 +157,7 @@
+                 const data = []
+                 d.days.forEach(day => {
+                     const temp = [
+-                        new Date(day.date).toLocaleDateString(),
++                        day.date,
+                         (day.kms/1000).toFixed(0)
+                     ]
+ 
+@@ -240,6 +241,7 @@
+     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.distance, value: 'distance'})
+@@ -250,8 +252,8 @@
+             {label: translations.report.distance, value: 'distance'})
+     } else {
+         headers.push(
+-            {label: translations.report.driver, value: 'name'},
+-            {label: translations.settings.vehicle_licenseplate, value: 'licenseplate'},
++            {label: translations.report.vehicle, value: 'name'},
++            {label: translations.report.licensePlate, value: 'licenseplate'},
+             {label: translations.report.group, value: 'group'},
+             {label: translations.report.distance, value: 'distance'})
+     }
+@@ -262,25 +264,25 @@
+         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.groupByDay) {
+-                data = data.concat([{}])
+-                data = data.concat(d.days.map(a => {
+-                    return {
+-                        name: userData.byDriver ? d.driver.name : d.device.name,
+-                        group: group ? group.name : '',
+-                        licenseplate: d.device.attributes.license_plate,
+-                        date: a.date,
+-                        distance: Number((a.kms / 1000).toFixed(0))
+-                    }
+-                }))
+-            } else {
+-                data = data.concat([{
+-                    name: userData.byDriver ? d.driver.name : d.summary.deviceName,
+-                    group: group ? group.name : '',
+-                    licenseplate: d.device.attributes.license_plate,
+-                    distance: Number((d.summary.distance / 1000).toFixed(0))
+-                }])
+-            }
++        if (userData.groupByDay) {
++            data = data.concat([{}])
++            data = data.concat(d.days.map(a => {
++                return {
++                    name: d.device.name,
++                    group: group ? group.name : '',
++                    licenseplate: d.device.attributes.license_plate,
++                    date: a.date,
++                    distance: Number((a.kms / 1000).toFixed(0))
++                }
++            }))
++        } else {
++            data = data.concat([{
++                name: userData.byDriver ? d.driver.name : d.summary.deviceName,
++                group: group ? group.name : '',
++                licenseplate: userData.byDriver ? '' : d.device.attributes.license_plate,
++                distance: Number((d.summary.distance / 1000).toFixed(0))
++            }])
++        }
+     })
+ 
+     return {
+Index: package.json
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
+<+>{\n  \"name\": \"fleetmap-reports\",\n  \"version\": \"1.0.233\",\n  \"description\": \"\",\n  \"main\": \"src/index.js\",\n  \"scripts\": {\n    \"test\": \"jest\"\n  },\n  \"keywords\": [],\n  \"author\": \"\",\n  \"license\": \"ISC\",\n  \"dependencies\": {\n    \"axios\": \"^0.21.1\",\n    \"axios-cookiejar-support\": \"^1.0.1\",\n    \"fleetmap-partners\": \"^1.0.42\",\n    \"json-as-xlsx\": \"^1.2.1\",\n    \"jspdf\": \"^2.3.1\",\n    \"jspdf-autotable\": \"^3.5.14\",\n    \"moment\": \"^2.29.1\",\n    \"tough-cookie\": \"^4.0.0\",\n    \"traccar-api\": \"^1.0.5\",\n    \"turf\": \"^3.0.14\",\n    \"turf-point\": \"^2.0.1\",\n    \"wkt\": \"^0.1.1\"\n  },\n  \"devDependencies\": {\n    \"axios-debug-log\": \"^0.8.4\",\n    \"mocha\": \"^9.0.3\",\n    \"webpack\": \"^5.24.3\",\n    \"webpack-cli\": \"^4.5.0\"\n  }\n}\n
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/package.json b/package.json
+--- a/package.json	(revision 0ae69bd1e224b6db3b69f61e65035315b96f9788)
++++ b/package.json	(date 1637845838032)
+@@ -1,6 +1,6 @@
+ {
+   "name": "fleetmap-reports",
+-  "version": "1.0.233",
++  "version": "1.0.235",
+   "description": "",
+   "main": "src/index.js",
+   "scripts": {
+Index: src/util/pdfDocument.js
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
+<+>require('jspdf-autotable')\nconst {getStyle} = require(\"../reportStyle\");\nconst {getUserPartner} = require(\"fleetmap-partners\");\nconst {getImgFromUrl} = require(\"./utils\")\n\nasync function header(doc, title, hostname, style) {\n    doc.setFontSize(16)\n    doc.setFont('helvetica', 'bold')\n    doc.text(title, 15, 15 )\n\n    if(style.imgWidth && style.imgHeight) {\n        try{\n            const image = await getImgFromUrl(hostname)\n            if(image){\n                doc.addImage(image, 'PNG', 220 + (style.imgWidth < 50 ? 25 : 0), 5, style.imgWidth, style.imgHeight)\n            }\n        } catch (e) {\n        }\n    }\n    doc.setFont('helvetica', 'normal')\n}\n\nasync function headerFromUser(doc, title, user) {\n    const partner = getUserPartner(user)\n    return header(doc, title, partner.host, getStyle(partner))\n}\n\nfunction addTable(doc, headers, data, footValues, style, startY){\n    doc.autoTable({\n        head: [headers],\n        body: data,\n        foot: [footValues],\n        showFoot: 'lastPage',\n        headStyles: {\n            fillColor: style.pdfHeaderColor,\n            textColor: style.pdfHeaderTextColor,\n            fontSize: 10\n        },\n        bodyStyles: {\n            fillColor: style.pdfBodyColor,\n            textColor: style.pdfBodyTextColor,\n            fontSize: 8\n        },\n        footStyles: {\n            fillColor: style.pdfFooterColor,\n            textColor: style.pdfFooterTextColor,\n            fontSize: 9\n        },\n        startY: startY });\n}\n\nexports.header = header\nexports.headerFromUser = headerFromUser\nexports.addTable = addTable\n
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/src/util/pdfDocument.js b/src/util/pdfDocument.js
+--- a/src/util/pdfDocument.js	(revision 0ae69bd1e224b6db3b69f61e65035315b96f9788)
++++ b/src/util/pdfDocument.js	(date 1637845589076)
+@@ -3,7 +3,7 @@
+ const {getUserPartner} = require("fleetmap-partners");
+ const {getImgFromUrl} = require("./utils")
+ 
+-async function header(doc, title, hostname, style) {
++async function header(doc, title, hostname, style, orientation) {
+     doc.setFontSize(16)
+     doc.setFont('helvetica', 'bold')
+     doc.text(title, 15, 15 )
+@@ -12,7 +12,7 @@
+         try{
+             const image = await getImgFromUrl(hostname)
+             if(image){
+-                doc.addImage(image, 'PNG', 220 + (style.imgWidth < 50 ? 25 : 0), 5, style.imgWidth, style.imgHeight)
++                doc.addImage(image, 'PNG', (orientation === 'l' ? 220 : 175) + (style.imgWidth < 50 ? 25 : 0), 5, style.imgWidth, style.imgHeight)
+             }
+         } catch (e) {
+         }
+@@ -20,9 +20,9 @@
+     doc.setFont('helvetica', 'normal')
+ }
+ 
+-async function headerFromUser(doc, title, user) {
++async function headerFromUser(doc, title, user, orientation='l') {
+     const partner = getUserPartner(user)
+-    return header(doc, title, partner.host, getStyle(partner))
++    return header(doc, title, partner.host, getStyle(partner), orientation)
+ }
+ 
+ function addTable(doc, headers, data, footValues, style, startY){
+Index: lang/enGB.js
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
+<+>module.exports = {\n  route: {\n    map: 'Map',\n    dashboard: 'Dashboard',\n    reports: 'Reports',\n    report: 'Report',\n    report_trip_title: 'Trip Report',\n    report_location_title: 'Location Report',\n    report_zone_crossing: 'Zone Report',\n    report_speeding: 'Relatório de Excessos de Velocidade',\n    report_speeding_beta: 'Relatório de Excessos de Velocidade BETA',\n    report_tolls: 'Relatório de Portagens',\n    settings: 'Settings',\n    duration: 'Duration'\n  },\n  map: {\n    geofence_create_title: 'New geofence',\n    geofence_create_name: 'Please enter the name of this geofence...',\n    geofence_created: 'Geofence created sucessfully!',\n    geofence_create_canceled: 'Input canceled',\n    poi_create_title: 'New POI',\n    poi_create_name: 'Please enter the name of this POI...',\n    poi_created: 'POI created sucessfully!',\n    poi_create_canceled: 'Input canceled',\n    create_confirm: 'OK',\n    create_cancel: 'Cancel',\n    loading: 'Loading',\n    totalDistance: 'Distância total'\n  },\n  vehicleList: {\n    title: 'Vehicle',\n    search: 'Search...',\n    column_name: 'Name',\n    column_speed: 'Km/h',\n    column_lastUpdate: 'Last update'\n  },\n  vehicleTable: {\n    immobilize: 'Immobilize',\n    de_immobilize: 'De-Immobilize',\n    send_immobilization: 'Send immobilization command?',\n    send_de_immobilization: 'Send de-immobilization command?',\n    all_vehicles: 'All',\n    moving_vehicles: 'Moving',\n    idle_vehicles: 'Idle',\n    stopped_vehicles: 'Stopped',\n    disconnected_vehicles: 'Disconnected'\n  },\n  vehicleDetail: {\n    show_route: 'Show route'\n  },\n  poiTable: {\n    showPOIs: 'Show POIs',\n    edit_poi: 'Edit',\n    delete_poi: 'Delete'\n  },\n  dashboard: {\n    startdate: 'Start date',\n    enddate: 'End Date',\n    period_lastweek: 'Last week',\n    period_lastmonth: 'Last month',\n    period_last3month: 'Last 3 months'\n  },\n  navbar: {\n    profile: 'Profile',\n    notifications: 'Notifications',\n    settings: 'Settings',\n    logout: 'Log Out'\n  },\n  login: {\n    login_user: 'Email',\n    login_password: 'Password',\n    login_button: 'Login',\n    login_password_warn: 'The password can not be less than 6 digits'\n  },\n  profile: {\n    user_account: 'Account',\n    user_name: 'Name',\n    user_email: 'E-mail',\n    user_password: 'Password',\n    user_phone: 'Phone',\n    user_language: 'Language',\n    user_timezone: 'Timezone',\n    user_update_button: 'Update',\n    user_updated: 'User information has been updated successfully.',\n    user_name_required: 'Name field is required',\n    user_email_required: 'Please input a valid email',\n    user_password_lengh: 'The password can not be less than 6 digits'\n  },\n  settings: {\n    map: 'Map',\n    vehicles: 'Vehicles',\n    title: 'Settings',\n    route_match: 'Route match',\n    alerts: 'Alerts',\n    alerts_type: 'Type',\n    alerts_notificators: 'Notificators',\n    alert_ignitionOff: 'Ignition Off',\n    alert_ignitionOn: 'Ignition On',\n    alert_geofenceEnter: 'Geofence Enter',\n    alert_geofenceExit: 'Geofence Exit',\n    alert_deviceOverspeed: 'Device Overspeed',\n    alert_deleted: 'Alert has been deleted',\n    alert_delete_info: 'Do you want to delete the alert ',\n    alert_delete_title: 'Delete Alert',\n    alert_edit_confirm: 'Confirm',\n    alert_edit_cancel: 'Cancel',\n    alert_created: 'Alert created sucessfully!',\n    alert_updated: 'Alert updated sucessfully!',\n    alert_add: 'Add Alert',\n    alert_edit: 'Edit Alert',\n    alert_delete: 'Delete Alert',\n    alert_overspeed_warning: 'Vehicle without defined top speed',\n    alert_geofences_warning: 'Vehicle without associated geofences',\n    alert_associate_geofences: 'Associate Geofences',\n    alert_form_type: 'Type:',\n    alert_form_type_placeholder: 'Select alert type',\n    alert_form_vehicles: 'Vehicles:',\n    alert_form_geofences: 'Geofences:',\n    alert_form_all_vehicles: 'All vehicles',\n    alert_form_vehicles_placeholder: 'Select vehicles',\n    alert_form_notificator_web: 'Web',\n    alert_form_notificator_email: 'E-mail',\n    alert_form_notificator_sms: 'SMS',\n    alert_form_confirm: 'Save',\n    alert_form_cancel: 'Cancel',\n    alert_form_geofences_placeholder: 'Select geofences',\n    vehicle_edit: 'Edit Vehicle',\n    vehicle_name: 'Name',\n    vehicle_licenseplate: 'License Plate',\n    vehicle_model: 'Model',\n    vehicle_speed_limit: 'Speed Limit',\n    vehicle_form_cancel: 'Cancel',\n    vehicle_form_confirm: 'Save',\n    vehicle_form_name: 'Name',\n    vehicle_form_model: 'Model',\n    vehicle_form_speed_limit: 'Speed Limit (Km/h)',\n    vehicle_updated: 'Vehicle updated sucessfully!'\n  },\n  geofence: {\n    showGeofences: 'Show Geofences',\n    geofence_name: 'Name',\n    geofence_edit: 'Edit',\n    geofence_delete: 'Delete',\n    geofence_deleted: 'Geofence has been deleted',\n    geofence_delete_info: 'Do you want to delete geofence ',\n    geofence_delete_title: 'Delete Geofence',\n    geofence_edit_title: 'Edit Geofence',\n    geofence_edit_name: 'Please enter the name of this geofence...',\n    geofence_edit_confirm: 'Confirm',\n    geofence_edit_cancel: 'Cancel',\n    geofence_edit_canceled: 'Edit canceled',\n    geofence_edited: 'Geofence edited sucessfully!',\n    poi_delete_info: 'Do you want to delete POI ',\n    poi_delete_title: 'Delete POI',\n    poi_edited: 'POI edited sucessfully!',\n    poi_deleted: 'POI has been deleted',\n    poi_edit_title: 'Edit POI',\n    poi_edit_name: 'Please enter the name of this POI...',\n    searchGeofence: 'Search geofence',\n    edit_geofence: 'Edit',\n    delete_geofence: 'Delete'\n  },\n  report: {\n    temperature: 'Temperatura',\n    temperature2: 'Temperatura2',\n    select_vehicles: 'Select vehicles',\n    select_vehicles_placeholder: 'Vehicles',\n    select_geofences: 'Select geofences',\n    select_geofences_placeholder: 'Geofences',\n    select_period: 'Select period',\n    period: 'Period',\n    date_start: 'Start date',\n    date_end: 'End date',\n    generate_report: 'Generate report',\n    validate_period: 'Por favor seleccione o período',\n    user: 'User',\n    titleTripReport: 'Trip Report',\n    titleLocationReport: 'Locations Report',\n    titleSpeedingReport: 'Overspeed Report',\n    titleZoneReport: 'Zone Report',\n    titleRefuelReport: 'Refueling Report',\n    titleFuelDropReport: 'Fuel Drop Report',\n    titleEventsReport: 'Events Report',\n    titleActivityReport: 'Activity Report',\n    titleKmsReport: 'Kms Report',\n    from: 'From',\n    to: 'to',\n    headerStartAddress: 'Start address',\n    headerDistance: 'Distance',\n    headerDrivingTime: 'Driving Time',\n    headerMaxSpeed: 'Max Speed',\n    date: 'Date',\n    start: 'Start',\n    end: 'End',\n    endAddress: 'Destination',\n    tripTime: 'Duration',\n    idleTime: 'Idle',\n    stopTime: 'Stop',\n    distance: 'Distance',\n    speed: 'Speed',\n    roadSpeedLimit: 'Limite da estrada',\n    overspeed: 'Alert On',\n    avgSpeed: 'Avg Speed',\n    maxSpeed: 'Max Speed',\n    driver: 'Driver',\n    group: 'Group',\n    address: 'Address',\n    ignition: 'Ignition',\n    ignitionOn: 'On',\n    ignitionOff: 'Off',\n    enter: 'Enter',\n    exit: 'Exit',\n    geofence: 'Geofence',\n    duration: 'Duration',\n    vehicles: 'Vehicles',\n    vehicle: 'Vehicle',\n    odometer: 'Odometer',\n    startOdometer: 'Start (Km)',\n    endOdometer: 'End (Km)',\n    spentFuel: 'Spent Fuel',\n    engineHours: 'Use (H:m)',\n    driverHours: 'Driving Time (H:m)',\n    refueling: 'Refueling',\n    totalRefueled: 'Total Refueled',\n    totalFuelDrops: 'Total Fuel Drops',\n    totalFuelDropLiters: 'Total Fuel Lost',\n    speedLimit: 'Speed Limit',\n    eventType: 'Event',\n    info: 'Information',\n    event_ignitionOff: 'Ignition Off',\n    event_ignitionOn: 'Ignition On',\n    event_deviceOverspeed: 'Device Overspeed',\n    event_geofenceEnter: 'Geofence Enter',\n    event_geofenceExit: 'Geofence Exit',\n    event_deviceFuelDrop: 'Fuel Drop',\n    event_driverChanged: 'Driver Changed',\n    event_sos: 'SOS',\n    event_powerOn: 'Power TakeOff',\n    event_powerCute: 'Power Cut',\n    unsubscribeTripReport: 'If you no longer wish to receive these emails, please go to %url% and remove the option \"Trip report\" in the settings in the \"Reports\" section.',\n    unsubscribeLocationsReport: 'If you no longer wish to receive these emails, please go to %url% and remove the option \"Locations report\" in the settings in the \"Reports\" section.',\n    unsubscribeSpeedingReport: 'If you no longer wish to receive these emails, please go to %url% and remove the option \"Overspeed report\" in the settings in the \"Reports\" section.',\n    unsubscribeZoneReport: 'If you no longer wish to receive these emails, please go to %url% and remove the option \"Zone report\" in the settings in the \"Reports\" section.',\n    unsubscribeRefuelingReport: 'If you no longer wish to receive these emails, please go to %url% and remove the option \"Refueling report\" in the settings in the \"Reports\" section.',\n    unsubscribeFuelDropReport: 'If you no longer wish to receive these emails, please go to %url% and remove the option \"Fuel drop report\" in the settings in the \"Reports\" section.'\n  },\n  layout: {\n    deviceOnline: 'Device Online',\n    deviceMoving: 'Device Moving',\n    deviceStopped: 'Device Stopped',\n    ignitionOff: 'Ignition Off',\n    ignitionOn: 'Ignition On',\n    deviceOverspeed: 'Device Overspeed',\n    geofenceEnter: 'Geofence Enter',\n    geofenceExit: 'Geofence Exit',\n    deviceFuelDrop: 'Fuel Drop',\n    driverChanged: 'Driver Changed',\n    test: 'Test Notification',\n    sos: 'Panic',\n    powerOn: 'Power Take-Off',\n    device: 'Device',\n    time: 'Time',\n    address: 'Address',\n    driver: 'Driver',\n    group: 'Group',\n    in: 'in',\n    fuelDropInfo: 'Fuel drop greater than '\n  }\n};\n
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/lang/enGB.js b/lang/enGB.js
+--- a/lang/enGB.js	(revision 0ae69bd1e224b6db3b69f61e65035315b96f9788)
++++ b/lang/enGB.js	(date 1637845618637)
+@@ -214,6 +214,7 @@
+     duration: 'Duration',
+     vehicles: 'Vehicles',
+     vehicle: 'Vehicle',
++    licensePlate: 'License Plate',
+     odometer: 'Odometer',
+     startOdometer: 'Start (Km)',
+     endOdometer: 'End (Km)',
+Index: lang/ptBR.js
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
+<+>module.exports = {\n  route: {\n    map: 'Mapa',\n    dashboard: 'Central de Controlo',\n    reports: 'Relatórios',\n    report_trip_title: 'Relatório de viagens',\n    report_location_title: 'Relatório de posições',\n    report_zone_crossing: 'Relatório de zonas',\n    settings: 'Configurações',\n    duration: 'Duração'\n  },\n  map: {\n    geofence_create_title: 'Nova Cerca Eletrônica',\n    geofence_create_name: 'Por favor indique o nome da cerca eletrônica...',\n    geofence_created: 'Cerca eletrônica criada com sucesso!',\n    geofence_create_canceled: 'Criação de cerca eletrônica cancelada!',\n    poi_create_title: 'Novo POI',\n    poi_create_name: 'Por favor indique o nome do POI...',\n    poi_created: 'POI criado com sucesso!',\n    poi_create_canceled: 'Criação do POI cancelada!',\n    create_confirm: 'Confirmar',\n    create_cancel: 'Cancelar'\n  },\n  vehicleList: {\n    title: 'Veículos',\n    search: 'Pesquisar...',\n    column_name: 'Nome',\n    column_speed: 'Km/h',\n    column_lastUpdate: 'Última Actualização'\n  },\n  vehicleTable: {\n    immobilize: 'Imobilizar',\n    de_immobilize: 'Remobilizar',\n    send_immobilization: 'Enviar comando de imobilização para o veículo',\n    send_de_immobilization: 'Enviar comando de remobilização para veículo',\n    all_vehicles: 'Todos',\n    moving_vehicles: 'Em Movimento',\n    idle_vehicles: 'Ralenti',\n    stopped_vehicles: 'Parado',\n    disconnected_vehicles: 'Desconectado'\n  },\n  vehicleDetail: {\n    show_route: 'Mostrar rota'\n  },\n  poiTable: {\n    showPOIs: 'Ver POIs'\n  },\n  dashboard: {\n    startdate: 'Data de Início',\n    enddate: 'Data de Fim',\n    period_lastweek: 'Última semana',\n    period_lastmonth: 'Último mês',\n    period_last3month: 'Últimos 3 meses'\n  },\n  navbar: {\n    profile: 'Perfil',\n    notifications: 'Notificações',\n    settings: 'Configurações',\n    logout: 'Sair'\n  },\n  login: {\n    login_password: 'Palavra-chave',\n    login_button: 'Entrar',\n    login_password_warn: 'A Palavra-chave não pode ter menos de 6 dígitos',\n    login_user: 'Utilizador'\n  },\n  profile: {\n    user_account: 'Utilizador',\n    user_name: 'Nome',\n    user_email: 'E-mail',\n    user_password: 'Palavra-chave',\n    user_phone: 'Telefone',\n    user_language: 'Idioma',\n    user_timezone: 'Fuso horário',\n    user_update_button: 'Gravar',\n    user_updated: 'Informação do utilizador foi actualizada.',\n    user_name_required: 'O campo nome é obrigatório',\n    user_email_required: 'Por favor indique um e-mail válido',\n    user_password_lengh: 'A Palavra-chave não pode ter menos de 6 dígitos'\n  },\n  settings: {\n    map: 'Mapa',\n    vehicles: 'Veículos',\n    title: 'Configurações',\n    route_match: 'Rota na estrada',\n    alerts: 'Alertas',\n    alerts_type: 'Tipo',\n    alerts_notificators: 'Vias',\n    alert_ignitionOff: 'Ignição Desligada',\n    alert_ignitionOn: 'Ignição Ligada',\n    alert_geofenceEnter: 'Entrada em Baliza',\n    alert_geofenceExit: 'Saída de Baliza',\n    alert_deviceOverspeed: 'Excesso de Velocidade',\n    alert_deleted: 'O Alerta foi apagado.',\n    alert_delete_info: 'Pretende apagar o alerta de ',\n    alert_delete_title: 'Apagar Alerta',\n    alert_edit_confirm: 'Confirmar',\n    alert_edit_cancel: 'Cancelar',\n    alert_created: 'Alerta criado com sucesso!',\n    alert_updated: 'Alerta actualizado com sucesso!',\n    alert_add: 'Adicioncar Alerta',\n    alert_edit: 'Editar Alerta',\n    alert_delete: 'Apagar Alerta',\n    alert_overspeed_warning: 'Veículo sem velocidade máxima definida',\n    alert_geofences_warning: 'Veículo sem balizas associadas',\n    alert_associate_geofences: 'Associar Balizas',\n    alert_form_type: 'Tipo:',\n    alert_form_type_placeholder: 'Seleccionar o tipo de alerta',\n    alert_form_vehicles: 'Veículos:',\n    alert_form_geofences: 'Balizas:',\n    alert_form_all_vehicles: 'Todos os veículos',\n    alert_form_vehicles_placeholder: 'Seleccionar veículos',\n    alert_form_notificator_web: 'Web',\n    alert_form_notificator_email: 'E-mail',\n    alert_form_notificator_sms: 'SMS',\n    alert_form_confirm: 'Gravar',\n    alert_form_cancel: 'Cancelar',\n    alert_form_geofences_placeholder: 'Seleccionar balizas',\n    vehicle_edit: 'Editar Veículo',\n    vehicle_name: 'Nome',\n    vehicle_licenseplate: 'Matrícula',\n    vehicle_model: 'Modelo',\n    vehicle_speed_limit: 'Limite de Velocidade',\n    vehicle_form_cancel: 'Cancelar',\n    vehicle_form_confirm: 'Guardar',\n    vehicle_form_name: 'Nome',\n    vehicle_form_model: 'Modelo',\n    vehicle_form_speed_limit: 'Limite de Velocidade (Km/h)',\n    vehicle_updated: 'Veículo actualizado com sucesso!'\n  },\n  geofence: {\n    showGeofences: 'Ver Cercas Eletrônicas',\n    geofence_name: 'Nome',\n    geofence_edit: 'Editar',\n    geofence_delete: 'Apagar',\n    geofence_deleted: 'A cerca eletrônica foi apagada',\n    geofence_delete_info: 'Pretende apagar a cerca eletrônica ',\n    geofence_delete_title: 'Apagar Cerca Eletrônica',\n    geofence_edit_title: 'Editar Cerca Eletrônica',\n    geofence_edit_name: 'Por favor indique o nome da cerca eletrônica...',\n    geofence_edit_confirm: 'Confirmar',\n    geofence_edit_cancel: 'Cancelar',\n    geofence_edit_canceled: 'Edição cancelada',\n    geofence_edited: 'Cerca Eletrônica editada com sucesso!',\n    poi_delete_info: 'Pretende apagar o POI ',\n    poi_delete_title: 'Apagar POI',\n    poi_edited: 'POI editada com sucesso!',\n    poi_deleted: 'POI  foi apagada',\n    poi_edit_title: 'Editar POI',\n    poi_edit_name: 'Por favor indique o nome do POI...',\n    searchGeofence: 'Procurar Cerca Eletrônica',\n    edit_geofence: 'Editar',\n    delete_geofence: 'Apagar'\n  },\n  report: {\n    temperature: 'Temperatura',\n    temperature2: 'Temperatura2',\n    select_vehicles: 'Seleccionar veículos',\n    select_vehicles_placeholder: 'Veículos',\n    select_geofences: 'Seleccionar balizas',\n    select_geofences_placeholder: 'Balizas',\n    select_period: 'Seleccionar período',\n    date_start: 'Data de início',\n    date_end: 'Data de fim',\n    generate_report: 'Gerar relatório',\n    user: 'Utilizador',\n    titleTripReport: 'Relatório de Viagens',\n    titleLocationReport: 'Relatório de Posições',\n    titleSpeedingReport: 'Relatório de Excessos de Velocidade',\n    titleZoneReport: 'Relatório de Zonas',\n    titleRefuelingReport: 'Relatório de Abastecimentos',\n    titleFuelDropReport: 'Relatório de Perdas de Combustível',\n    titleEventsReport: 'Relatório de Eventos',\n    titleActivityReport: 'Relatório de Actividade',\n    titleKmsReport: 'Relatórios de Kms',\n    from: 'De',\n    to: 'a',\n    headerStartAddress: 'Local de início',\n    headerDistance: 'Distância percorrida',\n    headerDrivingTime: 'Tempo de condução',\n    headerMaxSpeed: 'Velocidade Máx.',\n    date: 'Data',\n    start: 'Início',\n    end: 'Fim',\n    endAddress: 'Destino',\n    tripTime: 'Duração',\n    idleTime: 'Ralenti',\n    stopTime: 'Paragem',\n    distance: 'Distância',\n    speed: 'Velocidade',\n    overspeed: 'Alerta Ligado',\n    avgSpeed: 'Vel.Média',\n    maxSpeed: 'Vel.Max',\n    driver: 'Motorista',\n    group: 'Grupo',\n    address: 'Local',\n    ignition: 'Ignição',\n    ignitionOn: 'Ligada',\n    ignitionOff: 'Desligada',\n    enter: 'Entrada',\n    exit: 'Saida',\n    geofence: 'Zona',\n    duration: 'Duração',\n    vehicles: 'Veículos',\n    vehicle: 'Veículo',\n    odometer: 'Conta-Quilómetros',\n    startOdometer: 'Início (Km)',\n    endOdometer: 'Fim (Km)',\n    spentFuel: 'Consumo (L)',\n    engineHours: 'Utilização (H:m)',\n    driverHours: 'Tempo de Condução (H:m)',\n    refueling: 'Abastecimentos',\n    totalRefueled: 'Total Abastecido',\n    totalFuelDrops: 'Total de Ocorrências',\n    totalFuelDropLiters: 'Combustível Perdido',\n    speedLimit: 'Limite de Velocidade',\n    eventType: 'Evento',\n    info: 'Informação',\n    event_ignitionOff: 'Ignição Desligada',\n    event_ignitionOn: 'Ignição Ligada',\n    event_deviceOverspeed: 'Excesso de Velocidade',\n    event_geofenceEnter: 'Entrada em Zona',\n    event_geofenceExit: 'Saída em Zona',\n    event_deviceFuelDrop: 'Perda de Combustível',\n    event_driverChanged: 'Mudança de Motorista',\n    event_sos: 'SOS',\n    event_powerOn: 'Tomada de Força',\n    event_powerCut: 'Corte de Corrente',\n    unsubscribeTripReport: 'Se não deseja receber estes emails por favor aceda a %url% e remova a opção \"Relatório de viagens\" nas definições na secção \"Relatórios\".',\n    unsubscribeLocationsReport: 'Se não deseja receber estes emails por favor aceda a %url% e remova a opção \"Relatório de posições\" nas definições na secção \"Relatórios\".',\n    unsubscribeSpeedingReport: 'Se não deseja receber estes emails por favor aceda a %url% e remova a opção \"Relatório de excesso de velocidade\" nas definições na secção \"Relatórios\".',\n    unsubscribeZoneReport: 'Se não deseja receber estes emails por favor aceda a %url% e remova a opção \"Relatório de zonas\" nas definições na secção \"Relatórios\".',\n    unsubscribeRefuelingReport: 'Se não deseja receber estes emails por favor aceda a %url% e remova a opção \"Relatório de abastecimentos\" nas definições na secção \"Relatórios\".',\n    unsubscribeFuelDropReport: 'Se não deseja receber estes emails por favor aceda a %url% e remova a opção \"Relatório de perdas de combustível\" nas definições na secção \"Relatórios\".'\n  },\n  layout: {\n    deviceOnline: 'Dispositivo Online',\n    deviceMoving: 'Veículo em Movimento',\n    deviceStopped: 'Veículo Parado',\n    ignitionOff: 'Ignição Desligada',\n    ignitionOn: 'Ignição Ligada',\n    deviceOverspeed: 'Excesso de Velocidade',\n    geofenceEnter: 'Entrada de Baliza',\n    geofenceExit: 'Saída de Baliza',\n    deviceFuelDrop: 'Perda de Combustível',\n    driverChanged: 'Mudança de Motorista',\n    test: 'Test Notification',\n    sos: 'SOS',\n    powerOn: 'Tomada de Força',\n    device: 'Veículo',\n    time: 'Data',\n    address: 'Local',\n    driver: 'Motorista',\n    group: 'Grupo',\n    in: 'em',\n    fuelDropInfo: 'Perda de combustível superior a '\n  }\n};\n
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/lang/ptBR.js b/lang/ptBR.js
+--- a/lang/ptBR.js	(revision 0ae69bd1e224b6db3b69f61e65035315b96f9788)
++++ b/lang/ptBR.js	(date 1637845618671)
+@@ -203,6 +203,7 @@
+     duration: 'Duração',
+     vehicles: 'Veículos',
+     vehicle: 'Veículo',
++    licensePlate: 'Placa',
+     odometer: 'Conta-Quilómetros',
+     startOdometer: 'Início (Km)',
+     endOdometer: 'Fim (Km)',
+Index: lang/ptPT.js
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
+<+>module.exports = {\n  route: {\n    map: 'Mapa',\n    dashboard: 'Central de Controlo',\n    reports: 'Relatórios',\n    report: 'Relatório',\n    report_trip_title: 'Relatório de viagens',\n    report_location_title: 'Relatório de posições',\n    report_zone_crossing: 'Relatório de zonas',\n    settings: 'Configurações',\n    duration: 'Duração'\n  },\n  map: {\n    geofence_create_title: 'Nova Geofence',\n    geofence_create_name: 'Por favor indique o nome da baliza...',\n    geofence_created: 'Geofence criada com sucesso!',\n    geofence_create_canceled: 'Criação de baliza cancelada!',\n    poi_create_title: 'Novo POI',\n    poi_create_name: 'Por favor indique o nome do POI...',\n    poi_created: 'POI criado com sucesso!',\n    poi_create_canceled: 'Criação do POI cancelada!',\n    create_confirm: 'Confirmar',\n    create_cancel: 'Cancelar',\n    loading: 'A carregar'\n  },\n  vehicleList: {\n    title: 'Veículos',\n    search: 'Pesquisar...',\n    column_name: 'Nome',\n    column_speed: 'Km/h',\n    column_lastUpdate: 'Última Actualização'\n  },\n  vehicleTable: {\n    immobilize: 'Imobilizar',\n    de_immobilize: 'Remobilizar',\n    send_immobilization: 'Enviar comando de imobilização para o veículo ',\n    send_de_immobilization: 'Enviar comando de remobilização para o veículo ',\n    all_vehicles: 'Todos',\n    moving_vehicles: 'Em Movimento',\n    idle_vehicles: 'Ralenti',\n    stopped_vehicles: 'Parado',\n    disconnected_vehicles: 'Desconhecido'\n  },\n  vehicleDetail: {\n    show_route: 'Rota'\n  },\n  poiTable: {\n    showPOIs: 'Ver POIs',\n    edit_poi: 'Editar',\n    delete_poi: 'Apagar'\n  },\n  dashboard: {\n    startdate: 'Data de Início',\n    enddate: 'Data de Fim',\n    period_lastweek: 'Última semana',\n    period_lastmonth: 'Último mês',\n    period_last3month: 'Últimos 3 meses'\n  },\n  navbar: {\n    profile: 'Perfil',\n    notifications: 'Notificações',\n    settings: 'Configurações',\n    logout: 'Sair'\n  },\n  login: {\n    login_password: 'Palavra-chave',\n    login_button: 'Entrar',\n    login_password_warn: 'A Palavra-chave não pode ter menos de 6 dígitos',\n    login_user: 'Utilizador'\n  },\n  profile: {\n    user_account: 'Utilizador',\n    user_name: 'Nome',\n    user_email: 'E-mail',\n    user_password: 'Palavra-chave',\n    user_phone: 'Telefone',\n    user_language: 'Idioma',\n    user_timezone: 'Fuso horário',\n    user_update_button: 'Gravar',\n    user_updated: 'Informação do utilizador foi actualizada.',\n    user_name_required: 'O campo nome é obrigatório',\n    user_email_required: 'Por favor indique um e-mail válido',\n    user_password_lengh: 'A Palavra-chave não pode ter menos de 6 dígitos'\n  },\n  settings: {\n    map: 'Mapa',\n    vehicles: 'Veículos',\n    title: 'Configurações',\n    route_match: 'Rota na estrada',\n    alerts: 'Alertas',\n    alerts_type: 'Tipo',\n    alerts_notificators: 'Vias',\n    alert_ignitionOff: 'Ignição Desligada',\n    alert_ignitionOn: 'Ignição Ligada',\n    alert_geofenceEnter: 'Entrada em Baliza',\n    alert_geofenceExit: 'Saída de Baliza',\n    alert_deviceOverspeed: 'Excesso de Velocidade',\n    alert_deleted: 'O Alerta foi apagado.',\n    alert_delete_info: 'Pretende apagar o alerta de ',\n    alert_delete_title: 'Apagar Alerta',\n    alert_edit_confirm: 'Confirmar',\n    alert_edit_cancel: 'Cancelar',\n    alert_created: 'Alerta criado com sucesso!',\n    alert_updated: 'Alerta actualizado com sucesso!',\n    alert_add: 'Adicionar Alerta',\n    alert_edit: 'Editar Alerta',\n    alert_delete: 'Apagar Alerta',\n    alert_overspeed_warning: 'Veículo sem velocidade máxima definida',\n    alert_geofences_warning: 'Veículo sem balizas associadas',\n    alert_associate_geofences: 'Associar Balizas',\n    alert_form_type: 'Tipo:',\n    alert_form_type_placeholder: 'Seleccionar o tipo de alerta',\n    alert_form_vehicles: 'Veículos:',\n    alert_form_geofences: 'Balizas:',\n    alert_form_all_vehicles: 'Todos os veículos',\n    alert_form_vehicles_placeholder: 'Seleccionar veículos',\n    alert_form_notificator_web: 'Web',\n    alert_form_notificator_email: 'E-mail',\n    alert_form_notificator_sms: 'SMS',\n    alert_form_confirm: 'Gravar',\n    alert_form_cancel: 'Cancelar',\n    alert_form_geofences_placeholder: 'Seleccionar balizas',\n    vehicle_edit: 'Editar Veículo',\n    vehicle_name: 'Nome',\n    vehicle_licenseplate: 'Matrícula',\n    vehicle_model: 'Modelo',\n    vehicle_speed_limit: 'Limite de Velocidade',\n    vehicle_form_cancel: 'Cancelar',\n    vehicle_form_confirm: 'Guardar',\n    vehicle_form_name: 'Nome',\n    vehicle_form_model: 'Modelo',\n    vehicle_form_speed_limit: 'Limite de Velocidade (Km/h)',\n    vehicle_updated: 'Veículo actualizado com sucesso!'\n  },\n  geofence: {\n    showGeofences: 'Ver Balizas',\n    geofence_name: 'Nome',\n    geofence_edit: 'Editar',\n    geofence_delete: 'Apagar',\n    geofence_deleted: 'A baliza foi apagada',\n    geofence_delete_info: 'Pretende apagar a baliza ',\n    geofence_delete_title: 'Apagar Baliza',\n    geofence_edit_title: 'Editar Baliza',\n    geofence_edit_name: 'Por favor indique o nome da baliza...',\n    geofence_edit_confirm: 'Confirmar',\n    geofence_edit_cancel: 'Cancelar',\n    geofence_edit_canceled: 'Edição cancelada',\n    geofence_edited: 'Baliza editada com sucesso!',\n    poi_delete_info: 'Pretende apagar o POI ',\n    poi_delete_title: 'Apagar POI',\n    poi_edited: 'POI editada com sucesso!',\n    poi_deleted: 'POI  foi apagada',\n    poi_edit_title: 'Editar POI',\n    poi_edit_name: 'Por favor indique o nome do POI...',\n    searchGeofence: 'Procurar baliza',\n    edit_geofence: 'Editar',\n    delete_geofence: 'Apagar'\n  },\n  report: {\n    temperature: 'Temperatura',\n    temperature2: 'Temperatura2',\n    select_vehicles: 'Seleccionar veículos',\n    select_vehicles_placeholder: 'Veículos',\n    select_geofences: 'Seleccionar balizas',\n    select_geofences_placeholder: 'Balizas',\n    select_period: 'Seleccionar período',\n    date_start: 'Data de início',\n    date_end: 'Data de fim',\n    generate_report: 'Gerar relatório',\n    period: 'Período',\n    validate_period: 'Por favor seleccione o período.',\n    user: 'Utilizador',\n    titleTripReport: 'Relatório de Viagens',\n    titleLocationReport: 'Relatório de Posições',\n    titleSpeedingReport: 'Relatório de Excessos de Velocidade',\n    titleZoneReport: 'Relatório de Zonas',\n    titleRefuelingReport: 'Relatório de Abastecimentos',\n    titleFuelDropReport: 'Relatório de Perdas de Combustível',\n    titleEventsReport: 'Relatório de Eventos',\n    titleActivityReport: 'Relatório de Actividade',\n    titleKmsReport: 'Relatórios de Kms',\n    from: 'De',\n    to: 'a',\n    headerStartAddress: 'Local de início',\n    headerDistance: 'Distância percorrida',\n    headerDrivingTime: 'Tempo de condução',\n    headerMaxSpeed: 'Velocidade Máx.',\n    date: 'Data',\n    start: 'Início',\n    end: 'Fim',\n    endAddress: 'Destino',\n    tripTime: 'Duração',\n    idleTime: 'Ralenti',\n    stopTime: 'Paragem',\n    distance: 'Distância',\n    speed: 'Velocidade',\n    overspeed: 'Alerta Ligado',\n    roadSpeedLimit: 'Limite da estrada',\n    avgSpeed: 'Vel.Média',\n    maxSpeed: 'Vel.Max',\n    driver: 'Motorista',\n    group: 'Grupo',\n    address: 'Local',\n    ignition: 'Ignição',\n    ignitionOn: 'Ligada',\n    ignitionOff: 'Desligada',\n    enter: 'Entrada',\n    exit: 'Saida',\n    geofence: 'Zona',\n    duration: 'Duração',\n    vehicles: 'Veículos',\n    vehicle: 'Veículo',\n    odometer: 'Conta-Quilómetros',\n    startOdometer: 'Início (Km)',\n    endOdometer: 'Fim (Km)',\n    spentFuel: 'Consumo (L)',\n    engineHours: 'Utilização (H:m)',\n    driverHours: 'Tempo de Condução (H:m)',\n    refueling: 'Abastecimentos',\n    totalRefueled: 'Total Abastecido',\n    totalFuelDrops: 'Total de Ocorrências',\n    totalFuelDropLiters: 'Combustível Perdido',\n    deviceOnline: 'Dispositivo Online',\n    deviceMoving: 'Veículo em Movimento',\n    deviceStopped: 'Veículo Parado',\n    speedLimit: 'Limite de Velocidade',\n    eventType: 'Evento',\n    info: 'Informação',\n    event_ignitionOff: 'Ignição Desligada',\n    event_ignitionOn: 'Ignição Ligada',\n    event_deviceOverspeed: 'Excesso de Velocidade',\n    event_geofenceEnter: 'Entrada em Zona',\n    event_geofenceExit: 'Saída em Zona',\n    event_deviceFuelDrop: 'Perda de Combustível',\n    event_driverChanged: 'Mudança de Motorista',\n    event_sos: 'SOS',\n    event_powerOn: 'Tomada de Força',\n    event_powerCut: 'Corte de Corrente',\n    unsubscribeTripReport: 'Se não deseja receber estes emails por favor aceda a %url% e remova a opção \"Relatório de viagens\" nas definições na secção \"Relatórios\".',\n    unsubscribeLocationsReport: 'Se não deseja receber estes emails por favor aceda a %url% e remova a opção \"Relatório de posições\" nas definições na secção \"Relatórios\".',\n    unsubscribeSpeedingReport: 'Se não deseja receber estes emails por favor aceda a %url% e remova a opção \"Relatório de excesso de velocidade\" nas definições na secção \"Relatórios\".',\n    unsubscribeZoneReport: 'Se não deseja receber estes emails por favor aceda a %url% e remova a opção \"Relatório de zonas\" nas definições na secção \"Relatórios\".',\n    unsubscribeRefuelingReport: 'Se não deseja receber estes emails por favor aceda a %url% e remova a opção \"Relatório de abastecimentos\" nas definições na secção \"Relatórios\".',\n    unsubscribeFuelDropReport: 'Se não deseja receber estes emails por favor aceda a %url% e remova a opção \"Relatório de perdas de combustível\" nas definições na secção \"Relatórios\".',\n  },\n  layout: {\n    deviceOnline: 'Dispositivo Online',\n    deviceMoving: 'Veículo em Movimento',\n    deviceStopped: 'Veículo Parado',\n    ignitionOff: 'Ignição Desligada',\n    ignitionOn: 'Ignição Ligada',\n    deviceOverspeed: 'Excesso de Velocidade',\n    geofenceEnter: 'Entrada em Zona',\n    geofenceExit: 'Saída em Zona',\n    deviceFuelDrop: 'Perda de Combustível',\n    driverChanged: 'Mudança de Motorista',\n    sos: 'SOS',\n    powerOn: 'Tomada de Força',\n    device: 'Veículo',\n    time: 'Data',\n    address: 'Local',\n    driver: 'Motorista',\n    group: 'Grupo',\n    in: 'em',\n    fuelDropInfo: 'Perda de combustível superior a '\n  }\n};\n
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/lang/ptPT.js b/lang/ptPT.js
+--- a/lang/ptPT.js	(revision 0ae69bd1e224b6db3b69f61e65035315b96f9788)
++++ b/lang/ptPT.js	(date 1637845630345)
+@@ -210,6 +210,7 @@
+     duration: 'Duração',
+     vehicles: 'Veículos',
+     vehicle: 'Veículo',
++    licensePlate: 'Matrícula',
+     odometer: 'Conta-Quilómetros',
+     startOdometer: 'Início (Km)',
+     endOdometer: 'Fim (Km)',
+Index: src/index.js
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
+<+>function Reports(config, axios) {\n    const {ReportsApi, PositionsApi, SessionApi, DevicesApi, GroupsApi, DriversApi, GeofencesApi} = require('traccar-api')\n    this.traccar = {\n        reports: new ReportsApi(config, null, axios),\n        positions: new PositionsApi(config, null, axios),\n        session: new SessionApi(config, null, axios),\n        devices: new DevicesApi(config, null, axios),\n        groups: new GroupsApi(config, null, axios),\n        drivers: new DriversApi(config, null, axios),\n        geofences: new GeofencesApi(config, null, axios)\n    }\n    this.getUserData = async () => {\n        return {\n            user: await this.traccar.session.sessionGet().then(d => d.data),\n            devices: await this.traccar.devices.devicesGet().then(d => d.data),\n            groups: await this.traccar.groups.groupsGet().then(d => d.data),\n            drivers: await this.traccar.drivers.driversGet().then(d => d.data),\n            geofences: await this.traccar.geofences.geofencesGet().then(d => d.data),\n            byGroup: false\n        }\n    }\n    this.speedingReport = (from, to, userData, roadSpeedLimits) => {\n        return require('./speeding-report').createSpeedingReport(from, to, userData, this.traccar, roadSpeedLimits)\n    }\n\n    this.speedingReportToPDF = (userData, reportData) => {\n        return require('./speeding-report').exportSpeedingReportToPDF(userData, reportData)\n    }\n\n    this.speedingReportToExcel = (userData, reportData) => {\n        return require('./speeding-report').exportSpeedingReportToExcel(userData, reportData)\n    }\n\n    this.tripReport = (from, to, userData) => {\n        return require('./trip-report').createTripReport(from, to, userData, this.traccar)\n    }\n    this.tripReportToPDF = (userData, reportData) => {\n        return require('./trip-report').exportTripReportToPDF(userData, reportData)\n    }\n    this.tripReportToExcel = (userData, reportData) => {\n        return require('./trip-report').exportTripReportToExcel(userData, reportData)\n    }\n\n    this.zoneReport = (from, to, userData) => {\n        return require('./zone-report').createZoneReport(from, to, userData, this.traccar)\n    }\n\n    this.zoneReportToPDF = (userData, reportData) => {\n        return require('./zone-report').exportZoneReportToPDF(userData, reportData)\n    }\n\n    this.zoneReportToExcel = (userData, reportData) => {\n        return require('./zone-report').exportZoneReportToExcel(userData, reportData)\n    }\n\n    this.refuelingReport = (from, to, userData) => {\n        return require('./refueling-report').createRefuelingReport(from, to, userData, this.traccar)\n    }\n\n    this.fuelDropReport = (from, to, userData) => {\n        return require('./fueldrop-report').createFuelDropReport(from, to, userData, this.traccar)\n    }\n\n    this.eventsReport = (from, to, userData) => {\n        return require('./events-report').createEventsReport(from, to, userData, this.traccar)\n    }\n\n    this.eventsReportToPDF = (userData, reportData) => {\n        return require('./events-report').exportSpeedingReportToPDF(userData, reportData)\n    }\n\n    this.eventsReportToExcel = (userData, reportData) => {\n        return require('./events-report').exportSpeedingReportToExcel(userData, reportData)\n    }\n\n    this.fuelConsumptionReport = (from, to, userData) => {\n        return require('./fuelconsumption-report').createFuelConsumptionReport(from, to, userData, this.traccar)\n    }\n\n    this.locationReport = (from, to, userData) => {\n        return require('./location-report').createLocationReport(from, to, userData, this.traccar)\n    }\n\n    this.locationReportToPDF = (userData, reportData) => {\n        return require('./location-report').exportLocationReportToPDF(userData, reportData)\n    }\n\n    this.locationReportToExcel = (userData, reportData) => {\n        return require('./location-report').exportLocationReportToExcel(userData, reportData)\n    }\n\n    this.activityReport = (from, to, userData) => {\n        return require('./activity-report').createActivityReport(from, to, userData, this.traccar)\n    }\n\n    this.activityReportToPDF = (userData, reportData) => {\n        return require('./activity-report').exportActivityReportToPDF(userData, reportData)\n    }\n\n    this.activityReportToExcel = (userData, reportData) => {\n        return require('./activity-report').exportActivityReportToExcel(userData, reportData)\n    }\n\n    this.kmsReport = (from, to, userData) => {\n        return require('./kms-report').createKmsReport(from, to, userData, this.traccar)\n    }\n\n    this.kmsReportToPDF = (userData, reportData) => {\n        return require('./kms-report').exportKmsReportToPDF(userData, reportData)\n    }\n\n    this.kmsReportToExcel = (userData, reportData) => {\n        return require('./kms-report').exportKmsReportToExcel(userData, reportData)\n    }\n\n    this.vistaWasteActivityReport = (from, to, userData) => {\n        return require('./custom/vistawasteActivity-report').createVistaWasteActivityReport(from, to, userData, this.traccar)\n    }\n\n    this.vistaWasteActivityReportToPDF = (userData, reportData) => {\n        return require('./custom/vistawasteActivity-report').exportVistaWasteActivityReportToPDF(userData, reportData)\n    }\n\n    this.vistaWasteActivityReportToExcel = (userData, reportData) => {\n        return require('./custom/vistawasteActivity-report').exportVistaWasteActivityReportToExcel(userData, reportData)\n    }\n}\nmodule.exports = Reports\n\n
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/src/index.js b/src/index.js
+--- a/src/index.js	(revision 0ae69bd1e224b6db3b69f61e65035315b96f9788)
++++ b/src/index.js	(date 1637845630356)
+@@ -23,7 +23,7 @@
+         return require('./speeding-report').createSpeedingReport(from, to, userData, this.traccar, roadSpeedLimits)
+     }
+ 
+-    this.speedingReportToPDF = (userData, reportData) => {
++    this.speedingReportToPDF = async (userData, reportData) => {
+         return require('./speeding-report').exportSpeedingReportToPDF(userData, reportData)
+     }
+ 

package/.idea/shelf/Uncommitted_changes_before_Update_at_25_11_2021__13_06__Changes_.xml

@@ -0,0 +1,4 @@
+<changelist name="Uncommitted_changes_before_Update_at_25_11_2021,_13_06_[Changes]" date="1637845630581" recycled="true" deleted="true">
+  <option name="PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_25_11_2021,_13_06_[Changes]/shelved.patch" />
+  <option name="DESCRIPTION" value="Uncommitted changes before Update at 25/11/2021, 13:06 [Changes]" />
+</changelist>

package/.idea/shelf/Uncommitted_changes_before_Update_at_25_11_2021__13_10__Changes_.xml

@@ -0,0 +1,4 @@
+<changelist name="Uncommitted_changes_before_Update_at_25_11_2021,_13_10_[Changes]" date="1637845850090" recycled="true" deleted="true">
+  <option name="PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_25_11_2021,_13_10_[Changes]/shelved.patch" />
+  <option name="DESCRIPTION" value="Uncommitted changes before Update at 25/11/2021, 13:10 [Changes]" />
+</changelist>

package/.idea/workspace.xml

@@ -0,0 +1,246 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ChangeListManager">
+    <list default="true" id="eb665c86-c893-4333-bd2a-721dc27980b9" name="Changes" comment="kms report with parallel requests">
+      <change beforePath="$PROJECT_DIR$/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/package.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/index.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/index.test.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/index.test.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/kms-report.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/kms-report.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/util/traccar.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/util/traccar.js" afterDir="false" />
+    </list>
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="FileTemplateManagerImpl">
+    <option name="RECENT_TEMPLATES">
+      <list>
+        <option value="JavaScript File" />
+      </list>
+    </option>
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
+  <component name="ProjectId" id="20NIxbej0qfi8RaO3jr1XOU0xol" />
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showLibraryContents" value="true" />
+  </component>
+  <component name="PropertiesComponent">
+    <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
+    <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
+    <property name="WebServerToolWindowFactoryState" value="false" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="nodejs.mocha.mocha_node_package_dir" value="$PROJECT_DIR$/node_modules/mocha" />
+    <property name="nodejs_package_manager_path" value="npm" />
+    <property name="ts.external.directory.path" value="$APPLICATION_HOME_DIR$/plugins/JavaScriptLanguage/jsLanguageServicesImpl/external" />
+    <property name="vue.rearranger.settings.migration" value="true" />
+  </component>
+  <component name="RunManager" selected="Mocha.speedingReport.test kmsReport by day">
+    <configuration name="report" type="mocha-javascript-test-runner" temporary="true" nameIsGenerated="true">
+      <node-interpreter>project</node-interpreter>
+      <node-options />
+      <mocha-package>$PROJECT_DIR$/node_modules/mocha</mocha-package>
+      <working-directory>$PROJECT_DIR$</working-directory>
+      <pass-parent-env>true</pass-parent-env>
+      <ui>bdd</ui>
+      <extra-mocha-options />
+      <test-kind>SUITE</test-kind>
+      <test-file>$PROJECT_DIR$/src/index.test.js</test-file>
+      <test-names>
+        <name value="report" />
+      </test-names>
+      <method v="2" />
+    </configuration>
+    <configuration name="speedingReport" type="mocha-javascript-test-runner" temporary="true" nameIsGenerated="true">
+      <node-interpreter>project</node-interpreter>
+      <node-options />
+      <mocha-package>$PROJECT_DIR$/node_modules/mocha</mocha-package>
+      <working-directory>$PROJECT_DIR$</working-directory>
+      <pass-parent-env>true</pass-parent-env>
+      <ui>bdd</ui>
+      <extra-mocha-options />
+      <test-kind>TEST</test-kind>
+      <test-file>$PROJECT_DIR$/src/index.test.js</test-file>
+      <test-names>
+        <name value="speedingReport" />
+      </test-names>
+      <method v="2" />
+    </configuration>
+    <configuration name="speedingReport.test kmsReport by day" type="mocha-javascript-test-runner" temporary="true" nameIsGenerated="true">
+      <node-interpreter>project</node-interpreter>
+      <node-options />
+      <mocha-package>$PROJECT_DIR$/node_modules/mocha</mocha-package>
+      <working-directory>$PROJECT_DIR$</working-directory>
+      <pass-parent-env>true</pass-parent-env>
+      <envs>
+        <env name="email" value="jppenas@gmail.com" />
+        <env name="password" value="penas46881" />
+      </envs>
+      <ui>bdd</ui>
+      <extra-mocha-options />
+      <test-kind>TEST</test-kind>
+      <test-file>$PROJECT_DIR$/src/index.test.js</test-file>
+      <test-names>
+        <name value="speedingReport" />
+        <name value="test kmsReport by day" />
+      </test-names>
+      <method v="2" />
+    </configuration>
+    <configuration name="test reports" type="mocha-javascript-test-runner" temporary="true" nameIsGenerated="true">
+      <node-interpreter>project</node-interpreter>
+      <node-options />
+      <mocha-package>$PROJECT_DIR$/node_modules/mocha</mocha-package>
+      <working-directory>$PROJECT_DIR$</working-directory>
+      <pass-parent-env>true</pass-parent-env>
+      <envs>
+        <env name="email" value="jppenas@gmail.com" />
+        <env name="password" value="penas46881" />
+      </envs>
+      <ui>bdd</ui>
+      <extra-mocha-options />
+      <test-kind>SUITE</test-kind>
+      <test-file>$PROJECT_DIR$/src/index.test.js</test-file>
+      <test-names>
+        <name value="test reports" />
+      </test-names>
+      <method v="2" />
+    </configuration>
+    <configuration name="test reports.test queue" type="mocha-javascript-test-runner" temporary="true" nameIsGenerated="true">
+      <node-interpreter>project</node-interpreter>
+      <node-options />
+      <mocha-package>$PROJECT_DIR$/node_modules/mocha</mocha-package>
+      <working-directory>$PROJECT_DIR$</working-directory>
+      <pass-parent-env>true</pass-parent-env>
+      <ui>bdd</ui>
+      <extra-mocha-options />
+      <test-kind>TEST</test-kind>
+      <test-file>$PROJECT_DIR$/src/index.test.js</test-file>
+      <test-names>
+        <name value="test reports" />
+        <name value="test queue" />
+      </test-names>
+      <method v="2" />
+    </configuration>
+    <list>
+      <item itemvalue="Mocha.report" />
+      <item itemvalue="Mocha.speedingReport" />
+      <item itemvalue="Mocha.test reports" />
+      <item itemvalue="Mocha.test reports.test queue" />
+      <item itemvalue="Mocha.speedingReport.test kmsReport by day" />
+    </list>
+    <recent_temporary>
+      <list>
+        <item itemvalue="Mocha.speedingReport.test kmsReport by day" />
+        <item itemvalue="Mocha.test reports" />
+        <item itemvalue="Mocha.test reports.test queue" />
+        <item itemvalue="Mocha.speedingReport" />
+        <item itemvalue="Mocha.report" />
+      </list>
+    </recent_temporary>
+  </component>
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="eb665c86-c893-4333-bd2a-721dc27980b9" name="Changes" comment="" />
+      <created>1635878866368</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1635878866368</updated>
+      <workItem from="1635878870054" duration="105000" />
+      <workItem from="1635943211865" duration="371000" />
+      <workItem from="1636030918716" duration="808000" />
+      <workItem from="1636366400735" duration="3018000" />
+      <workItem from="1636371409243" duration="45000" />
+      <workItem from="1636371621773" duration="4750000" />
+      <workItem from="1636623371114" duration="675000" />
+      <workItem from="1636624396937" duration="1987000" />
+      <workItem from="1636627666406" duration="1616000" />
+      <workItem from="1636647112207" duration="1748000" />
+      <workItem from="1636981640447" duration="4315000" />
+      <workItem from="1637009407292" duration="1470000" />
+      <workItem from="1637012863006" duration="5376000" />
+      <workItem from="1637087797229" duration="5701000" />
+      <workItem from="1637227826845" duration="1275000" />
+      <workItem from="1637441942952" duration="4543000" />
+      <workItem from="1637670815688" duration="2973000" />
+      <workItem from="1637674107929" duration="13419000" />
+      <workItem from="1637756665591" duration="4742000" />
+      <workItem from="1637841765985" duration="10197000" />
+      <workItem from="1637868513425" duration="1650000" />
+      <workItem from="1637928687573" duration="37000" />
+      <workItem from="1637931438656" duration="621000" />
+      <workItem from="1637952151523" duration="4408000" />
+    </task>
+    <task id="LOCAL-00001" summary="Fix getStyle">
+      <created>1636983717385</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1636983717385</updated>
+    </task>
+    <task id="LOCAL-00002" summary="Fix getStyle in all reports">
+      <created>1637020728356</created>
+      <option name="number" value="00002" />
+      <option name="presentableId" value="LOCAL-00002" />
+      <option name="project" value="LOCAL" />
+      <updated>1637020728356</updated>
+    </task>
+    <task id="LOCAL-00003" summary="try catch on pdf addImage">
+      <created>1637247013210</created>
+      <option name="number" value="00003" />
+      <option name="presentableId" value="LOCAL-00003" />
+      <option name="project" value="LOCAL" />
+      <updated>1637247013211</updated>
+    </task>
+    <task id="LOCAL-00004" summary="Kms report grouped by day">
+      <created>1637715473148</created>
+      <option name="number" value="00004" />
+      <option name="presentableId" value="LOCAL-00004" />
+      <option name="project" value="LOCAL" />
+      <updated>1637715473149</updated>
+    </task>
+    <task id="LOCAL-00005" summary="Fix pdf logo">
+      <created>1637849206762</created>
+      <option name="number" value="00005" />
+      <option name="presentableId" value="LOCAL-00005" />
+      <option name="project" value="LOCAL" />
+      <updated>1637849206762</updated>
+    </task>
+    <task id="LOCAL-00006" summary="kms report with parallel requests">
+      <created>1637858604089</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1637858604089</updated>
+    </task>
+    <option name="localTasksCounter" value="7" />
+    <servers />
+  </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="3" />
+  </component>
+  <component name="Vcs.Log.Tabs.Properties">
+    <option name="TAB_STATES">
+      <map>
+        <entry key="MAIN">
+          <value>
+            <State />
+          </value>
+        </entry>
+      </map>
+    </option>
+    <option name="oldMeFiltersMigrated" value="true" />
+  </component>
+  <component name="VcsManagerConfiguration">
+    <MESSAGE value="Fix getStyle" />
+    <MESSAGE value="Fix getStyle in all reports" />
+    <MESSAGE value="try catch on pdf addImage" />
+    <MESSAGE value="Kms report grouped by day" />
+    <MESSAGE value="Fix pdf logo" />
+    <MESSAGE value="kms report with parallel requests" />
+    <option name="LAST_COMMIT_MESSAGE" value="kms report with parallel requests" />
+  </component>
+</project>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fleetmap-reports",
-  "version": "1.0.241",
+  "version": "1.0.245",
   "description": "",
   "main": "src/index.js",
   "scripts": {

package/src/index.js

@@ -23,7 +23,7 @@ function Reports(config, axios) {
         return require('./speeding-report').createSpeedingReport(from, to, userData, this.traccar, roadSpeedLimits)
     }
 
-    this.speedingReportToPDF = (userData, reportData) => {
+    this.speedingReportToPDF = async (userData, reportData) => {
         return require('./speeding-report').exportSpeedingReportToPDF(userData, reportData)
     }
 

package/src/index.test.js

@@ -14,7 +14,11 @@ describe('speedingReport', function() {
         const reports = await getReports()
         const userData = await reports.getUserData()
         userData.groupByDay = true
-        await reports.kmsReport(new Date(2021, 9), new Date(2021, 10),
+        const reportData = await reports.kmsReport(new Date(2021, 10, 1), new Date(2021, 10, 3),
             userData)
+
+        console.log(reportData)
+
+        await reports.kmsReportToPDF(userData, reportData[0])
     })
 })

package/src/kms-report.js

@@ -23,9 +23,10 @@ async function createKmsReportByDevice(from, to, userData) {
     }
 
     devicesToProcess.sort((a, b) => (a.name > b.name) ? 1 : -1)
-    const data = await traccar.getRoute(traccarInstance, from, to, devicesToProcess)
+    //const data = await traccar.getRoute(traccarInstance, from, to, devicesToProcess)
+    const data = await traccar.getTrips(traccarInstance, from, to, devicesToProcess)
 
-    console.log('locations:' + data.length)
+    console.log('trips:' + data.length)
 
     if (data.length > 0) {
         allData.devices = processDevices(from, to, devicesToProcess, data)
@@ -46,23 +47,23 @@ function processDevices(from, to, devices, data) {
     const devicesResult = []
 
     for (const d of devices) {
-        const locations = data.filter(t => t.deviceId === d.id)
+        const trips = data.filter(t => t.deviceId === d.id)
 
-        if (locations.length > 0) {
-            locations.forEach(l => l.locationDate = l.fixTime.substring(0, 10) + ' 12:00 PM')
-            const groupedLocations = locations.reduce(
-                (entryMap, e) => entryMap.set(e.locationDate, [...entryMap.get(e.locationDate)||[], e]),
+        if (trips.length > 0) {
+            trips.forEach(t => t.tripDay = new Date(t.startTime).toISOString().split('T')[0] + ' 12:00 PM')
+            const groupedTrips = trips.reduce(
+                (entryMap, e) => entryMap.set(e.tripDay, [...entryMap.get(e.tripDay)||[], e]),
                 new Map()
             )
 
             const days = []
-            const keys = Array.from(groupedLocations.keys())
+            const keys = Array.from(groupedTrips.keys())
 
             keys.forEach(key => {
-                const dayLocations = groupedLocations.get(key)
+                const dayTrips = groupedTrips.get(key)
                 const day = {
-                    date: new Date(key).toLocaleDateString(),
-                    kms: dayLocations.reduce((a, b) => a + b.attributes.distance, 0) || 0
+                    date: new Date(key),
+                    kms: dayTrips.reduce((a, b) => a + b.distance, 0) || 0
                 }
                 days.push(day)
             })

package/src/util/traccar.js

@@ -1,4 +1,5 @@
 const automaticReports = require("../automaticReports");
+const moment = require('moment')
 
 async function getRoute(traccar, from, to, devices){
     const devicesToSlice = devices.slice()
@@ -14,4 +15,18 @@ async function getRoute(traccar, from, to, devices){
     return result.map(r => r.data).flat()
 }
 
+async function getTrips(traccar, from, to, devices){
+    const devicesToSlice = devices.slice()
+    const arrayOfArrays = automaticReports.sliceArray(devicesToSlice)
+    let requests = []
+    for (const a of arrayOfArrays) {
+        const promise = traccar.reports.reportsTripsGet(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

package/.idea/codeStyles/Project.xml

@@ -1,7 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <ScalaCodeStyleSettings>
-      <option name="MULTILINE_STRING_CLOSING_QUOTES_ON_NEW_LINE" value="true" />
-    </ScalaCodeStyleSettings>
-  </code_scheme>
-</component>

package/.idea/codeStyles/codeStyleConfig.xml

@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </state>
-</component>

package/.idea/jsLibraryMappings.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="JavaScriptLibraryMappings">
-    <file url="file://$PROJECT_DIR$" libraries="{Node.js Core}" />
-  </component>
-</project>