fleetmap-reports 1.0.469 → 1.0.470

package/lang/index.js

@@ -19,6 +19,9 @@ module.exports = {
   'es-CL': {
     ...esCLLocale
   },
+  'es-ES': {
+    ...esCLLocale
+  },
   pt: {
     ...ptPTLocale
   }

package/package.json

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

package/src/fuelconsumption-report.js

@@ -3,7 +3,7 @@ const refuelingReport = require('./refueling-report')
 const traccarHelper = require('./util/traccar')
 const odoo = require('./util/odoo')
 const { devicesToProcess } = require('./util/device')
-const messages = require('../lang')
+const { getTranslations } = require('./util/utils')
 
 async function createFuelConsumptionReport (from, to, userData, traccar) {
   console.log('Create FuelConsumption Report')
@@ -108,8 +108,7 @@ function calculateConsumption (userData, d, day, avgConsumption, data) {
 }
 
 function exportFuelConsumptionReportToExcel (userData, reportData) {
-  const lang = userData.user.attributes.lang
-  const translations = messages[lang] ? messages[lang] : messages['en-GB']
+  const translations = getTranslations(userData)
 
   const settings = {
     sheetName: 'FuelConsumptionReport', // The name of the sheet

package/src/fueldrop-report.js

@@ -1,6 +1,6 @@
 const automaticReports = require('./automaticReports')
 const { devicesToProcess } = require('./util/device')
-const messages = require('../lang')
+const { getTranslations } = require('./util/utils')
 
 function calculateFuelDrop (position, positions) {
   const index = positions.indexOf(position)
@@ -91,8 +91,7 @@ async function createFuelDropReport (from, to, userData, traccar) {
 
 function exportFuelDropReportToExcel (userData, reportData) {
   console.log('Export to Excel')
-  const lang = userData.user.attributes.lang
-  const translations = messages[lang] ? messages[lang] : messages['en-GB']
+  const translations = getTranslations(userData)
 
   const settings = {
     sheetName: 'FuelDropReport', // The name of the sheet

package/src/kms-report.js

@@ -1,11 +1,10 @@
-const messages = require('../lang')
 const jsPDF = require('jspdf')
 require('jspdf-autotable')
 const { getStyle } = require('./reportStyle')
 const { headerFromUser, addTable } = require('./util/pdfDocument')
 const { getUserPartner } = require('fleetmap-partners')
 const traccar = require('./util/traccar')
-const { getDates, convertFromUTC } = require('./util/utils')
+const { getDates, convertFromUTC, getTranslations } = require('./util/utils')
 const trips = require('./util/trips')
 const drivers = require('./util/driver')
 const { isInsideTimetable, isPartialInsideTimetable, calculateTrip } = require('./util/trips')
@@ -218,8 +217,7 @@ function processDevices (from, to, devices, data, userData) {
 }
 
 async function exportKmsReportToPDF (userData, reportData) {
-  const lang = userData.user.attributes.lang || (navigator && navigator.language)
-  const translations = messages[lang] ? messages[lang] : messages['en-GB']
+  const translations = getTranslations(userData)
   const kmsData = userData.byDriver ? reportData.drivers : reportData.devices
 
   const weekDays = [
@@ -355,8 +353,7 @@ async function exportKmsReportToPDF (userData, reportData) {
 function exportKmsReportToExcel (userData, reportData) {
   console.log('Export to Excel')
 
-  const lang = userData.user.attributes.lang || (navigator && navigator.language)
-  const translations = messages[lang] ? messages[lang] : messages['en-GB']
+  const translations = getTranslations(userData)
 
   const weekDays = [
     translations.report.sunday,

package/src/refueling-report.js

@@ -2,7 +2,7 @@ const helpers = require('@turf/helpers')
 const automaticReports = require('./automaticReports')
 const { devicesToProcess } = require('./util/device')
 const distance = require('@turf/distance')
-const messages = require('../lang')
+const { getTranslations } = require('./util/utils')
 
 const positionsToCheck = 15
 
@@ -178,8 +178,7 @@ async function calculateRefuelingPositions (userData, d, data) {
 
 function exportRefuelingReportToExcel (userData, reportData) {
   console.log('Export to Excel')
-  const lang = userData.user.attributes.lang
-  const translations = messages[lang] ? messages[lang] : messages['en-GB']
+  const translations = getTranslations(userData)
 
   const settings = {
     sheetName: 'RefuelingReport', // The name of the sheet

package/src/speeding-report.js

@@ -1,6 +1,5 @@
-const messages = require('../lang')
 const jsPDF = require('jspdf')
-const { convertMS, convertToLocaleString, convertToFeature, convertPositionToFeature } = require('./util/utils')
+const { convertMS, convertToLocaleString, convertToFeature, convertPositionToFeature, getTranslations } = require('./util/utils')
 const { headerFromUser, AmiriRegular } = require('./util/pdfDocument')
 require('jspdf-autotable')
 const { getStyle } = require('./reportStyle')
@@ -353,10 +352,10 @@ 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 = userData.user.attributes.lang
   const timezone = userData.user.attributes.timezone
-  const translations = messages[lang] ? messages[lang] : messages['en-GB']
+  const translations = getTranslations(userData)
 
   const overspeedData = userData.byDriver ? reportData.drivers : reportData.devices
 
@@ -479,9 +478,8 @@ async function exportSpeedingReportToPDF (userData, reportData) {
 function exportSpeedingReportToExcel (userData, reportData) {
   console.log('Export to Excel')
 
-  const lang = userData.user.attributes.lang
-  const translations = messages[lang] ? messages[lang] : messages['en-GB']
-
+  const lang = userData.user.attributes.lang || (navigator && navigator.language)
+  const translations = getTranslations(userData)
   const overspeedData = userData.byDriver ? reportData.drivers : reportData.devices
 
   const settings = {

package/src/util/utils.js

@@ -6,6 +6,9 @@ const distance = require('@turf/distance')
 
 exports.getTranslations = (userData) => {
   const lang = userData.user.attributes.lang || (navigator && navigator.language)
+  if (!messages[lang]) {
+    console.warn('no lang found for', userData.user, userData.user.attributes.lang, navigator && navigator.language)
+  }
   return messages[lang] ? messages[lang] : messages['en-GB']
 }