fleetmap-reports 1.0.349 → 1.0.350

package/package.json

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

package/src/activity-report.js

@@ -1,6 +1,5 @@
 const automaticReports = require("./automaticReports")
-const messages = require('../lang')
-const {convertMS, getDates} = require("./util/utils")
+const {convertMS, getDates, getTranslations} = require("./util/utils")
 const jsPDF = require('jspdf')
 require('jspdf-autotable')
 const drivers = require("./util/driver")
@@ -263,8 +262,7 @@ function processDrivers(from, to, drivers, data, userData) {
 
 async function exportActivityReportToPDF(userData, reportData) {
     console.log('Export to PDF')
-    const lang = userData.user.attributes.lang
-    const translations = messages[lang] ? messages[lang] : messages['en-GB']
+    const translations = getTranslations(userData)
 
     if (reportData.devices || reportData.drivers) {
         const doc = new jsPDF.jsPDF('l')
@@ -708,8 +706,7 @@ function exportActivityReportToExcel_Vehicle(settings, translations, reportData,
 
 function exportActivityReportToExcel(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: translations.report.titleActivityReport, // The name of the sheet

package/src/custom/vistawasteActivity-report.js

@@ -1,6 +1,5 @@
 const {convertMS,coordsDistance} = require("../util/utils")
 const {insideGeofence} = require("../util/geofence");
-const messages = require('../../lang')
 const jsPDF = require('jspdf')
 require('jspdf-autotable')
 const reportStyle = require("./../reportStyle")
@@ -90,7 +89,6 @@ async function createVistaWasteActivityReport(from, to, userData, traccar) {
 
         let service_counter = 0
         let estaleiro_name = ''
-        let aterro_name = ''
 
         let service_status = 'fora'
 
@@ -379,9 +377,6 @@ async function createVistaWasteActivityReport(from, to, userData, traccar) {
 function exportVistaWasteActivityReportToPDF(userData, reportData){
     console.log('Export to PDF')
 
-    const lang = userData.user.attributes.lang
-    const translations = messages[lang] ? messages[lang] : messages['en-GB']
-
     const headers = [
         'Veículo',
         'Matrícula',
@@ -405,7 +400,6 @@ function exportVistaWasteActivityReportToPDF(userData, reportData){
         'Viagens sem Motorista'
     ]
 
-    let first = true
     const doc = new jsPDF.jsPDF('l');
     doc.setFontSize(14)
     doc.text('Relatório de Actividade VistaWaste', 15, 15 )
@@ -481,9 +475,6 @@ function exportVistaWasteActivityReportToPDF(userData, reportData){
 function exportVistaWasteActivityReportToExcel(userData, reportData){
     console.log('Export to Excel')
 
-    const lang = userData.user.attributes.lang
-    const translations = messages[lang] ? messages[lang] : messages['en-GB']
-
     const settings = {
         sheetName: 'Relatório Actividade VistaWaste', // The name of the sheet
         fileName: 'actividade_vistawaste' // The name of the spreadsheet
@@ -551,13 +542,3 @@ function exportVistaWasteActivityReportToExcel(userData, reportData){
 exports.createVistaWasteActivityReport = createVistaWasteActivityReport;
 exports.exportVistaWasteActivityReportToPDF = exportVistaWasteActivityReportToPDF;
 exports.exportVistaWasteActivityReportToExcel = exportVistaWasteActivityReportToExcel;
-
-
-function testeInside(){
-    const aterro = {
-        "name": "ATERRO MULENVOS",
-        "area": "POLYGON((-8.84199831467157 13.353586792945864, -8.837055409386934 13.360404968261719, -8.839133292931493 13.363355398178099, -8.844725497826346 13.367915153503418, -8.849093189309215 13.361692428588865, -8.850407727084232 13.358130455017088, -8.848955374593118 13.357014656066895, -8.847980068973513 13.356928825378414, -8.84745001048762 13.356692790985106, -8.846729129721837 13.356049060821531, -8.84594198992049 13.35538923740387, -8.845441081897903 13.35453629493713, -8.84399666076834 13.35343658924103, -8.84199831467157 13.353586792945864))"
-    }
-
-
-}

package/src/events-report.js

@@ -1,11 +1,10 @@
 const automaticReports = require("./automaticReports")
-const messages = require('../lang')
 const jsPDF = require('jspdf')
 require('jspdf-autotable')
 const {getStyle} = require("./reportStyle");
 const {headerFromUser} = require("./util/pdfDocument");
 const {getUserPartner} = require("fleetmap-partners");
-const {convertToLocaleString} = require("./util/utils");
+const {convertToLocaleString, getTranslations} = require("./util/utils");
 
 const fileName = 'EventReport'
 
@@ -117,9 +116,8 @@ async function processDevices(from, to, devices, geofences, drivers, data, tracc
 async function exportSpeedingReportToPDF(userData, reportData) {
     console.log('Export to PDF')
 
-    const lang = userData.user.attributes.lang
+    const translations = getTranslations(userData)
     const timezone = userData.user.attributes.timezone
-    const translations = messages[lang] ? messages[lang] : messages['en-GB']
 
     const headers = [
         translations.report.eventType,
@@ -209,8 +207,7 @@ 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 translations = getTranslations(userData)
 
     const settings = {
         sheetName: translations.report.titleEventsReport, // The name of the sheet

package/src/idle-report.js

@@ -1,8 +1,7 @@
 const traccar = require("./util/traccar");
-const messages = require("../lang");
 const jsPDF = require("jspdf");
 const {headerFromUser, AmiriRegular} = require("./util/pdfDocument");
-const {convertToLocaleString, convertMS} = require("./util/utils");
+const {convertToLocaleString, convertMS, getTranslations} = require("./util/utils");
 const {getStyle} = require("./reportStyle");
 const {getUserPartner} = require("fleetmap-partners");
 
@@ -124,9 +123,8 @@ function processDevices(from, to, devices, routes, userData) {
 async function exportIdleReportToPDF(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 translations = getTranslations(userData)
 
     const idleData = userData.byDriver ? reportData.drivers : reportData.devices
 
@@ -229,8 +227,7 @@ async function exportIdleReportToPDF(userData, reportData) {
 function exportIdleReportToExcel(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 idleData = userData.byDriver ? reportData.drivers : reportData.devices
 

package/src/location-report.js

@@ -1,5 +1,4 @@
 const automaticReports = require("./automaticReports");
-const messages = require('../lang')
 const jsPDF = require('jspdf')
 require('jspdf-autotable')
 const {headerFromUser} = require("./util/pdfDocument");
@@ -104,9 +103,8 @@ function processDevices(from, to, devices, drivers, data) {
 async function exportLocationReportToPDF(userData, reportData) {
     console.log('Export to PDF')
 
-    const lang = userData.user.attributes.lang
+    const translations = getTranslations(userData)
     const timezone = userData.user.attributes.timezone
-    const translations = messages[lang] ? messages[lang] : messages['en-GB']
 
     const headers = [
         translations.report.date,
@@ -195,8 +193,7 @@ function getTempValue(row) {
 function exportLocationReportToExcel(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: translations.report.titleLocationReport, // The name of the sheet

package/src/trip-report.js

@@ -1,7 +1,6 @@
 const automaticReports = require("./automaticReports")
-const messages = require('../lang')
 const jsPDF = require('jspdf')
-const {convertMS, convertToLocaleString, convertToLocaleDateString, convertToLocaleTimeString} = require("./util/utils")
+const {convertMS, convertToLocaleString, convertToLocaleDateString, convertToLocaleTimeString, getTranslations} = require("./util/utils")
 require('jspdf-autotable')
 const {getUserPartner} = require("fleetmap-partners")
 const {headerFromUser, addTable} = require("./util/pdfDocument")
@@ -202,11 +201,10 @@ function processDrivers(from, to, userData, data) {
 }
 
 async function exportTripReportToPDF(userData, reportData) {
-    console.log('Export to PDF')
+    console.log('exportTripReportToPDF')
 
-    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 tripsData = userData.byDriver ? reportData.drivers : reportData.devices
 
     const headers = [
@@ -318,8 +316,7 @@ async function exportTripReportToPDF(userData, reportData) {
 function exportTripReportToExcel(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 tripsData = userData.byDriver ? reportData.drivers : reportData.devices
 

package/src/zone-report.js

@@ -1,7 +1,6 @@
 const moment = require('moment')
-const messages = require('../lang')
 const automaticReports = require("./automaticReports");
-const {convertMS, convertToLocaleString} = require("./util/utils")
+const {convertMS, convertToLocaleString, getTranslations} = require("./util/utils")
 const jsPDF = require('jspdf')
 require('jspdf-autotable')
 const {headerFromUser} = require("./util/pdfDocument");
@@ -149,9 +148,8 @@ async function processDevices(from, to, devices, drivers, geofences, data, tracc
 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 translations = getTranslations(userData)
 
     const headers = [
         translations.report.enter,
@@ -228,8 +226,7 @@ async function exportZoneReportToPDF(userData, reportData) {
 function exportZoneReportToExcel(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: translations.report.titleActivityReport, // The name of the sheet