fleetmap-reports 1.0.889 → 1.0.892

package/package.json

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

package/src/activity-report.js

@@ -1,5 +1,8 @@
 const automaticReports = require('./automaticReports')
-const { convertMS, getDates, getTranslations, weekDaySelected, convertToLocaleString, isClientSide } = require('./util/utils')
+const {
+  convertMS, getDates, getTranslations, weekDaySelected, convertToLocaleString, isClientSide,
+  getLanguage
+} = require('./util/utils')
 const jsPDF = require('jspdf')
 require('jspdf-autotable')
 const {
@@ -341,7 +344,7 @@ async function exportActivityReportToPDF (userData, reportData) {
 
 function exportActivityReportToPDFDriver (doc, translations, reportData, userData) {
   const timezone = userData.user.attributes.timezone
-  const lang = userData.user.attributes.lang || (navigator && navigator.language)
+  const lang = getLanguage(userData)
 
   const headers = [translations.report.driver,
     translations.report.start,
@@ -381,7 +384,7 @@ function exportActivityReportToPDFDriver (doc, translations, reportData, userDat
 
 function exportActivityReportToPDFVehicle (doc, translations, reportData, userData) {
   const timezone = userData.user.attributes.timezone
-  const lang = userData.user.attributes.lang || (navigator && navigator.language)
+  const lang = getLanguage(userData)
 
   const headers = [translations.report.vehicle,
     translations.report.group,

package/src/events-report.js

@@ -4,7 +4,10 @@ require('jspdf-autotable')
 const { getStyle } = require('./reportStyle')
 const { headerFromUser } = require('./util/pdfDocument')
 const { getUserPartner } = require('fleetmap-partners')
-const { convertToLocaleString, getTranslations, convertMS } = require('./util/utils')
+const {
+  convertToLocaleString, getTranslations, convertMS,
+  getLanguage
+} = require('./util/utils')
 const { devicesToProcess } = require('./util/device')
 const { isInside } = require('./util/timetable')
 const { getDigitalPortValue } = require('./location-report')
@@ -133,7 +136,7 @@ async function processDevices (from, to, devices, data, traccar, userData) {
 
 async function exportSpeedingReportToPDF (userData, reportData) {
   console.log('Export to PDF')
-  const lang = userData.user.attributes.lang || (navigator && navigator.language)
+  const lang = getLanguage(userData)
   const translations = getTranslations(userData)
   const timezone = userData.user.attributes.timezone
 

package/src/location-report.js

@@ -3,7 +3,10 @@ require('jspdf-autotable')
 const { headerFromUser } = require('./util/pdfDocument')
 const { getStyle } = require('./reportStyle')
 const { getUserPartner } = require('fleetmap-partners')
-const { convertToLocaleString, getTranslations } = require('./util/utils')
+const {
+  convertToLocaleString, getTranslations,
+  getLanguage
+} = require('./util/utils')
 const traccarHelper = require('./util/traccar')
 const { devicesToProcess } = require('./util/device')
 const automaticReports = require('./automaticReports')
@@ -180,7 +183,7 @@ async function exportLocationReportToPDF (userData, reportData) {
   console.log('Export to PDF')
 
   const translations = getTranslations(userData)
-  const lang = userData.user.attributes.lang || (navigator && navigator.language)
+  const lang = getLanguage(userData)
   const timezone = userData.user.attributes.timezone
 
   const positionsData = userData.byDriver ? reportData.drivers : reportData.devices

package/src/stop-report.js

@@ -2,7 +2,10 @@ const { devicesToProcess, deviceName } = require('./util/device')
 const automaticReports = require('./automaticReports')
 const traccarHelper = require('./util/traccar')
 const { getNearestPOIs, insideGeofence, loadGroupsData } = require('./util/geofence')
-const { getTranslations, convertToLocaleString, convertMS } = require('./util/utils')
+const {
+  getTranslations, convertToLocaleString, convertMS,
+  getLanguage
+} = require('./util/utils')
 const jsPDF = require('jspdf')
 const { headerFromUser, addTable } = require('./util/pdfDocument')
 const { getStyle } = require('./reportStyle')
@@ -95,7 +98,7 @@ async function exportStopReportToPDF (userData, reportData) {
 
   const timezone = userData.user.attributes.timezone
   const translations = getTranslations(userData)
-  const lang = userData.user.attributes.lang || (navigator && navigator.language)
+  const lang = getLanguage(userData)
   const stopsData = userData.byDriver ? reportData.drivers : reportData.devices
 
   const headers = [

package/src/zone-report.js

@@ -3,7 +3,8 @@ const {
   convertMS, convertToLocaleString, getTranslations, convertToFeature, convertPositionToFeature,
   calculateDistance,
   sortPositions, getDates, convertToLocaleDateString, convertToLocaleTimeString,
-  isClientSide
+  isClientSide,
+  getLanguage
 } = require('./util/utils')
 const jsPDF = require('jspdf')
 require('jspdf-autotable')
@@ -468,7 +469,7 @@ async function exportZoneReportToPDF (userData, reportData) {
 
   const timezone = userData.user.attributes.timezone
   const translations = getTranslations(userData)
-  const lang = userData.user.attributes.lang || (navigator && navigator.language)
+  const lang = getLanguage(userData)
 
   const headers = []
 
@@ -638,9 +639,9 @@ function exportZoneReportToExcel (userData, reportData) {
       { label: translations.report.date, value: 'date' },
       { label: translations.report.firstIn, value: 'firstIn' },
       { label: translations.report.lastOut, value: 'lastOut' },
-      { label: translations.report.distanceIn || 'Kms Adentro', value: 'distanceIn' },
+      { label: translations.report.distanceIn || 'Kms Adentro', value: 'distanceIn', format: '0' },
       { label: translations.report.timeIn, value: 'totalInTime' },
-      { label: translations.report.distanceOut || 'Kms Afuera', value: 'distanceOut' },
+      { label: translations.report.distanceOut || 'Kms Afuera', value: 'distanceOut', format: '0' },
       { label: translations.report.timeOut, value: 'totalOutTime' }
     ])
   } else if (userData.zonesByColumn) {
@@ -651,7 +652,7 @@ function exportZoneReportToExcel (userData, reportData) {
     reportData.devices[0].days[0].geofences.forEach(g =>
       headers.push({ label: g.geofenceName, value: g.geofenceId })
     )
-    headers.push({ label: translations.report.distanceOut || 'Kms Afuera', value: 'distanceOut' })
+    headers.push({ label: translations.report.distanceOut || 'Kms Afuera', value: 'distanceOut', format: '0' })
   } else if (userData.tripsBetweenZones) {
     headers.push(...[
       { label: translations.report.vehicle, value: 'name' },
@@ -660,7 +661,7 @@ function exportZoneReportToExcel (userData, reportData) {
       { label: translations.report.date_end, value: 'enter' },
       { label: translations.report.geofenceIn || 'Zone IN', value: 'zoneIn' },
       { label: translations.report.duration, value: 'totalOutTime' },
-      { label: translations.report.distance, value: 'distanceOut' }
+      { label: translations.report.distance, value: 'distanceOut', format: '0' }
     ])
   } else {
     headers.push(...[
@@ -669,8 +670,8 @@ function exportZoneReportToExcel (userData, reportData) {
       { label: translations.report.exit, value: 'exit' },
       { label: translations.report.stopped, value: 'stopped' },
       { label: translations.report.duration, value: 'totalInTime' },
-      { label: translations.report.distanceIn || 'Kms Adentro', value: 'distanceIn' },
-      { label: translations.report.distanceOut || 'Kms Afuera', value: 'distanceOut' },
+      { label: translations.report.distanceIn || 'Kms Adentro', value: 'distanceIn', format: '0' },
+      { label: translations.report.distanceOut || 'Kms Afuera', value: 'distanceOut', format: '0' },
       { label: translations.report.geofence, value: 'zone' },
       { label: translations.report.driver, value: 'driver' }
     ])