fleetmap-reports 1.0.216 → 1.0.217

package/.idea/workspace.xml

@@ -144,7 +144,7 @@
       <workItem from="1637227826845" duration="1275000" />
       <workItem from="1637441942952" duration="4543000" />
       <workItem from="1637670815688" duration="2973000" />
-      <workItem from="1637674107929" duration="12171000" />
+      <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.216",
+  "version": "1.0.217",
   "description": "",
   "main": "src/index.js",
   "scripts": {

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)
@@ -132,7 +134,7 @@ 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.titleSpeedingReport, userData.user)
+        await headerFromUser(doc, translations.report.titleKmsReport, userData.user)
 
         if (userData.groupByDay) {
             for (const d of kmsData) {
@@ -149,13 +151,13 @@ 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 = []
                 d.days.forEach(day => {
                     const temp = [
-                        new Date(day).toLocaleDateString(),
+                        new Date(day.date).toLocaleDateString(),
                         (day.kms/1000).toFixed(0)
                     ]
 
@@ -173,6 +175,7 @@ async function exportKmsReportToPDF(userData, reportData) {
                 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))