fleetmap-reports 1.0.211 → 1.0.215

package/.idea/workspace.xml

@@ -4,6 +4,7 @@
     <list default="true" id="eb665c86-c893-4333-bd2a-721dc27980b9" name="Changes" comment="try catch on pdf addImage">
       <change beforePath="$PROJECT_DIR$/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/package.json" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/activity-report.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/activity-report.js" 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/pdfDocument.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/util/pdfDocument.js" afterDir="false" />
@@ -143,6 +144,7 @@
       <workItem from="1637227826845" duration="1275000" />
       <workItem from="1637441942952" duration="4543000" />
       <workItem from="1637670815688" duration="2973000" />
+      <workItem from="1637674107929" duration="11518000" />
     </task>
     <task id="LOCAL-00001" summary="Fix getStyle">
       <created>1636983717385</created>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fleetmap-reports",
-  "version": "1.0.211",
+  "version": "1.0.215",
   "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

@@ -37,8 +37,8 @@ describe('test reports', function() {
         })
 
 
-        //const pdf = report.tripReportToPDF(userData, reportData)
+        const pdf = report.kmsReportToPDF(userData, reportResult)
 
-        //console.log(pdf)
+        console.log(pdf)
     })
 })

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 {convertMS} = require("./util/utils");
 
 
 let traccarInstance
@@ -111,9 +112,14 @@ async function createKmsReport(from, to, userData, traccar) {
 async function exportKmsReportToPDF(userData, reportData) {
     const lang = userData.user.attributes.lang
     const translations = messages[lang] ? messages[lang] : messages['en-GB']
+    const kmsData = userData.byDriver ? reportData.drivers : reportData.devices
 
     const headers = []
-    if(userData.byDriver) {
+    if(userData.groupByDay) {
+        headers.push(translations.report.date,
+            translations.report.distance)
+    }
+    else if(userData.byDriver) {
         headers.push(translations.report.driver,
             translations.report.group,
             translations.report.distance)
@@ -123,57 +129,96 @@ async function exportKmsReportToPDF(userData, reportData) {
             translations.report.group,
             translations.report.distance)
     }
-    if (reportData.devices || reportData.drivers) {
-        const doc = new jsPDF.jsPDF('l');
+    if (kmsData) {
+        let first = true
+        const doc = userData.groupByDay ? new jsPDF.jsPDF() : new jsPDF.jsPDF('l')
         await headerFromUser(doc, translations.report.titleSpeedingReport, userData.user)
 
-        let data = []
-        doc.setFontSize(10)
-        doc.text(new Date(reportData.from).toLocaleString() + ' - ' + new Date(reportData.to).toLocaleString(), 20, 30 )
-        if(userData.byDriver) {
-            reportData.drivers.forEach(d => {
-                const group = userData.groups.find(g => g.drivers.includes(d.driver.id))
-
-                const temp = [
-                    d.driver.name,
-                    group ? group.name : '',
-                    Number((d.summary.distance / 1000).toFixed(0)),
-                ]
-                data.push(temp)
-            })
-        } else {
-            reportData.devices.forEach(d => {
-                const group = userData.groups.find(g => d.device.groupId === g.id)
-
-                const temp = [
-                    d.summary.deviceName,
-                    d.device.model,
-                    group ? group.name : '',
-                    Number((d.summary.distance / 1000).toFixed(0))
-                ]
+        if (userData.groupByDay) {
+            for (const d of kmsData) {
+                const name = userData.byDriver ? d.driver.name : d.device.name
+                const group = userData.byDriver ? userData.groups.find(g => g.drivers.includes(d.id)) : userData.groups.find(g => d.device.groupId === g.id)
+
+                let space = 0
+                if (!first) {
+                    doc.addPage()
+                } else {
+                    first = false
+                    space = 8
+                }
+                doc.setFontSize(13)
+                doc.text(name, 20, space + 20)
+                doc.setFontSize(11)
+                doc.text(group ? translations.report.group + ': ' + group.name : '', 200, space + 20)
+                doc.text(new Date(d.from).toLocaleString() + ' - ' + new Date(d.to).toLocaleString(), 20, space + 25)
+
+                const data = []
+                d.days.forEach(day => {
+                    const temp = [
+                        new Date(day).toLocaleDateString(),
+                        (day.kms/1000).toFixed(0)
+                    ]
+                })
+
                 data.push(temp)
-            })
-        }
 
-        const footValues = []
-        if(userData.byDriver) {
-            footValues.push(
-                'Total:' + reportData.drivers.length,
-                '',
-                (reportData.drivers.reduce((a, b) => a + b.summary.distance, 0)/1000).toFixed(0)
-            )
+                const footValues = []
+                footValues.push(
+                    '',
+                    (d.days.reduce((a, b) => a + b.kms, 0)/1000).toFixed(0)
+                )
+
+                const style = getStyle(getUserPartner(userData.user))
+
+                addTable(doc, headers, data, footValues, style, 35)
+            }
         } else {
-            footValues.push(
-                'Total:' + reportData.devices.length,
-                '',
-                '',
-                (reportData.devices.reduce((a, b) => a + b.summary.distance, 0)/1000).toFixed(0),
-            )
-        }
+            if (userData.byDriver) {
+                reportData.drivers.forEach(d => {
+                    const group = userData.groups.find(g => g.drivers.includes(d.driver.id))
+
+                    const temp = [
+                        d.driver.name,
+                        group ? group.name : '',
+                        Number((d.summary.distance / 1000).toFixed(0)),
+                    ]
+                    data.push(temp)
+                })
+            } else {
+                reportData.devices.forEach(d => {
+                    const group = userData.groups.find(g => d.device.groupId === g.id)
+
+                    const temp = [
+                        d.summary.deviceName,
+                        d.device.model,
+                        group ? group.name : '',
+                        Number((d.summary.distance / 1000).toFixed(0))
+                    ]
+                    data.push(temp)
+                })
+            }
+
+            const footValues = []
+            if(userData.byDriver) {
+                footValues.push(
+                    'Total:' + reportData.drivers.length,
+                    '',
+                    (reportData.drivers.reduce((a, b) => a + b.summary.distance, 0)/1000).toFixed(0)
+                )
+            } else {
+                footValues.push(
+                    'Total:' + reportData.devices.length,
+                    '',
+                    '',
+                    (reportData.devices.reduce((a, b) => a + b.summary.distance, 0)/1000).toFixed(0),
+                )
+            }
 
-        const style = getStyle(getUserPartner(userData.user))
+            const style = getStyle(getUserPartner(userData.user))
 
-        return addTable(doc, headers, data, footValues, style, 35)
+            addTable(doc, headers, data, footValues, style, 35)
+        }
+        return doc
     }
 }
 
@@ -190,55 +235,48 @@ function exportKmsReportToExcel(userData, reportData) {
 
     const headers = []
 
-    if(userData.byDriver) {
+    if(userData.groupByDay){
         headers.push(
-            {label: translations.report.driver, value: 'driver'},
+            {label: translations.report.vehicle, value: 'name'},
             {label: translations.report.group, value: 'group'},
+            {label: translations.report.date, value: 'date'},
             {label: translations.report.distance, value: 'distance'})
-    } else {
+    } else if(userData.byDriver) {
         headers.push(
-            {label: translations.report.vehicle, value: 'name'},
+            {label: translations.report.driver, value: 'name'},
             {label: translations.report.group, value: 'group'},
             {label: translations.report.distance, value: 'distance'})
     }
 
     let data = []
-    if(userData.byDriver){
-        if (reportData.drivers) {
-            reportData.drivers.forEach(d => {
-                const group = userData.groups.find(g => g.drivers.includes(d.driver.id))
-
+    const info = userData.byDriver ? reportData.drivers : reportData.devices
+    info.forEach(d => {
+        const group = userData.byDriver ? userData.groups.find(g => g.drivers.includes(d.driver.id)) :
+            userData.groups.find(g => d.device.groupId === g.id)
+
+            if(userData.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 : '',
+                        date: a.date,
+                        distance: Number((a.kms / 1000).toFixed(0))
+                    }
+                }))
+            } else {
                 data = data.concat([{
-                    driver: d.driver.name,
+                    name: userData.byDriver ? d.driver.name : d.summary.deviceName,
                     group: group ? group.name : '',
                     distance: Number((d.summary.distance / 1000).toFixed(0))
                 }])
-            })
-            console.log(data)
-            return {
-                headers,
-                data,
-                settings
             }
-        }
-    } else {
-        if (reportData.devices) {
-            reportData.devices.forEach(d => {
-                const group = userData.groups.find(g => d.device.groupId === g.id)
+    })
 
-                data = data.concat([{
-                    name: d.summary.deviceName,
-                    group: group ? group.name : '',
-                    distance: Number((d.summary.distance / 1000).toFixed(0))
-                }])
-            })
-            console.log(data)
-            return {
-                headers,
-                data,
-                settings
-            }
-        }
+    return {
+        headers,
+        data,
+        settings
     }
 }