fleetmap-reports 1.0.511 → 1.0.513

package/package.json

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

package/src/speeding-report.js

@@ -1,5 +1,5 @@
 const jsPDF = require('jspdf')
-const { convertMS, convertToLocaleString, convertToFeature, convertPositionToFeature, getTranslations } = require('./util/utils')
+const { convertMS, convertToLocaleString, convertToFeature, convertPositionToFeature, getTranslations, getLanguage } = require('./util/utils')
 const { headerFromUser, AmiriRegular } = require('./util/pdfDocument')
 require('jspdf-autotable')
 const { getStyle } = require('./reportStyle')
@@ -343,7 +343,7 @@ async function getHereEvents (devices, routes, threshold) {
         events.push(...reduced)
         resolve()
       }).catch(e => {
-        console.error('error on route match, moving on', e.message)
+        console.warn('error on route match, moving on', e.message)
         resolve()
       })
     }))
@@ -378,7 +378,7 @@ function calculateEventData (positions, pIndex, alert, device, geofence, userDat
 
 async function exportSpeedingReportToPDF (userData, reportData) {
   console.log('Export to PDF')
-  const lang = userData.user.attributes.lang || (navigator && navigator.language)
+  const lang = getLanguage(userData)
 
   const timezone = userData.user.attributes.timezone
   const translations = getTranslations(userData)

package/src/util/utils.js

@@ -12,6 +12,10 @@ exports.getTranslations = (userData) => {
   return messages[lang] ? messages[lang] : messages['en-GB']
 }
 
+exports.getLanguage = (userData) => {
+  return userData.user.attributes.lang || ((typeof navigator !== 'undefined') && navigator.language) || 'en-GB'
+}
+
 function convertMS (duration, withSeconds) {
   if (!duration || duration < 0) {
     return '00:00'