fleetmap-reports 1.0.306 → 1.0.310

package/.idea/aws.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="accountSettings">
+    <option name="activeProfile" value="profile:default" />
+    <option name="activeRegion" value="us-east-1" />
+    <option name="recentlyUsedProfiles">
+      <list>
+        <option value="profile:default" />
+      </list>
+    </option>
+    <option name="recentlyUsedRegions">
+      <list>
+        <option value="us-east-1" />
+      </list>
+    </option>
+  </component>
+</project>

package/{fleetmap-reports.iml → .idea/fleetmap-reports.iml}

@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
+<module type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>

package/.idea/modules.xml

@@ -2,7 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/fleetmap-reports.iml" filepath="$PROJECT_DIR$/fleetmap-reports.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/fleetmap-reports.iml" filepath="$PROJECT_DIR$/.idea/fleetmap-reports.iml" />
     </modules>
   </component>
 </project>

package/.idea/runConfigurations.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RunConfigurationProducerService">
+    <option name="ignoredProducers">
+      <set>
+        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
+      </set>
+    </option>
+  </component>
+</project>

package/.idea/vcs.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="" vcs="Git" />
   </component>
 </project>

package/package.json

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

package/src/activity-report.js

@@ -8,39 +8,31 @@ const {headerFromUser, addTable} = require("./util/pdfDocument")
 const {getStyle} = require("./reportStyle")
 const {getUserPartner} = require("fleetmap-partners")
 const traccar = require("./util/traccar")
-const {createKmsReport} = require("./kms-report");
-const {isInsideTimetable} = require("./util/trips");
-const { Document, Packer, Paragraph, TextRun } = require("docx")
-import { saveAs } from "file-saver"
-let traccarInstance
-let userData
+const {isInsideTimetable, isPartialInsideTimetable} = require("./util/trips");
+const trips = require("./util/trips");
 
 const fileName = 'ActivityReport'
 
-async function createActivityReport(from, to, reportUserData, traccar) {
+async function createActivityReport(from, to, userData, traccarInstance) {
     console.log('Create ActivityReport')
-    traccarInstance = traccar
-    userData = reportUserData
     const reportData = []
 
     if(userData.byDriver){
-        const allData = await createActivityReportByDriver(from, to)
+        const allData = await createActivityReportByDriver(from, to, userData, traccarInstance)
         reportData.push(allData)
     }
     else if(userData.byGroup){
-        const allGroupsData = await createActivityReportByGroup(from, to)
-        allGroupsData.forEach(data => reportData.push(data))
-        const withoutGroupDevices = await createActivityReportByDevice(from, to)
-        reportData.push(withoutGroupDevices)
+        const allData = await createActivityReportByGroup(from, to, userData, traccarInstance)
+        reportData.push(...allData)
     } else {
-        const allData = await createActivityReportByDevice(from, to)
+        const allData = await createActivityReportByDevice(from, to, userData, traccarInstance)
         reportData.push(allData)
     }
 
     return reportData
 }
 
-async function createActivityReportByGroup(from, to){
+async function createActivityReportByGroup(from, to, userData, traccarInstance){
     console.log("ByGroup")
     const reportData = []
     for (const g of userData.groups) {
@@ -56,26 +48,30 @@ async function createActivityReportByGroup(from, to){
             }
 
             const response = await traccarInstance.reports.reportsSummaryGet(from, to, null, [g.id])
-            const data = response.data
+            const summaries = response.data
 
             const responseTrips = await traccarInstance.reports.reportsTripsGet(from, to, null, [g.id])
             const trips = responseTrips.data
 
             devices.sort((a, b) => (a.name > b.name) ? 1 : -1)
 
-            if (data.length > 0) {
+            if (summaries.length > 0) {
 
-                console.log('Summary:' + data.length)
-                groupData.devices = processDevices(devices, data, trips)
+                console.log('Summary:' + summaries.length)
+                groupData.devices = processDevices(from, to, devices, {summaries: summaries, trips: trips})
 
                 reportData.push(groupData)
             }
         }
     }
+
+    const withoutGroupDevices = await createActivityReportByDevice(from, to)
+    reportData.push(withoutGroupDevices)
+
     return reportData
 }
 
-async function createActivityReportByDevice(from, to){
+async function createActivityReportByDevice(from, to, userData, traccarInstance){
     const groupIds = userData.groups.map(g => g.id)
     const devicesToProcess = userData.byGroup ? userData.devices.filter(d => !groupIds.includes(d.groupId)) : userData.devices
 
@@ -89,84 +85,51 @@ async function createActivityReportByDevice(from, to){
     //Get report data from traccar
     devicesToProcess.sort((a, b) => (a.name > b.name) ? 1 : -1)
 
-    // use the km report to calculate kms
-    const kmsReport = await createKmsReport(from, to, userData, traccarInstance)
+    let summaries = []
+    let routeData = []
+    const tripsData = await traccar.getTrips(traccarInstance, from, to, devicesToProcess)
 
-    let data = []
     if(userData.groupByDay) {
+        routeData = userData.allWeek ? [] : await traccar.getRoute(traccarInstance, from, to, devicesToProcess)
+        console.log('trips:' + tripsData.length)
+
+        if (tripsData.length > 0) {
+            trips.checkTripsKms(traccarInstance, from, to, devicesToProcess, {trips: tripsData, route: routeData})
+        }
+
         const dates = getDates(from, to)
         for(const date of dates){
-            if(userData.allWeek || !userData.weekDays){
+            if(userData.allWeek || !userData.weekDays || !userData.dayHours){
                 const fromByDay = new Date(date.getFullYear(), date.getMonth(), date.getDate(), 0, 0, 0)
                 const toByDay = new Date(date.getFullYear(), date.getMonth(), date.getDate(), 23, 59, 59)
 
                 const summary = await traccar.getSummary(traccarInstance, fromByDay, toByDay, devicesToProcess)
                 summary.forEach(s => s.date = date)
-                data = data.concat(summary)
-            } else {
-                if((date.getDay() === 0 && userData.weekDays.sunday) ||
-                    (date.getDay() === 1 && userData.weekDays.monday) ||
-                    (date.getDay() === 2 && userData.weekDays.tuesday) ||
-                    (date.getDay() === 3 && userData.weekDays.wednesday)  ||
-                    (date.getDay() === 4 && userData.weekDays.thursday) ||
-                    (date.getDay() === 5 && userData.weekDays.friday) ||
-                    (date.getDay() === 6 && userData.weekDays.saturday)) {
-
-                    const fromByDay = new Date(new Date(date).toISOString().split('T')[0] + ' ' + userData.dayHours.startTime)
-                    const toByDay = new Date(new Date(date).toISOString().split('T')[0] + ' ' + userData.dayHours.endTime)
-
-                    if(fromByDay.getTime() < toByDay.getTime()) {
-                        const summary = await traccar.getSummary(traccarInstance, new Date(fromByDay.toUTCString()), new Date(toByDay.toUTCString()), devicesToProcess)
-                        summary.forEach(s => s.date = date)
-                        data = data.concat(summary)
-                    } else {
-                        const dayStart = new Date(new Date(date).toISOString().split('T')[0] + ' 00:00:00')
-                        const dayEnd = new Date(new Date(date).toISOString().split('T')[0] + ' 23:59:59')
-
-                        const summaryStart = await traccar.getSummary(traccarInstance, new Date(dayStart.toUTCString()), new Date(toByDay.toUTCString()), devicesToProcess)
-                        const summaryEnd = await traccar.getSummary(traccarInstance, new Date(fromByDay.toUTCString()), new Date(dayEnd.toUTCString()), devicesToProcess)
-
-                        const summary = []
-                        summaryStart.forEach(s => {
-                            const sEnd = summaryEnd.find(a => s.deviceId === a.deviceId)
-                            summary.push({
-                                date: date,
-                                deviceId: s.deviceId,
-                                averageSpeed: (s.averageSpeed + sEnd.averageSpeed) / 2,
-                                distance: s.distance + sEnd.distance,
-                                engineHours: s.engineHours + sEnd.engineHours,
-                                maxSpeed: s.maxSpeed > sEnd.maxSpeed ? s.maxSpeed : sEnd.maxSpeed,
-                                endOdometer: 0,
-                                startOdometer: 0
-                            })
-                        })
-                        data = data.concat(summary)
-                    }
-                }else {
-                    data = data.concat({date: date})
-                }
+                summaries = summaries.concat(summary)
             }
         }
     } else {
-        data = await traccar.getSummary(traccarInstance, from, to, devicesToProcess)
+        summaries = await traccar.getSummary(traccarInstance, from, to, devicesToProcess)
     }
 
-    console.log('Summary:' + data.length)
+    console.log('Summary:' + summaries.length)
 
     //Process report data
-    if (data.length > 0) {
-        allData.devices = processDevices(devicesToProcess, data, kmsReport)
+    if (summaries.length || tripsData.length) {
+        allData.devices = processDevices(from, to, devicesToProcess, {summaries: summaries, trips: tripsData, route: routeData})
     }
 
     return allData
 }
 
-async function createActivityReportByDriver(from, to){
+async function createActivityReportByDriver(from, to, userData, traccarInstance){
     const devices = await drivers.devicesByDriver(traccarInstance, from, to, userData.drivers, userData.devices)
 
     let tripsData = []
+    let routeData = []
     if(devices.length > 0) {
         tripsData = await traccar.getTrips(traccarInstance, from, to, devices)
+        routeData = await traccar.getRoute(traccarInstance, from, to, devices)
     }
 
     const allData = {
@@ -175,38 +138,85 @@ async function createActivityReportByDriver(from, to){
         to: to
     }
 
-    allData.drivers = processDrivers(from, to, userData.drivers, tripsData)
+    allData.drivers = processDrivers(from, to, userData.drivers, {trips: tripsData, route: routeData}, userData)
 
     return allData
 }
 
-function processDevices(devices, data, kmsReport) {
+
+function processDevices(from, to, devices, data, userData) {
     const devicesResult = []
 
     devices.forEach(d => {
-        const summary = data.filter(s => s.deviceId === d.id)
-        if (summary) {
-            summary.forEach(s => {
-                const deviceKms = kmsReport[0].devices.filter(r => r.device.id === d.id)
-                s.convertedSpentFuel = automaticReports.calculateSpentFuel(s.spentFuel, d)
-                s.distance = deviceKms.length ? (userData.groupByDay ? deviceKms[0].days.find(d => d.date.getTime() === s.date.getTime()).kms : deviceKms[0].summary.distance) : 0
-            })
-            const deviceData = {
-                device: d,
-                summary: summary,
+        const summary = []
+        if(userData.groupByDay) {
+            const route = data.route.filter(t => t.deviceId === d.id)
+            const deviceTrips = data.trips.filter(t => t.deviceId === d.id
+                && (userData.allWeek || !userData.weekDays || isInsideTimetable(t, userData) || isPartialInsideTimetable(t, userData, route)))
+
+            const dates = getDates(from, to)
+            for(const date of dates){
+                const fromByDay = new Date(date.getFullYear(), date.getMonth(), date.getDate(), 0, 0, 0)
+                const toByDay = new Date(date.getFullYear(), date.getMonth(), date.getDate(), 23, 59, 59)
+
+                const tripsByDay = deviceTrips.filter(t => (new Date(t.startTime) > fromByDay && new Date(t.endTime) < toByDay))
+                const distance = tripsByDay.reduce((a, b) => a + b.distance, 0)
+
+                if(!userData.allWeek && userData.weekDays && userData.dayHours) {
+                    summary.push({
+                        date: date,
+                        deviceId: d.id,
+                        averageSpeed: distance > 0 ? ((tripsByDay.reduce((a, b) => a + (b.averageSpeed * b.distance), 0)) / distance) : 0,
+                        distance: distance,
+                        engineHours: tripsByDay.reduce((a, b) => a + b.duration, 0),
+                        maxSpeed: tripsByDay.reduce((a, b) => {
+                            return a > b.maxSpeed ? a : b.maxSpeed
+                        }, 0),
+                        endOdometer: 0,
+                        startOdometer: 0
+                    })
+                } else {
+                    const summaryCurrentDay = data.summaries.filter(s => {
+                        console.log(s.date.getTime(), date.getTime(), s.date.getTime() === date.getTime())
+                        return  s.deviceId === d.id && s.date.getTime() === date.getTime()})
+
+                    if (summaryCurrentDay.length) {
+                        summaryCurrentDay.forEach(s => {
+                            s.distance = distance
+                            s.convertedSpentFuel = automaticReports.calculateSpentFuel(s.spentFuel, d)
+                        })
+
+                        summary.push(...summaryCurrentDay)
+                    }
+                }
+            }
+        } else {
+            summary.push(...data.summaries.filter(s => s.deviceId === d.id))
+
+            if (summary.length) {
+                summary.forEach(s => {
+                    s.distance = data.trips.filter(t => t.deviceId === d.id).reduce((a, b) => a + b.distance, 0)
+                    s.convertedSpentFuel = automaticReports.calculateSpentFuel(s.spentFuel, d)
+                })
             }
-            devicesResult.push(deviceData)
         }
+
+        const deviceData = {
+            device: d,
+            summary: summary,
+        }
+        devicesResult.push(deviceData)
     })
 
     return devicesResult
 }
 
-function processDrivers(from, to, drivers, data) {
+function processDrivers(from, to, drivers, data, userData) {
     console.log(data)
     const driversResult = []
     drivers.forEach(d => {
-        const trips = data.filter(t => t.driverUniqueId === d.uniqueId)
+        const route = data.route.filter(p => p.attributes.driverUniqueId === d.uniqueId)
+        const trips = data.trips.filter(t => t.driverUniqueId === d.uniqueId)
         if (trips.length > 0) {
             const driverData = {
                 driver: d,
@@ -219,7 +229,7 @@ function processDrivers(from, to, drivers, data) {
                     const toByDay = new Date(date.getFullYear(), date.getMonth(), date.getDate(), 23, 59, 59)
 
                     const tripsByDay = trips.filter(t => (new Date(t.startTime) > fromByDay && new Date(t.endTime) < toByDay)
-                    && (userData.allWeek || !userData.weekDays || isInsideTimetable(t, userData)))
+                    && (userData.allWeek || !userData.weekDays || isInsideTimetable(t, userData) || isPartialInsideTimetable(t, userData, route)))
 
                     driverData.summary.push({
                         date: date,
@@ -254,48 +264,20 @@ async function exportActivityReportToPDF(userData, reportData) {
         await headerFromUser(doc, translations.report.titleActivityReport, userData.user)
 
         if(userData.groupByDay && userData.byDriver) {
-            exportActivityReportToPDF_Driver_GroupByDay(doc, translations, reportData)
+            exportActivityReportToPDF_Driver_GroupByDay(doc, translations, reportData, userData)
         } else if(userData.groupByDay) {
-            exportActivityReportToPDF_Vehicle_GroupByDay(doc, translations, reportData)
+            exportActivityReportToPDF_Vehicle_GroupByDay(doc, translations, reportData, userData)
         } else if(userData.byDriver) {
-            exportActivityReportToPDF_Driver(doc, translations, reportData)
+            exportActivityReportToPDF_Driver(doc, translations, reportData, userData)
         } else {
-            exportActivityReportToPDF_Vehicle(doc, translations, reportData)
+            exportActivityReportToPDF_Vehicle(doc, translations, reportData, userData)
         }
 
         return doc
     }
 }
 
-function exportActivityReportToWord(userData, reportData) {
-    const doc = new Document({
-        sections: [{
-            properties: {},
-            children: [
-                new Paragraph({
-                    children: [
-                        new TextRun("Hello World"),
-                        new TextRun({
-                            text: "Foo Bar",
-                            bold: true,
-                        }),
-                        new TextRun({
-                            text: "\tGithub is the best",
-                            bold: true,
-                        }),
-                    ],
-                }),
-            ],
-        }],
-    })
-    Packer.toBlob(doc).then(blob => {
-        console.log(blob);
-        saveAs(blob, "example.docx");
-        console.log("Document created successfully");
-    })
-}
-
-function exportActivityReportToPDF_Driver(doc, translations, reportData) {
+function exportActivityReportToPDF_Driver(doc, translations, reportData, userData) {
     const headers = [translations.report.driver,
         translations.report.distance,
         translations.report.speed + ' ' + translations.report.avgSpeed + ' (Km/h)',
@@ -327,7 +309,7 @@ function exportActivityReportToPDF_Driver(doc, translations, reportData) {
     addTable(doc, headers, data, footValues, style, 35)
 }
 
-function exportActivityReportToPDF_Vehicle(doc, translations, reportData) {
+function exportActivityReportToPDF_Vehicle(doc, translations, reportData, userData) {
     const headers = [translations.report.vehicle,
         translations.report.group,
         translations.report.distance,
@@ -372,7 +354,7 @@ function exportActivityReportToPDF_Vehicle(doc, translations, reportData) {
     addTable(doc, headers, data, footValues, style, 35)
 }
 
-function exportActivityReportToPDF_Vehicle_GroupByDay(doc, translations, reportData) {
+function exportActivityReportToPDF_Vehicle_GroupByDay(doc, translations, reportData, userData) {
     const headers = [translations.report.date,
         translations.report.distance,
         translations.report.start + ' ' + translations.report.odometer,
@@ -438,17 +420,17 @@ function exportActivityReportToPDF_Vehicle_GroupByDay(doc, translations, reportD
         const footValues = ['Total:' + d.summary.length,
             (d.summary.reduce((a, b) => a + b.distance, 0) / 1000).toFixed(0),
             '', '',
-            getSumAvgSpeed(d.summary),
-            getSumMaxSpeed(d.summary),
+            getSumAvgSpeed(d.summary, userData),
+            getSumMaxSpeed(d.summary, userData),
             convertMS(d.summary.reduce((a, b) => a + b.engineHours, 0)),
-            getSumSpentFuel(d.summary)]
+            getSumSpentFuel(d.summary, userData)]
 
         const style = getStyle(getUserPartner(userData.user))
         addTable(doc, headers, data, footValues, style, 40)
     })
 }
 
-function exportActivityReportToExcel_Vehicle_GroupByDay(settings, translations, reportData) {
+function exportActivityReportToExcel_Vehicle_GroupByDay(settings, translations, reportData, userData) {
     const headers = [{label: translations.report.vehicle, value: 'name'},
         {label: translations.report.group, value: 'group'},
         {label: translations.report.date, value: 'date'},
@@ -502,7 +484,7 @@ function exportActivityReportToExcel_Vehicle_GroupByDay(settings, translations,
     }
 }
 
-function exportActivityReportToPDF_Driver_GroupByDay(doc, translations, reportData) {
+function exportActivityReportToPDF_Driver_GroupByDay(doc, translations, reportData, userData) {
     const headers = [translations.report.date,
         translations.report.distance,
         translations.report.avgSpeed + ' (Km/h)',
@@ -570,7 +552,7 @@ function exportActivityReportToPDF_Driver_GroupByDay(doc, translations, reportDa
     })
 }
 
-function exportActivityReportToExcel_Driver_GroupByDay(settings, translations, reportData) {
+function exportActivityReportToExcel_Driver_GroupByDay(settings, translations, reportData, userData) {
     const headers = [{label: translations.report.driver, value: 'name'},
         {label: translations.report.group, value: 'group'},
         {label: translations.report.date, value: 'date'},
@@ -645,7 +627,7 @@ function exportActivityReportToExcel_Driver(settings, translations, reportData)
     }
 }
 
-function exportActivityReportToExcel_Vehicle(settings, translations, reportData) {
+function exportActivityReportToExcel_Vehicle(settings, translations, reportData, userData) {
     const headers = [{label: translations.report.vehicle, value: 'name'},
         {label: translations.report.group, value: 'group'},
         {label: translations.report.distance, value: 'distance'},
@@ -682,9 +664,8 @@ function exportActivityReportToExcel_Vehicle(settings, translations, reportData)
     }
 }
 
-function exportActivityReportToExcel(reportUserData, reportData) {
+function exportActivityReportToExcel(userData, reportData) {
     console.log('Export to Excel')
-    userData = reportUserData
     const lang = userData.user.attributes.lang
     const translations = messages[lang] ? messages[lang] : messages['en-GB']
 
@@ -694,17 +675,17 @@ function exportActivityReportToExcel(reportUserData, reportData) {
     }
 
     if(userData.groupByDay && userData.byDriver){
-        return exportActivityReportToExcel_Driver_GroupByDay(settings, translations, reportData)
+        return exportActivityReportToExcel_Driver_GroupByDay(settings, translations, reportData, userData)
     } else if(userData.groupByDay){
-        return exportActivityReportToExcel_Vehicle_GroupByDay(settings, translations, reportData)
+        return exportActivityReportToExcel_Vehicle_GroupByDay(settings, translations, reportData, userData)
     } else if(userData.byDriver){
-        return exportActivityReportToExcel_Driver(settings, translations, reportData)
+        return exportActivityReportToExcel_Driver(settings, translations, reportData, userData)
     } else {
-        return exportActivityReportToExcel_Vehicle(settings, translations, reportData)
+        return exportActivityReportToExcel_Vehicle(settings, translations, reportData, userData)
     }
 }
 
-function getSumAvgSpeed(data){
+function getSumAvgSpeed(data, userData){
     const values = data.map(item => {
         if(userData.groupByDay){
             return Math.round(item.averageSpeed * 1.85200)
@@ -715,7 +696,7 @@ function getSumAvgSpeed(data){
     return Math.round((values.reduce((a, b) => a + b, 0)) / values.length)
 }
 
-function getSumMaxSpeed(data){
+function getSumMaxSpeed(data, userData){
     const values = data.map(item => {
         if(userData.groupByDay){
             return item.maxSpeed
@@ -729,7 +710,7 @@ function getSumMaxSpeed(data){
     return Math.round(max * 1.85200)
 }
 
-function getSumSpentFuel(data){
+function getSumSpentFuel(data, userData){
     const values = data.map(item => {
         if(userData.groupByDay){
             return item.convertedSpentFuel >= 0 ? item.convertedSpentFuel : 0

package/src/events-report.js

@@ -9,10 +9,7 @@ const {convertToLocaleString} = require("./util/utils");
 
 const fileName = 'EventReport'
 
-let traccar
-
-async function createEventsReport(from, to, userData, traccarInstance) {
-    traccar = traccarInstance
+async function createEventsReport(from, to, userData, traccar) {
     console.log('Create EventsReport')
     const reportData = []
 
@@ -45,7 +42,7 @@ async function createEventsReport(from, to, userData, traccarInstance) {
 
     withoutGroupDevices.sort((a, b) => (a.name > b.name) ? 1 : -1)
 
-    const data = await getReportData(from, to, withoutGroupDevices, userData.eventTypes)
+    const data = await getReportData(from, to, withoutGroupDevices, userData.eventTypes, traccar)
 
     if(data.length > 0) {
         reportData.push({
@@ -57,7 +54,7 @@ async function createEventsReport(from, to, userData, traccarInstance) {
     return reportData
 }
 
-async function getReportData(from, to, devices, types) {
+async function getReportData(from, to, devices, types, traccar) {
     let data = []
     const arrayOfArrays = automaticReports.sliceArray(devices)
     const traccarTypes = new Set(types.map(t => t.startsWith('alarm') ? 'alarm' : t))

package/src/fuelconsumption-report.js

@@ -1,10 +1,7 @@
 const automaticReports = require("./automaticReports");
 const refuelingReport = require("./refueling-report");
 
-let traccar
-
-async function createFuelConsumptionReport(from, to, userData, traccarInstance) {
-    traccar = traccarInstance
+async function createFuelConsumptionReport(from, to, userData, traccar) {
     console.log('Create FuelConsumption Report')
 
     const reportData = []
@@ -60,12 +57,10 @@ async function createFuelConsumptionReport(from, to, userData, traccarInstance)
                 const dayTrips = groupedTrips.get(key)
                 const dayRefueling = groupedRefuelings.get(key)
                 const distance = dayTrips.reduce((a, b) => a + b.distance, 0)
-                let spentFuel = 0
-                if(d.attributes.xpert) {
-                    spentFuel = automaticReports.calculateXpertSpentFuel(key, positions)
-                } else {
-                    spentFuel = automaticReports.calculateSpentFuel(dayTrips.reduce((a, b) => a + b.spentFuel, 0), d)
-                }
+                let spentFuel = d.attributes.xpert ?
+                    automaticReports.calculateXpertSpentFuel(key, positions)
+                    :
+                    automaticReports.calculateSpentFuel(dayTrips.reduce((a, b) => a + b.spentFuel, 0), d)
 
                 const day = {
                     date: key,

package/src/idle-report.js

@@ -6,32 +6,26 @@ const {convertToLocaleString, convertMS} = require("./util/utils");
 const {getStyle} = require("./reportStyle");
 const {getUserPartner} = require("fleetmap-partners");
 
-
-let traccarInstance
-let userData
-
 const fileName = 'IdleReport'
 
-async function createIdleReport(from, to, reportUserData, traccar) {
+async function createIdleReport(from, to, userData, traccarInstance) {
     console.log('Create IdleReport')
-    userData = reportUserData
-    traccarInstance = traccar
     const reportData = []
 
     if (userData.byGroup) {
         console.log("ByGroup")
-        const allData = await createTripReportByGroup(from, to)
+        const allData = await createTripReportByGroup(from, to, userData, traccarInstance)
         reportData.push(...allData)
     } else {
         console.log("ByDevice")
-        const report = await createTripReportByDevice(from, to)
+        const report = await createTripReportByDevice(from, to, userData, traccarInstance)
         reportData.push(report)
     }
 
     return reportData
 }
 
-async function createTripReportByGroup(from, to) {
+async function createTripReportByGroup(from, to, userData, traccarInstance) {
     const reportData = []
     for (const g of userData.groups) {
         const devices = userData.devices.filter(d => d.groupId === g.id)
@@ -61,14 +55,13 @@ async function createTripReportByGroup(from, to) {
     const groupIds = userData.groups.map(g => g.id)
     const withoutGroupDevices = userData.devices.filter(d => !groupIds.includes(d.groupId))
 
-    const allData = await createTripReportByDevice(from, to, withoutGroupDevices)
+    const allData = await createTripReportByDevice(from, to, withoutGroupDevices, userData, traccarInstance)
     reportData.push(allData)
 
     return reportData
 }
 
-async function createTripReportByDevice(from, to) {
-    const devices = userData.devices
+async function createTripReportByDevice(from, to, devices, userData, traccarInstance) {
     const allData = {
         devices: [],
         from: from,

package/src/index.js

@@ -109,9 +109,7 @@ function Reports(config, axios) {
         return require('./kms-report').exportKmsReportToPDF(userData, reportData)
     }
 
-    this.kmsReportToWord = (userData, reportData) => {
-        return require('./kms-report').exportKmsReportToWord(userData, reportData)
-    }
+    this.reportToWord = require('./word').reportToWord
 
     this.kmsReportToExcel = (userData, reportData) => {
         return require('./kms-report').exportKmsReportToExcel(userData, reportData)

package/src/kms-report.js

@@ -11,37 +11,32 @@ const drivers = require("./util/driver")
 const { isInsideTimetable, isPartialInsideTimetable} = require("./util/trips")
 const word = require("./word");
 
-let traccarInstance
-let userData
-
 const fileName = 'KmsReport'
 
-async function createKmsReport(from, to, reportUserData, traccar) {
+async function createKmsReport(from, to, userData, traccarInstance) {
     console.log('Create KmsReport')
 
     console.log(from, to)
-    traccarInstance = traccar
-    userData = reportUserData
     const reportData = []
     if(userData.byDriver){
         console.log("ByDriver")
-        const allData = await createKmsReportByDriver(from, to)
+        const allData = await createKmsReportByDriver(from, to, userData, traccarInstance)
         reportData.push(allData)
     }
     else if(userData.byGroup){
         console.log("ByGroup")
-        const allData = await createKmsReportByGroup(from, to)
+        const allData = await createKmsReportByGroup(from, to, userData, traccarInstance)
         reportData.push(...allData)
     } else {
         console.log("ByDevice")
-        const allData = await createKmsReportByDevice(from, to)
+        const allData = await createKmsReportByDevice(from, to, userData, traccarInstance)
         reportData.push(allData)
     }
 
     return reportData
 }
 
-async function createKmsReportByDevice(from, to) {
+async function createKmsReportByDevice(from, to, userData, traccarInstance) {
     const groupIds = userData.groups.map(g => g.id)
     const devicesToProcess = userData.byGroup ? userData.devices.filter(d => !groupIds.includes(d.groupId)) : userData.devices
 
@@ -59,13 +54,13 @@ async function createKmsReportByDevice(from, to) {
 
     if (tripsData.length > 0) {
         trips.checkTripsKms(traccarInstance, from, to, devicesToProcess, {trips: tripsData, route: route})
-        allData.devices = processDevices(from, to, devicesToProcess, {trips: tripsData, route: route})
+        allData.devices = processDevices(from, to, devicesToProcess, {trips: tripsData, route: route}, userData)
     }
 
     return allData
 }
 
-async function createKmsReportByDriver(from, to) {
+async function createKmsReportByDriver(from, to, userData, traccarInstance) {
     const devices = await drivers.devicesByDriver(traccarInstance, from, to, userData.drivers, userData.devices)
     console.log(devices.length)
 
@@ -77,10 +72,10 @@ async function createKmsReportByDriver(from, to) {
     const tripsData = await traccar.getTrips(traccarInstance, from, to, devices)
     const routeData = await traccar.getTrips(traccarInstance, from, to, devices)
 
-    return { drivers: processDrivers(from, to, userData.drivers, {trips: tripsData, route: routeData}) }
+    return { drivers: processDrivers(from, to, userData, {trips: tripsData, route: routeData}) }
 }
 
-async function createKmsReportByGroup(from, to) {
+async function createKmsReportByGroup(from, to, userData, traccarInstance) {
     const reportData = []
     for (const g of userData.groups) {
         const devices = userData.devices.filter(d => d.groupId === g.id)
@@ -101,7 +96,7 @@ async function createKmsReportByGroup(from, to) {
 
             if (tripsData.length > 0) {
                 trips.checkTripsKms(traccarInstance, from, to, devices, {trips: tripsData, route: route})
-                groupData.devices = processDevices(from, to, devices, {trips: tripsData, route: route})
+                groupData.devices = processDevices(from, to, devices, {trips: tripsData, route: route}, userData)
             }
 
             reportData.push(groupData)
@@ -114,10 +109,10 @@ async function createKmsReportByGroup(from, to) {
     return reportData
 }
 
-function processDrivers(from, to, drivers, data) {
+function processDrivers(from, to, userData, data) {
     console.log(data)
     const driversResult = []
-    drivers.forEach(d => {
+    userData.drivers.forEach(d => {
         const route = data.route.filter(p => p.attributes.driverUniqueId === d.uniqueId)
         const trips = data.trips.filter(t => t.driverUniqueId === d.uniqueId
             && (userData.allWeek || !userData.weekDays || isInsideTimetable(t, userData) || isPartialInsideTimetable(t, userData, route)))
@@ -133,8 +128,7 @@ function processDrivers(from, to, drivers, data) {
                     const fromByDay = new Date(date.getFullYear(), date.getMonth(), date.getDate(), 0, 0, 0)
                     const toByDay = new Date(date.getFullYear(), date.getMonth(), date.getDate(), 23, 59, 59)
 
-                    const tripsByDay = trips.filter(t => (new Date(t.startTime) > fromByDay && new Date(t.endTime) < toByDay)
-                        && (userData.allWeek || !userData.weekDays || isInsideTimetable(t, userData)))
+                    const tripsByDay = trips.filter(t => (new Date(t.startTime) > fromByDay && new Date(t.endTime) < toByDay))
 
                     driverData.days.push({
                         date: date,
@@ -153,7 +147,7 @@ function processDrivers(from, to, drivers, data) {
     return driversResult
 }
 
-function processDevices(from, to, devices, data) {
+function processDevices(from, to, devices, data, userData) {
     const devicesResult = []
 
     for (const d of devices) {

package/src/speeding-report.js

@@ -10,38 +10,33 @@ const drivers = require("./util/driver")
 const {distance, point} = require('turf')
 const here = require('./here')
 const {getUserPartner} = require("fleetmap-partners");
-const traccar = require("./util/traccar");
-
-let traccarInstance
-let userData
+const traccarHelper = require("./util/traccar");
 
 const fileName = 'SpeedingReport'
 const eventTypes = ['deviceOverspeed']
 
-async function createSpeedingReport(from, to, reportUserData, traccar) {
-  traccarInstance = traccar
-  userData = reportUserData
+async function createSpeedingReport(from, to, userData, traccarInstance) {
   const reportData = []
 
   if (userData.byDriver) {
     console.log("ByDriver")
-    const allData = await createSpeedingReportByDriver(from, to)
+    const allData = await createSpeedingReportByDriver(from, to, userData, traccarInstance)
     reportData.push(allData)
   }
   else if (userData.byGroup) {
     console.log("ByGroup")
-    const allData = await createSpeedingReportByGroup(from, to)
+    const allData = await createSpeedingReportByGroup(from, to, userData, traccarInstance)
     reportData.push(...allData)
   } else {
     console.log("createSpeedingReportByDevice")
-    const allData = await createSpeedingReportByDevice(from, to, userData.devices)
+    const allData = await createSpeedingReportByDevice(from, to, userData.devices, userData, traccarInstance)
     reportData.push(allData)
   }
 
   return reportData
 }
 
-async function createSpeedingReportByGroup(from, to){
+async function createSpeedingReportByGroup(from, to, userData, traccarInstance){
   const reportData = []
   for (const g of userData.groups) {
     const devices = userData.devices.filter(d => d.groupId === g.id)
@@ -53,8 +48,8 @@ async function createSpeedingReportByGroup(from, to){
         xpert: devices.filter(d => d.attributes.xpert).length > 0
       }
 
-      const events = await traccar.getEvents(traccarInstance, from, to, devices, eventTypes)
-      const routes = await traccar.getRoute(traccarInstance, from, to, devices)
+      const events = await traccarHelper.getEvents(traccarInstance, from, to, devices, eventTypes)
+      const routes = await traccarHelper.getRoute(traccarInstance, from, to, devices)
 
       devices.sort((a, b) => (a.name > b.name) ? 1 : -1)
 
@@ -74,15 +69,15 @@ async function createSpeedingReportByGroup(from, to){
   return reportData
 }
 
-async function createSpeedingReportByDevice(from, to, devices) {
+async function createSpeedingReportByDevice(from, to, devices, userData, traccarInstance) {
   devices.sort((a, b) => (a.name > b.name) ? 1 : -1)
 
-  const routes = await traccar.getRoute(traccarInstance, from, to, devices)
+  const routes = await traccarHelper.getRoute(traccarInstance, from, to, devices)
   const events = []
   if(!userData.useVehicleSpeedLimit && userData.customSpeed){
     events.push(...await getCustomSpeedLimitEvents(devices, routes))
   } else {
-    events.push(...await traccar.getEvents(traccarInstance, from, to, devices, eventTypes))
+    events.push(...await traccarHelper.getEvents(traccarInstance, from, to, devices, eventTypes))
   }
 
   if(userData.roadSpeedLimits){
@@ -109,12 +104,12 @@ async function createSpeedingReportByDriver(from, to) {
     return { drivers: [] }
   }
 
-  const routes = await traccar.getRoute(traccarInstance, from, to, devices)
+  const routes = await traccarHelper.getRoute(traccarInstance, from, to, devices)
   const events = []
   if(!userData.useVehicleSpeedLimit && userData.customSpeed){
     events.push(...await getCustomSpeedLimitEvents(devices, routes))
   } else {
-    events.push(...await traccar.getEvents(traccarInstance, from, to, devices, eventTypes))
+    events.push(...await traccarHelper.getEvents(traccarInstance, from, to, devices, eventTypes))
   }
 
   if(userData.roadSpeedLimits){

package/src/trip-report.js

@@ -10,39 +10,32 @@ const {getStyle} = require("./reportStyle")
 const traccar = require("./util/traccar")
 const trips = require("./util/trips");
 const {isInsideTimetable, addNearestPOIs, isPartialInsideTimetable} = require("./util/trips")
-const word = require('./word')
-
-
-let traccarInstance
-let userData
 
 const fileName = 'TripReport'
 
-async function createTripReport(from, to, reportUserData, traccar) {
+async function createTripReport(from, to, userData, traccarInstance) {
     console.log('Create TripReport')
-    userData = reportUserData
-    traccarInstance = traccar
     const reportData = []
 
     if (userData.byDriver) {
         console.log("ByDriver")
-        const report = await createTripReportByDriver(from, to)
+        const report = await createTripReportByDriver(from, to, userData, traccarInstance)
         reportData.push(report)
     }
     else if (userData.byGroup) {
         console.log("ByGroup")
-        const allData = await createTripReportByGroup(from, to)
+        const allData = await createTripReportByGroup(from, to, userData, traccarInstance)
         reportData.push(...allData)
     } else {
         console.log("ByDevice")
-        const report = await createTripReportByDevice(from, to)
+        const report = await createTripReportByDevice(from, to, userDatauserData, traccarInstance)
         reportData.push(report)
     }
 
     return reportData
 }
 
-async function createTripReportByDevice(from, to) {
+async function createTripReportByDevice(from, to, userData, traccarInstance) {
     const devices = userData.devices
     const allData = {
         devices: [],
@@ -60,13 +53,13 @@ async function createTripReportByDevice(from, to) {
 
     if (tripsData.length > 0) {
         trips.checkTripsKms(traccarInstance, from, to, devices, {trips: tripsData, route: routeData})
-        allData.devices = processDevices(from, to, devices, {trips: tripsData, stops: stopsData, route: routeData})
+        allData.devices = processDevices(from, to, devices, {trips: tripsData, stops: stopsData, route: routeData}, userData)
     }
 
     return allData
 }
 
-async function createTripReportByGroup(from, to) {
+async function createTripReportByGroup(from, to, userData, traccarInstance) {
     const reportData = []
     for (const g of userData.groups) {
         const devices = userData.devices.filter(d => d.groupId === g.id)
@@ -91,7 +84,7 @@ async function createTripReportByGroup(from, to) {
 
             if (tripsData.length > 0) {
                 console.log('Trips:' + tripsData.length)
-                groupData.devices = processDevices(from, to, devices, {trips: tripsData, stops: stopsData, route: routeData})
+                groupData.devices = processDevices(from, to, devices, {trips: tripsData, stops: stopsData, route: routeData}, userData)
 
                 reportData.push(groupData)
             }
@@ -101,13 +94,13 @@ async function createTripReportByGroup(from, to) {
     const groupIds = userData.groups.map(g => g.id)
     const withoutGroupDevices = userData.devices.filter(d => !groupIds.includes(d.groupId))
 
-    const allData = await createTripReportByDevice(from, to, withoutGroupDevices)
+    const allData = await createTripReportByDevice(from, to, withoutGroupDevices, userData)
     reportData.push(allData)
 
     return reportData
 }
 
-async function createTripReportByDriver(from, to){
+async function createTripReportByDriver(from, to, userData, traccarInstance){
     const devices = await drivers.devicesByDriver(traccarInstance, from, to, userData.drivers, userData.devices)
     console.log(devices.length)
 
@@ -119,10 +112,10 @@ async function createTripReportByDriver(from, to){
     const tripsData = await traccar.getTrips(traccarInstance, from, to, devices)
     const routeData = await traccar.getRoute(traccarInstance, from, to, devices)
 
-    return { drivers: processDrivers(from, to, userData.drivers, {trips: tripsData, route: routeData})}
+    return { drivers: processDrivers(from, to, userData, {trips: tripsData, route: routeData})}
 }
 
-function processDevices(from, to, devices, data) {
+function processDevices(from, to, devices, data, userData) {
     const devicesResult = []
 
     devices.forEach(d => {
@@ -176,10 +169,10 @@ function processDevices(from, to, devices, data) {
     return devicesResult
 }
 
-function processDrivers(from, to, drivers, data) {
+function processDrivers(from, to, userData, data) {
     console.log(data)
     const driversResult = []
-    drivers.forEach(d => {
+    userData.drivers.forEach(d => {
         const route = data.route.filter(p => p.attributes.driverUniqueId === d.uniqueId)
         const trips = data.trips.filter(t => t.driverUniqueId === d.uniqueId
             && (userData.allWeek || !userData.weekDays || isInsideTimetable(t, userData) || isPartialInsideTimetable(t, userData, route)))

package/src/util/utils.js

@@ -1,5 +1,12 @@
 const axios = require('axios')
 const turf = require('turf')
+const {getUserPartner} = require("fleetmap-partners")
+const messages = require("../../lang")
+
+exports.getTranslations = (userData) => {
+    const lang = userData.user.attributes.lang || (navigator && navigator.language)
+    return messages[lang] ? messages[lang] : messages['en-GB']
+}
 
 function convertMS(duration, withSeconds) {
 
@@ -31,7 +38,7 @@ function coordsDistance(lon1, lat1, lon2, lat2) {
 
 function getDates(startDate, endDate) {
     const dates = []
-    let currentDate = new Date(startDate.toISOString().split('T')[0] + ' 12:00 PM')
+    let currentDate = new Date(startDate.toISOString().split('T')[0] + ' 12:00:00.000 PM')
     const addDays = function (days) {
         const date = new Date(this.valueOf())
         date.setDate(date.getDate() + days)
@@ -44,19 +51,33 @@ function getDates(startDate, endDate) {
     return dates
 }
 
+function getImage(url) {
+    return axios.get(url, {responseType: 'arraybuffer'}).then(d => d.data)
+}
+
+async function getImageBase64(url) {
+    const response = await getImage(url);
+    return Buffer.from(response, 'binary').toString('base64')
+}
+
+function getLogoUrl(hostname) {
+    const path = `/img/logos/${hostname}.png`
+    return window ? path : `https://${hostname}${path}`
+}
+
 async function getImgFromUrl(hostname) {
+    const url = getLogoUrl(hostname)
     try {
         const img = new Image()
-        img.src = '/img/logos/' + hostname + '.png'
+        img.src = url
         return img
     } catch (e) {
-        const response = await axios.get('https://' + hostname + '/img/logos/' + hostname + '.png', { responseType: 'arraybuffer' })
-        return Buffer.from(response.data, 'binary').toString('base64')
+        return await getImageBase64(url);
     }
 }
 
 function isClientSide() { return (typeof window !== "undefined") }
-exports.isClientSide = isClientSide
+
 
 function convertToLocaleString(value, lang, timezone){
     if(isClientSide()){
@@ -98,4 +119,8 @@ exports.getDates = getDates
 exports.convertToLocaleString = convertToLocaleString
 exports.convertToLocaleDateString = convertToLocaleDateString
 exports.convertToLocaleTimeString = convertToLocaleTimeString
-
+exports.isClientSide = isClientSide
+exports.getLogo = (user) => {
+    const host = window ? window.location.hostname : getUserPartner(user).host
+    return getImage(getLogoUrl(host))
+}

package/src/word/index.js

@@ -1,33 +1,81 @@
-const {Document, Paragraph, Packer, TableRow, TableCell, Table} = require("docx")
+const {Document, Paragraph, Packer, TableRow, TableCell, Table, WidthType, ImageRun, Header, TextRun, HeadingLevel,
+    AlignmentType
+} = require("docx")
 const { saveAs } = require('file-saver')
-const kmsReport = require('../kms-report')
 const utils = require('../util/utils')
+const {getPartnerData} = require("fleetmap-partners");
+const colWidth = 3505
 
-exports.exportKmsReportToWord = (userData, reportData) => {
-    const excel = kmsReport.exportKmsReportToExcel(userData, reportData)
+function formatCellValue(value) {
+    return value.toLocaleDateString ? value.toLocaleDateString() : value + ''
+}
+
+exports.reportToWord = async (userData, dateRange, excel, title) => {
     console.log('excel', excel)
+    const partnerData = getPartnerData(userData.user)
+
     if (!excel.data.length && utils.isClientSide()) {
         alert('Não há dados')
         return
     }
+    const logo = await utils.getLogo(userData.user)
+    console.log('logo', logo)
     const table = new Table({
-        rows: excel.data.map(r => new TableRow({
-            children: r.map(c =>
-                new TableCell({
-                    children: [new Paragraph(c)]
-                }))
-        }))
+        columnWidths: excel.headers.map(() => colWidth),
+        rows: [
+            new TableRow({
+                children: excel.headers.map(r => new TableCell({
+                    children: [new Paragraph(r.label)],
+                    width: {
+                        size: colWidth,
+                        type: WidthType.DXA,
+                    }
+                }))}),
+            ...excel.data.filter(r=>Object.keys(r).length).map(r => new TableRow({
+                children: Object.keys(r).map(k =>
+                    new TableCell({
+                        children: [new Paragraph(formatCellValue(r[k]))],
+                        width: {
+                            size: colWidth,
+                            type: WidthType.DXA,
+                        }
+                    }))})),
+        ]
     })
-
     const doc = new Document({
         sections: [{
+            headers: {
+                default: new Header({
+                    children: [
+                        new Paragraph({
+                            children: [
+                                new ImageRun({
+                                    data: logo,
+                                    transformation: {
+                                        width: (partnerData.reports && partnerData.reports.logoWidth*2) || 200,
+                                        height: (partnerData.reports && partnerData.reports.logoHeight*2) || 50
+                                    }
+                                })
+                            ]
+                        })
+                    ]
+                })
+            },
             properties: {},
             children: [
+                new Paragraph({
+                    children: [new TextRun(title)],
+                    heading: HeadingLevel.HEADING_1,
+                    alignment: AlignmentType.CENTER,
+                }),
+                new Paragraph({}),
+                new Paragraph(new Date(dateRange[0]).toLocaleString() + ' - ' + new Date(dateRange[1]).toLocaleString()),
+                new Paragraph({}),
                 table
             ],
         }],
     })
     Packer.toBlob(doc).then(blob => {
-        saveAs(blob, "trip.docx");
+        saveAs(blob, "report.docx");
     })
 }

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">
-    <includedPredefinedLibrary name="Node.js Core" />
-  </component>
-</project>