fleetmap-reports 1.0.234 → 1.0.238

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,9 @@ 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)
+
+        await reports.kmsReportToPDF(userData, reportData[0])
     })
 })

package/src/kms-report.js

@@ -6,6 +6,7 @@ const {getStyle} = require("./reportStyle");
 const {headerFromUser,addTable} = require("./util/pdfDocument");
 const {getUserPartner} = require("fleetmap-partners");
 const automaticReports = require("./automaticReports");
+const traccar = require("./util/traccar");
 
 
 let traccarInstance
@@ -23,16 +24,7 @@ async function createKmsReportByDevice(from, to, userData) {
     }
 
     devicesToProcess.sort((a, b) => (a.name > b.name) ? 1 : -1)
-    const devicesToSlice = devicesToProcess.slice()
-
-    const arrayOfArrays = automaticReports.sliceArray(devicesToSlice)
-    let data = []
-    for (const a of arrayOfArrays) {
-        console.log('getting',from,to,a.map(a => a.id))
-        const response = await traccarInstance.reports.reportsRouteGet(from, to, a.map(d => d.id))
-        console.log('concat', response.data.length)
-        data = data.concat(response.data)
-    }
+    const data = await traccar.getRoute(traccarInstance, from, to, devicesToProcess)
 
     console.log('locations:' + data.length)
 
@@ -134,8 +126,8 @@ async function exportKmsReportToPDF(userData, reportData) {
     }
     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) {
@@ -242,6 +234,7 @@ function exportKmsReportToExcel(userData, reportData) {
     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'})
@@ -252,7 +245,7 @@ function exportKmsReportToExcel(userData, reportData) {
             {label: translations.report.distance, value: 'distance'})
     } else {
         headers.push(
-            {label: translations.report.driver, value: 'name'},
+            {label: translations.report.vehicle, value: 'name'},
             {label: translations.settings.vehicle_licenseplate, value: 'licenseplate'},
             {label: translations.report.group, value: 'group'},
             {label: translations.report.distance, value: 'distance'})
@@ -264,25 +257,25 @@ function exportKmsReportToExcel(userData, reportData) {
         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,
+        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,
-                    distance: Number((d.summary.distance / 1000).toFixed(0))
-                }])
-            }
+                    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 {

package/src/util/pdfDocument.js

@@ -3,7 +3,7 @@ const {getStyle} = require("../reportStyle");
 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 @@ async function header(doc, title, hostname, style) {
         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 : 135) + (style.imgWidth < 50 ? 25 : 0), 5, style.imgWidth, style.imgHeight)
             }
         } catch (e) {
         }
@@ -20,9 +20,9 @@ async function header(doc, title, hostname, style) {
     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){

package/src/util/traccar.js

@@ -0,0 +1,17 @@
+const automaticReports = require("../automaticReports");
+
+async function getRoute(traccar, from, to, devices){
+    const devicesToSlice = devices.slice()
+
+    const arrayOfArrays = automaticReports.sliceArray(devicesToSlice)
+    let requests = []
+    for (const a of arrayOfArrays) {
+        const promise = traccar.reports.reportsRouteGet(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

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>