fleetmap-reports 1.0.213 → 1.0.217

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,7 +144,7 @@
       <workItem from="1637227826845" duration="1275000" />
       <workItem from="1637441942952" duration="4543000" />
       <workItem from="1637670815688" duration="2973000" />
-      <workItem from="1637674107929" duration="9187000" />
+      <workItem from="1637674107929" duration="12917000" />
     </task>
     <task id="LOCAL-00001" summary="Fix getStyle">
       <created>1636983717385</created>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fleetmap-reports",
-  "version": "1.0.213",
+  "version": "1.0.217",
   "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,7 +37,7 @@ describe('test reports', function() {
         })
 
 
-        const pdf = report.kmsReportToExcel(userData, reportResult)
+        const pdf = report.kmsReportToPDF(userData, reportResult)
 
         console.log(pdf)
     })

package/src/kms-report.js

@@ -18,7 +18,9 @@ async function createKmsReportByDevice(from, to, userData) {
     const devicesToProcess = userData.byGroup ? userData.devices.filter(d => !groupIds.includes(d.groupId)) : userData.devices
 
     const allData = {
-        devices: []
+        devices: [],
+        from: from,
+        to: to
     }
 
     devicesToProcess.sort((a, b) => (a.name > b.name) ? 1 : -1)
@@ -130,12 +132,13 @@ async function exportKmsReportToPDF(userData, reportData) {
             translations.report.distance)
     }
     if (kmsData) {
+        let first = true
         const doc = userData.groupByDay ? new jsPDF.jsPDF() : new jsPDF.jsPDF('l')
-        await headerFromUser(doc, translations.report.titleSpeedingReport, userData.user)
+        await headerFromUser(doc, translations.report.titleKmsReport, userData.user)
 
         if (userData.groupByDay) {
             for (const d of kmsData) {
-                const name = userData.byDriver ? d.driver.name : deviceName(d.device)
+                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
@@ -148,18 +151,31 @@ async function exportKmsReportToPDF(userData, reportData) {
                 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)
+                doc.text(group ? translations.report.group + ': ' + group.name : '', 150, space + 20)
+                doc.text(new Date(reportData.from).toLocaleString() + ' - ' + new Date(reportData.to).toLocaleString(), 20, space + 25)
 
                 const data = []
-                const temp = [
-                    d.driver.name,
-                    group ? group.name : '',
-                    Number((d.summary.distance / 1000).toFixed(0)),
-                ]
-                data.push(temp)
+                d.days.forEach(day => {
+                    const temp = [
+                        new Date(day.date).toLocaleDateString(),
+                        (day.kms/1000).toFixed(0)
+                    ]
+
+                    data.push(temp)
+                })
+
+                const footValues = []
+                footValues.push(
+                    '',
+                    (d.days.reduce((a, b) => a + b.kms, 0)/1000).toFixed(0)
+                )
+
+                const style = getStyle(getUserPartner(userData.user))
+
+                addTable(doc, headers, data, footValues, style, 35)
             }
         } else {
+            const data = []
             if (userData.byDriver) {
                 reportData.drivers.forEach(d => {
                     const group = userData.groups.find(g => g.drivers.includes(d.driver.id))
@@ -203,8 +219,9 @@ async function exportKmsReportToPDF(userData, reportData) {
 
             const style = getStyle(getUserPartner(userData.user))
 
-            return addTable(doc, headers, data, footValues, style, 35)
+            addTable(doc, headers, data, footValues, style, 35)
         }
+        return doc
     }
 }