fleetmap-reports 1.0.319 → 1.0.323

package/package.json

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

package/src/events-report.js

@@ -25,7 +25,7 @@ async function createEventsReport(from, to, userData, traccar) {
                     xpert: devices.filter(d => d.attributes.xpert).length > 0
                 }
 
-                const data = await getReportData(from, to, devices, userData.eventTypes)
+                const data = await getReportData(from, to, devices, userData.eventTypes, traccar)
 
                 devices.sort((a, b) => (a.name > b.name) ? 1 : -1)
 

package/src/kms-report.js

@@ -103,7 +103,7 @@ async function createKmsReportByGroup(from, to, userData, traccarInstance) {
         }
     }
 
-    const withoutGroupData = await createKmsReportByDevice(from, to)
+    const withoutGroupData = await createKmsReportByDevice(from, to, userData, traccarInstance)
     reportData.push(withoutGroupData)
 
     return reportData
@@ -411,6 +411,8 @@ function exportKmsReportToExcel(userData, reportData) {
         }
     })
 
+    data.concat({licenseplate: 'Total', distance: data.reduce((prev, curr) => prev + curr.distance)})
+
     return {
         headers,
         data,

package/src/speeding-report.js

@@ -63,7 +63,7 @@ async function createSpeedingReportByGroup(from, to, userData, traccarInstance){
   const groupIds = userData.groups.map(g => g.id)
   const withoutGroupDevices = userData.devices.filter(d => !groupIds.includes(d.groupId))
 
-  const withoutGroupData = await createSpeedingReportByDevice(from, to, withoutGroupDevices)
+  const withoutGroupData = await createSpeedingReportByDevice(from, to, withoutGroupDevices, userData, traccarInstance)
   reportData.push(withoutGroupData)
 
   return reportData

package/src/word/index.js

@@ -1,10 +1,10 @@
 const {Document, Paragraph, Packer, TableRow, TableCell, Table, WidthType, ImageRun, Header, TextRun, HeadingLevel,
-    AlignmentType
+    AlignmentType, Footer
 } = require("docx")
 const { saveAs } = require('file-saver')
 const utils = require('../util/utils')
 const {getPartnerData} = require("fleetmap-partners");
-const colWidth = 3505
+const colWidth = 2000
 
 function formatCellValue(value) {
     return value.toLocaleDateString ? value.toLocaleDateString() : value + ''
@@ -61,6 +61,17 @@ exports.reportToWord = async (userData, dateRange, excel, title) => {
                     ]
                 })
             },
+            footers: {
+                default: new Footer({
+                    children: [
+                        new Paragraph({
+                            children: [
+                                new TextRun('Relatório gerado a ' + new Date().toLocaleString())
+                            ]
+                        })
+                    ]
+                })
+            },
             properties: {},
             children: [
                 new Paragraph({