fleetmap-reports 1.0.259 → 1.0.260

package/.idea/workspace.xml

@@ -1,11 +1,16 @@
 <?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="location report - check if it's running on client side">
       <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/events-report.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/events-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" />
+      <change beforePath="$PROJECT_DIR$/src/speeding-report.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/speeding-report.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/trip-report.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/trip-report.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/util/utils.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/util/utils.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/zone-report.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/zone-report.js" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -215,7 +220,7 @@
       <workItem from="1639954341221" duration="11986000" />
       <workItem from="1640272520380" duration="2253000" />
       <workItem from="1640789226071" duration="1935000" />
-      <workItem from="1640794844118" duration="226000" />
+      <workItem from="1640794844118" duration="8847000" />
     </task>
     <task id="LOCAL-00001" summary="Fix getStyle">
       <created>1636983717385</created>
@@ -329,7 +334,14 @@
       <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>
+    <option name="localTasksCounter" value="18" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -363,6 +375,7 @@
     <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" />
+    <option name="LAST_COMMIT_MESSAGE" value="location report - check if it's running on client side" />
   </component>
 </project>

package/package.json

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

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/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")
@@ -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,21 @@ 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)
+    return Math.round((values.reduce((a, b) => a + b, 0)) / data.reduce((a, b) => a + b.totalKms, 0))
 }
+
 function getMaxSpeed(data) {
     const values = data.map(item => {
         return item.maxSpeed

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