fleetmap-reports 1.0.259 → 1.0.263

package/.idea/workspace.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="eb665c86-c893-4333-bd2a-721dc27980b9" name="Changes" comment="Fix reports by driver">
+    <list default="true" id="eb665c86-c893-4333-bd2a-721dc27980b9" name="Changes" comment="fix activity report by driver">
       <change beforePath="$PROJECT_DIR$/package-lock.json" beforeDir="false" afterPath="$PROJECT_DIR$/package-lock.json" afterDir="false" />
       <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.test.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/index.test.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/location-report.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/location-report.js" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -215,7 +215,11 @@
       <workItem from="1639954341221" duration="11986000" />
       <workItem from="1640272520380" duration="2253000" />
       <workItem from="1640789226071" duration="1935000" />
-      <workItem from="1640794844118" duration="226000" />
+      <workItem from="1640794844118" duration="10128000" />
+      <workItem from="1640866364417" duration="67000" />
+      <workItem from="1640866782794" duration="123000" />
+      <workItem from="1640866964393" duration="1022000" />
+      <workItem from="1640870147277" duration="6811000" />
     </task>
     <task id="LOCAL-00001" summary="Fix getStyle">
       <created>1636983717385</created>
@@ -329,7 +333,35 @@
       <option name="project" value="LOCAL" />
       <updated>1640274171902</updated>
     </task>
-    <option name="localTasksCounter" value="17" />
+    <task id="LOCAL-00017" summary="location report - check if it's running on client side">
+      <created>1640795243287</created>
+      <option name="number" value="00017" />
+      <option name="presentableId" value="LOCAL-00017" />
+      <option name="project" value="LOCAL" />
+      <updated>1640795243288</updated>
+    </task>
+    <task id="LOCAL-00018" summary="timezone - check if it's running on client side">
+      <created>1640825795052</created>
+      <option name="number" value="00018" />
+      <option name="presentableId" value="LOCAL-00018" />
+      <option name="project" value="LOCAL" />
+      <updated>1640825795053</updated>
+    </task>
+    <task id="LOCAL-00019" summary="calculate avg speed">
+      <created>1640867522437</created>
+      <option name="number" value="00019" />
+      <option name="presentableId" value="LOCAL-00019" />
+      <option name="project" value="LOCAL" />
+      <updated>1640867522438</updated>
+    </task>
+    <task id="LOCAL-00020" summary="fix activity report by driver">
+      <created>1640872780966</created>
+      <option name="number" value="00020" />
+      <option name="presentableId" value="LOCAL-00020" />
+      <option name="project" value="LOCAL" />
+      <updated>1640872780968</updated>
+    </task>
+    <option name="localTasksCounter" value="21" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -363,6 +395,10 @@
     <MESSAGE value="Trip and activity report with time period" />
     <MESSAGE value="Fix trips distance because imported positions generate trips with 0 kms" />
     <MESSAGE value="Fix reports by driver" />
-    <option name="LAST_COMMIT_MESSAGE" value="Fix reports by driver" />
+    <MESSAGE value="location report - check if it's running on client side" />
+    <MESSAGE value="timezone - check if it's running on client side" />
+    <MESSAGE value="calculate avg speed" />
+    <MESSAGE value="fix activity report by driver" />
+    <option name="LAST_COMMIT_MESSAGE" value="fix activity report by driver" />
   </component>
 </project>

package/package.json

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

package/src/activity-report.js

@@ -140,8 +140,7 @@ async function createActivityReportByDriver(from, to){
     console.log(deviceIds)
     let tripsData = []
     if(deviceIds.length > 0) {
-        const response = await traccar.getTrips(traccarInstance, from, to, deviceIds)
-        tripsData = response.data
+        tripsData = await traccar.getTrips(traccarInstance, from, to, deviceIds)
     }
 
     const allData = {
@@ -150,7 +149,7 @@ async function createActivityReportByDriver(from, to){
         to: to
     }
 
-    allData.drivers = processDrivers(userData.drivers, tripsData)
+    allData.drivers = processDrivers(from, to, userData.drivers, tripsData)
 
     return allData
 }
@@ -181,7 +180,7 @@ function processDevices(devices, data, kmsReport) {
     return devicesResult
 }
 
-function processDrivers(drivers, data) {
+function processDrivers(from, to, drivers, data) {
     console.log(data)
     const driversResult = []
     drivers.forEach(d => {
@@ -189,12 +188,63 @@ function processDrivers(drivers, data) {
         if (trips.length > 0) {
             const driverData = {
                 driver: d,
-                summary: {
+                summary: [],
+            }
+            if(userData.groupByDay) {
+                const dates = getDates(from, to)
+                for(const date of dates){
+                    if(userData.allWeek){
+                        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)
+
+                        driverData.summary.push({
+                            date: date,
+                            distance: tripsByDay.filter(t => t.distance > 0).reduce((a, b) => a + b.distance, 0),
+                            engineHours: tripsByDay.reduce((a, b) => a + b.duration, 0),
+                            maxSpeed: tripsByDay.reduce((a, b) => Math.max(a, b.maxSpeed), 0),
+                            averageSpeed: tripsByDay.length > 0 ? Math.round(tripsByDay.reduce((a, b) => a + b.averageSpeed, 0) / tripsByDay.length) : 0,
+                        })
+                    } 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)
+
+                            const tripsByDay = trips.filter(t => new Date(t.startTime) > fromByDay && new Date(t.endTime) < toByDay)
+
+                            driverData.summary.push({
+                                date: date,
+                                distance: tripsByDay.filter(t => t.distance > 0).reduce((a, b) => a + b.distance, 0),
+                                engineHours: tripsByDay.reduce((a, b) => a + b.duration, 0),
+                                maxSpeed: tripsByDay.reduce((a, b) => Math.max(a, b.maxSpeed), 0),
+                                averageSpeed: tripsByDay.length > 0 ? Math.round(tripsByDay.reduce((a, b) => a + b.averageSpeed, 0) / tripsByDay.length) : 0,
+                            })
+                        }else {
+                            driverData.summary.push({
+                                date: date,
+                                distance: 0,
+                                engineHours: 0,
+                                maxSpeed: 0,
+                                averageSpeed: 0,
+                            })
+                        }
+                    }
+                }
+            } else {
+                driverData.summary.push({
                     distance: trips.filter(t => t.distance > 0).reduce((a, b) => a + b.distance, 0),
                     engineHours: trips.reduce((a, b) => a + b.duration, 0),
                     maxSpeed: trips.reduce((a, b) => Math.max(a, b.maxSpeed), 0),
                     averageSpeed: Math.round(trips.reduce((a, b) => a + b.averageSpeed, 0) / trips.length),
-                },
+                })
             }
             driversResult.push(driverData)
         }
@@ -212,9 +262,11 @@ async function exportActivityReportToPDF(userData, reportData) {
         const doc = new jsPDF.jsPDF('l')
         await headerFromUser(doc, translations.report.titleActivityReport, userData.user)
 
-        if(userData.groupByDay){
+        if(userData.groupByDay && userData.byDriver) {
+            exportActivityReportToPDF_Driver_GroupByDay(doc, translations, reportData)
+        } else if(userData.groupByDay) {
             exportActivityReportToPDF_Vehicle_GroupByDay(doc, translations, reportData)
-        } else if(userData.byDriver){
+        } else if(userData.byDriver) {
             exportActivityReportToPDF_Driver(doc, translations, reportData)
         } else {
             exportActivityReportToPDF_Vehicle(doc, translations, reportData)
@@ -257,7 +309,7 @@ function exportActivityReportToPDF_Driver(doc, translations, reportData) {
 }
 
 function exportActivityReportToPDF_Vehicle(doc, translations, reportData) {
-    const headers = [translations.report.name,
+    const headers = [translations.report.vehicle,
         translations.report.group,
         translations.report.distance,
         translations.report.start + ' ' + translations.report.odometer,
@@ -275,7 +327,7 @@ function exportActivityReportToPDF_Vehicle(doc, translations, reportData) {
         const group = userData.groups.find(g => d.device.groupId === g.id)
 
         const temp = [
-            d.summary.deviceName,
+            d.summary[0].deviceName,
             group ? group.name : '',
             Number((d.summary[0].distance / 1000).toFixed(2)),
             Number((d.summary[0].startOdometer / 1000).toFixed(2)),
@@ -431,6 +483,122 @@ function exportActivityReportToExcel_Vehicle_GroupByDay(settings, translations,
     }
 }
 
+function exportActivityReportToPDF_Driver_GroupByDay(doc, translations, reportData) {
+    const headers = [translations.report.date,
+        translations.report.distance,
+        translations.report.avgSpeed + ' (Km/h)',
+        translations.report.maxSpeed + ' (Km/h)',
+        translations.report.engineHours]
+
+    const weekDays = [
+        translations.report.sunday,
+        translations.report.monday,
+        translations.report.tuesday,
+        translations.report.wednesday,
+        translations.report.thursday,
+        translations.report.friday,
+        translations.report.saturday
+    ]
+
+    reportData.drivers.forEach(function (d, index) {
+        const name = d.driver.name
+        const group = userData.groups.find(g => g.drivers.includes(d.id))
+
+        let space = index === 0 ? 8 : 0
+        if(index){
+            doc.addPage()
+        }
+
+        doc.setFontSize(13)
+        doc.text(name, 20, space + 20)
+        doc.setFontSize(11)
+        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)
+
+        if (!userData.allWeek) {
+            doc.text((userData.weekDays.monday ? ' ' + translations.report.monday + ',' : '')
+                + (userData.weekDays.tuesday ? ' ' + translations.report.tuesday + ',' : '')
+                + (userData.weekDays.wednesday ? ' ' + translations.report.wednesday + ',' : '')
+                + (userData.weekDays.thursday ? ' ' + translations.report.thursday + ',' : '')
+                + (userData.weekDays.friday ? ' ' + translations.report.friday + ',' : '')
+                + (userData.weekDays.saturday ? ' ' + translations.report.saturday + ',' : '')
+                + (userData.weekDays.sunday ? ' ' + translations.report.sunday + ',' : '')
+                + ' das '
+                + userData.dayHours.startTime + ' - ' + userData.dayHours.endTime, 20, space + 30)
+        }
+
+        const data = []
+        d.summary.forEach(s => {
+            const temp = [
+                new Date(s.date).toLocaleDateString() + ' - ' + weekDays[s.date.getDay()],
+                Number((s.distance / 1000).toFixed(2)),
+                Math.round(s.averageSpeed * 1.85200),
+                Math.round(s.maxSpeed * 1.85200),
+                convertMS(s.engineHours)
+            ]
+
+            data.push(temp)
+        })
+
+        const footValues = ['Total:' + d.summary.length,
+            (d.summary.reduce((a, b) => a + b.distance, 0) / 1000).toFixed(0),
+            getSumAvgSpeed(d.summary),
+            getSumMaxSpeed(d.summary),
+            convertMS(d.summary.reduce((a, b) => a + b.engineHours, 0))]
+
+        const style = getStyle(getUserPartner(userData.user))
+        addTable(doc, headers, data, footValues, style, 40)
+    })
+}
+
+function exportActivityReportToExcel_Driver_GroupByDay(settings, translations, reportData) {
+    const headers = [{label: translations.report.driver, value: 'name'},
+        {label: translations.report.group, value: 'group'},
+        {label: translations.report.date, value: 'date'},
+        {label: translations.report.weekDay, value: 'weekday'},
+        {label: translations.report.distance, value: 'distance'},
+        {label: translations.report.speed + ' ' + translations.report.avgSpeed + ' (Km/h)', value: 'avgSpeed'},
+        {label: translations.report.speed + ' ' + translations.report.maxSpeed + ' (Km/h)', value: 'maxSpeed'},
+        {label: translations.report.engineHours, value: 'engineHours'}]
+
+    const weekDays = [
+        translations.report.sunday,
+        translations.report.monday,
+        translations.report.tuesday,
+        translations.report.wednesday,
+        translations.report.thursday,
+        translations.report.friday,
+        translations.report.saturday
+    ]
+
+    let data = []
+    if (reportData.drivers) {
+        reportData.drivers.forEach(d => {
+            const group = userData.groups.find(g => g.drivers.includes(d.id))
+
+            data = data.concat([{}])
+            data = data.concat(d.summary.map(s => {
+                return {
+                    name: d.driver.name,
+                    group: group ? group.name : '',
+                    date: new Date(s.date).toLocaleDateString(),
+                    weekday: weekDays[s.date.getDay()],
+                    distance: Number((s.distance / 1000).toFixed(0)),
+                    avgSpeed: Math.round(s.averageSpeed * 1.85200),
+                    maxSpeed: Math.round(s.maxSpeed * 1.85200),
+                    engineHours: convertMS(s.engineHours)
+                }
+            }))
+        })
+        console.log(data)
+        return {
+            headers,
+            data,
+            settings
+        }
+    }
+}
+
 function exportActivityReportToExcel_Driver(settings, translations, reportData) {
     const headers = [{label: translations.report.driver, value: 'driver'},
         {label: translations.report.distance, value: 'distance'},
@@ -443,10 +611,10 @@ function exportActivityReportToExcel_Driver(settings, translations, reportData)
         reportData.drivers.forEach(d => {
             data = data.concat([{
                 driver: d.driver.name,
-                distance: Number((d.summary.distance / 1000).toFixed(0)),
-                avgSpeed: Math.round(d.summary.averageSpeed * 1.85200),
-                maxSpeed: Math.round(d.summary.maxSpeed * 1.85200),
-                engineHours: convertMS(d.summary.engineHours)
+                distance: Number((d.summary[0].distance / 1000).toFixed(0)),
+                avgSpeed: Math.round(d.summary[0].averageSpeed * 1.85200),
+                maxSpeed: Math.round(d.summary[0].maxSpeed * 1.85200),
+                engineHours: convertMS(d.summary[0].engineHours)
             }])
         })
         console.log(data)
@@ -475,15 +643,15 @@ function exportActivityReportToExcel_Vehicle(settings, translations, reportData)
             const group = userData.groups.find(g => d.device.groupId === g.id)
 
             data = data.concat([{
-                name: d.summary.deviceName,
+                name: d.summary[0].deviceName,
                 group: group ? group.name : '',
-                distance: Number((d.summary.distance / 1000).toFixed(0)),
-                startOdometer: Number((d.summary.startOdometer / 1000).toFixed(0)),
-                endOdometer: Number((d.summary.endOdometer / 1000).toFixed(0)),
-                avgSpeed: Math.round(d.summary.averageSpeed * 1.85200),
-                maxSpeed: Math.round(d.summary.maxSpeed * 1.85200),
-                engineHours: convertMS(d.summary.engineHours),
-                spentFuel: d.summary.convertedSpentFuel >= 0 ? d.summary.convertedSpentFuel : 0,
+                distance: Number((d.summary[0].distance / 1000).toFixed(0)),
+                startOdometer: Number((d.summary[0].startOdometer / 1000).toFixed(0)),
+                endOdometer: Number((d.summary[0].endOdometer / 1000).toFixed(0)),
+                avgSpeed: Math.round(d.summary[0].averageSpeed * 1.85200),
+                maxSpeed: Math.round(d.summary[0].maxSpeed * 1.85200),
+                engineHours: convertMS(d.summary[0].engineHours),
+                spentFuel: d.summary[0].convertedSpentFuel >= 0 ? d.summary[0].convertedSpentFuel : 0,
             }])
         })
         console.log(data)
@@ -506,7 +674,9 @@ function exportActivityReportToExcel(reportUserData, reportData) {
         fileName: fileName // The name of the spreadsheet
     }
 
-    if(userData.groupByDay){
+    if(userData.groupByDay && userData.byDriver){
+        return exportActivityReportToExcel_Driver_GroupByDay(settings, translations, reportData)
+    } else if(userData.groupByDay){
         return exportActivityReportToExcel_Vehicle_GroupByDay(settings, translations, reportData)
     } else if(userData.byDriver){
         return exportActivityReportToExcel_Driver(settings, translations, reportData)

package/src/events-report.js

@@ -5,6 +5,7 @@ require('jspdf-autotable')
 const {getStyle} = require("./reportStyle");
 const {headerFromUser} = require("./util/pdfDocument");
 const {getUserPartner} = require("fleetmap-partners");
+const {convertToLocaleString} = require("./util/utils");
 
 const fileName = 'EventReport'
 
@@ -120,6 +121,7 @@ async function exportSpeedingReportToPDF(userData, reportData) {
     console.log('Export to PDF')
 
     const lang = userData.user.attributes.lang
+    const timezone = userData.user.attributes.timezone
     const translations = messages[lang] ? messages[lang] : messages['en-GB']
 
     const headers = [
@@ -149,7 +151,7 @@ async function exportSpeedingReportToPDF(userData, reportData) {
             doc.text(name, 20, space+20 )
             doc.setFontSize(11)
             doc.text(group, 200, space+20 )
-            doc.text(new Date(d.from).toLocaleString() + ' - ' + new Date(d.to).toLocaleString(), 20, space+25 )
+            doc.text(convertToLocaleString(d.from, lang, timezone) + ' - ' + convertToLocaleString(d.to, lang, timezone), 20, space+25 )
 
             doc.autoTable(['','','','',''], [
                 [translations.report.event_ignitionOn,translations.report.event_ignitionOff, translations.report.event_geofenceEnter,
@@ -270,10 +272,7 @@ function getAlertInfo(drivers, alert) {
 
 function getAlertDate(user, alert) {
     if(alert.position) {
-        return new Date(alert.position.fixTime).toLocaleString(user.attributes.lang, {
-            timeZone: user.attributes.timezone,
-            hour12: false
-        })
+        return convertToLocaleString(alert.position.fixTime, user.attributes.lang, user.attributes.timezone)
     }
 }
 

package/src/kms-report.js

@@ -26,7 +26,7 @@ async function createKmsReportByDevice(from, to) {
 
     devicesToProcess.sort((a, b) => (a.name > b.name) ? 1 : -1)
     const route = userData.allWeek ? [] : await traccar.getRoute(traccarInstance, from, to, devicesToProcess)
-    const tripsData = await traccar.getTrips(traccarInstance, from, to, devicesToProcess)
+    const tripsData = await traccar.getTrips(traccarInstance, from, to, devicesToProcess.map(d => d.id))
 
     console.log('trips:' + tripsData.length)
 

package/src/location-report.js

@@ -5,11 +5,10 @@ require('jspdf-autotable')
 const {headerFromUser} = require("./util/pdfDocument");
 const {getStyle} = require("./reportStyle")
 const {getUserPartner} = require("fleetmap-partners");
+const {convertToLocaleString} = require("./util/utils");
 
 const fileName = 'LocationReport'
 
-const clientSide = typeof window !== "undefined"
-
 async function createLocationReport(from, to, userData, traccar) {
     console.log('Create LocationReport')
 
@@ -106,6 +105,7 @@ async function exportLocationReportToPDF(userData, reportData) {
     console.log('Export to PDF')
 
     const lang = userData.user.attributes.lang
+    const timezone = userData.user.attributes.timezone
     const translations = messages[lang] ? messages[lang] : messages['en-GB']
 
     const headers = [
@@ -138,7 +138,7 @@ async function exportLocationReportToPDF(userData, reportData) {
             doc.text(name, 20, space + 20)
             doc.setFontSize(11)
             doc.text(group, 200, space + 20)
-            doc.text(new Date(d.from).toLocaleString() + ' - ' + new Date(d.to).toLocaleString(), 20, space + 25)
+            doc.text(convertToLocaleString(d.from, lang, timezone) + ' - ' + convertToLocaleString(d.to, lang, timezone), 20, space + 25)
             d.positions.map(a => {
                 const temp = [
                     getLocationDate(a, userData.user),
@@ -253,14 +253,7 @@ function deviceName(device){
 }
 
 function getLocationDate(location, user){
-    if(clientSide) {
-        return new Date(location.fixTime).toLocaleString()
-    } else {
-        return new Date(location.fixTime).toLocaleString(user.attributes.lang, {
-            timeZone: user.attributes.timezone,
-            hour12: false
-        })
-    }
+    return convertToLocaleString(location.fixTime, user.attributes.lang, user.attributes.timezone)
 }
 
 function getDriverName(location, drivers) {

package/src/speeding-report.js

@@ -1,6 +1,6 @@
 const messages = require('../lang')
 const jsPDF = require('jspdf')
-const {convertMS} = require("./util/utils")
+const {convertMS, convertToLocaleString} = require("./util/utils")
 const {headerFromUser} = require("./util/pdfDocument")
 require('jspdf-autotable')
 const { parse } = require('wkt')
@@ -318,6 +318,7 @@ async function exportSpeedingReportToPDF(userData, reportData) {
   console.log('Export to PDF')
 
   const lang = userData.user.attributes.lang
+  const timezone = userData.user.attributes.timezone
   const translations = messages[lang] ? messages[lang] : messages['en-GB']
 
   const overspeedData = userData.byDriver ? reportData.drivers : reportData.devices
@@ -364,7 +365,7 @@ async function exportSpeedingReportToPDF(userData, reportData) {
         doc.text(name, 20, space+20 )
         doc.setFontSize(11)
         doc.text(group ? translations.report.group + ': ' + group.name : '', 150, space+20 )
-        doc.text(new Date(d.from).toLocaleString() + ' - ' + new Date(d.to).toLocaleString(), 20, space+25 )
+        doc.text(convertToLocaleString(d.from, lang, timezone) + ' - ' + convertToLocaleString(d.to, lang, timezone), 20, space+25 )
         if (d.alerts[0] && !userData.byDriver) {
           doc.text(translations.report.speedLimit + ": " + (userData.useVehicleSpeedLimit ? Math.round(d.alerts[0].attributes.speedLimit * 1.85200) : userData.customSpeed) + ' Km/h', 20, space + 30)
         }
@@ -490,10 +491,7 @@ function deviceName(device){
 }
 
 function getAlertDate(row, user) {
-  return new Date(row.position.fixTime).toLocaleString(user.attributes.lang, {
-    timeZone: user.attributes.timezone,
-    hour12: false
-  })
+  return convertToLocaleString(row.position.fixTime, user.attributes.lang, user.attributes.timezone)
 }
 
 function getMaxSpeed(data) {

package/src/trip-report.js

@@ -1,7 +1,7 @@
 const automaticReports = require("./automaticReports")
 const messages = require('../lang')
 const jsPDF = require('jspdf')
-const {convertMS} = require("./util/utils")
+const {convertMS, convertToLocaleString, convertToLocaleDateString, convertToLocaleTimeString} = require("./util/utils")
 require('jspdf-autotable')
 const {coordsDistance} = require("./util/utils")
 const drivers = require("./util/driver")
@@ -51,7 +51,7 @@ async function createTripReportByDevice(from, to, devices) {
     devices.sort((a, b) => (a.name > b.name) ? 1 : -1)
 
     const devicesToSlice = devices.slice()
-    const data = await traccar.getTrips(traccarInstance, from, to, devicesToSlice)
+    const data = await traccar.getTrips(traccarInstance, from, to, devicesToSlice.map(d => d.id))
     const stopsData = await traccar.getStops(traccarInstance, from, to, devicesToSlice)
 
     console.log('Trips:' + data.length)
@@ -217,6 +217,7 @@ async function exportTripReportToPDF(userData, reportData) {
     console.log('Export to PDF')
 
     const lang = userData.user.attributes.lang
+    const timezone = userData.user.attributes.timezone
     const translations = messages[lang] ? messages[lang] : messages['en-GB']
     const tripsData = userData.byDriver ? reportData.drivers : reportData.devices
 
@@ -260,7 +261,7 @@ async function exportTripReportToPDF(userData, reportData) {
             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(convertToLocaleString(d.from, lang, timezone) + ' - ' + convertToLocaleString(d.to, lang, timezone), 20, space+25 )
             if(!userData.allWeek) {
                 doc.text((userData.weekDays.monday ? ' ' + translations.report.monday + ',' : '')
                     + (userData.weekDays.tuesday ? ' ' + translations.report.tuesday + ',' : '')
@@ -398,23 +399,17 @@ function deviceName(device){
 }
 
 function getTripDate(user, trip){
-    return new Date(trip.startTime).toLocaleDateString(user.attributes.lang, {
-        timeZone: user.attributes.timezone,
-        hour12: false
-    })
+    return convertToLocaleDateString(trip.startTime, user.attributes.lang, user.attributes.timezone)
 }
+
 function getTripStart(user, trip){
-    return new Date(trip.startTime).toLocaleTimeString(user.attributes.lang, {
-        timeZone: user.attributes.timezone,
-        hour12: false
-    })
+    return convertToLocaleTimeString(trip.startTime, user.attributes.lang, user.attributes.timezone)
 }
+
 function getTripEnd(user, trip){
-    return new Date(trip.endTime).toLocaleTimeString(user.attributes.lang, {
-        timeZone: user.attributes.timezone,
-        hour12: false
-    })
+    return convertToLocaleTimeString(trip.endTime, user.attributes.lang, user.attributes.timezone)
 }
+
 function getDriverName(drivers, driverUniqueId) {
     if(driverUniqueId) {
         const driver = drivers.find(d => d.uniqueId === driverUniqueId)
@@ -423,18 +418,22 @@ function getDriverName(drivers, driverUniqueId) {
 
     return ''
 }
+
 function getSumTotalKms(user, data) {
     const values = data.map(item => {
         return item.totalKms ? parseFloat(item.totalKms) : 0
     })
     return Intl.NumberFormat(user.attributes.lang, {maximumFractionDigits: 2}).format(values.reduce((a, b) => a + b, 0))
 }
+
 function getSumAvgSpeed(data) {
     const values = data.map(item => {
-        return Math.round(item.averageSpeed * 1.85200)
+        return Math.round(item.averageSpeed * 1.85200) * item.totalKms
     })
-    return Math.round((values.reduce((a, b) => a + b, 0)) / data.length)
+    const totalKms = data.reduce((a, b) => a + b.totalKms, 0)
+    return totalKms > 0 ? Math.round((values.reduce((a, b) => a + b, 0)) / totalKms) : 0
 }
+
 function getMaxSpeed(data) {
     const values = data.map(item => {
         return item.maxSpeed

package/src/util/traccar.js

@@ -14,12 +14,12 @@ async function getRoute(traccar, from, to, devices){
     return result.map(r => r.data).flat()
 }
 
-async function getTrips(traccar, from, to, devices){
-    const devicesToSlice = devices.slice()
+async function getTrips(traccar, from, to, deviceIds){
+    const devicesToSlice = deviceIds.slice()
     const arrayOfArrays = automaticReports.sliceArray(devicesToSlice)
     let requests = []
     for (const a of arrayOfArrays) {
-        const promise = traccar.reports.reportsTripsGet(from, to, a.map(d => d.id))
+        const promise = traccar.reports.reportsTripsGet(from, to, a)
         requests = requests.concat(promise)
     }
 

package/src/util/utils.js

@@ -55,8 +55,46 @@ async function getImgFromUrl(hostname) {
     }
 }
 
+function isClientSide() { typeof window !== "undefined" }
+
+function convertToLocaleString(value, lang, timezone){
+    if(isClientSide){
+        return new Date(value).toLocaleString()
+    } else {
+        return new Date(value).toLocaleString(lang, {
+            timeZone: timezone,
+            hour12: false
+        })
+    }
+}
+
+function convertToLocaleDateString(value, lang, timezone){
+    if(isClientSide){
+        return new Date(value).toLocaleDateString()
+    } else {
+        return new Date(value).toLocaleDateString(lang, {
+            timeZone: timezone,
+            hour12: false
+        })
+    }
+}
+
+function convertToLocaleTimeString(value, lang, timezone){
+    if(isClientSide){
+        return new Date(value).toLocaleTimeString()
+    } else {
+        return new Date(value).toLocaleTimeString(lang, {
+            timeZone: timezone,
+            hour12: false
+        })
+    }
+}
+
 exports.getImgFromUrl = getImgFromUrl
 exports.convertMS = convertMS
 exports.coordsDistance = coordsDistance
 exports.getDates = getDates
+exports.convertToLocaleString = convertToLocaleString
+exports.convertToLocaleDateString = convertToLocaleDateString
+exports.convertToLocaleTimeString = convertToLocaleTimeString
 

package/src/zone-report.js

@@ -1,7 +1,7 @@
 const moment = require('moment')
 const messages = require('../lang')
 const automaticReports = require("./automaticReports");
-const {convertMS} = require("./util/utils")
+const {convertMS, convertToLocaleString} = require("./util/utils")
 const jsPDF = require('jspdf')
 require('jspdf-autotable')
 const {headerFromUser} = require("./util/pdfDocument");
@@ -150,6 +150,7 @@ async function exportZoneReportToPDF(userData, reportData) {
     console.log('Export to PDF')
 
     const lang = userData.user.attributes.lang
+    const timezone = userData.user.attributes.timezone
     const translations = messages[lang] ? messages[lang] : messages['en-GB']
 
     const headers = [
@@ -180,7 +181,7 @@ async function exportZoneReportToPDF(userData, reportData) {
             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(convertToLocaleString(d.from, lang, timezone) + ' - ' + convertToLocaleString(d.to, lang, timezone), 20, space+25 )
             d.geofences.map(a => {
                 const temp = [
                     geofenceEnter(userData.user, a),
@@ -271,16 +272,10 @@ function deviceName(device){
 }
 
 function geofenceEnter(user, row){
-    return row.inTime ? new Date(row.inTime.fixTime).toLocaleString(user.attributes.lang, {
-        timeZone: user.attributes.timezone,
-        hour12: false
-    }) : ''
+    return row.inTime ? convertToLocaleString(row.inTime.fixTime, user.attributes.lang, user.attributes.timezone) : ''
 }
 function geofenceExit(user, row){
-    return row.outTime ? new Date(row.outTime.fixTime).toLocaleString(user.attributes.lang, {
-        timeZone: user.attributes.timezone,
-        hour12: false
-    }) : ''
+    return row.outTime ? convertToLocaleString(row.outTime.fixTime, user.attributes.lang, user.attributes.timezone) : ''
 }
 
 exports.createZoneReport = createZoneReport