fleetmap-reports 1.0.719 → 1.0.721

package/package.json

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

package/src/activity-report.js

@@ -1,5 +1,5 @@
 const automaticReports = require('./automaticReports')
-const { convertMS, getDates, getTranslations, weekDaySelected } = require('./util/utils')
+const { convertMS, getDates, getTranslations, weekDaySelected, convertToLocaleString } = require('./util/utils')
 const jsPDF = require('jspdf')
 require('jspdf-autotable')
 const {
@@ -338,6 +338,9 @@ 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 headers = [translations.report.driver,
     translations.report.start,
     translations.report.end,
@@ -347,7 +350,8 @@ function exportActivityReportToPDFDriver (doc, translations, reportData, userDat
     translations.report.driverHours]
 
   doc.setFontSize(10)
-  doc.text(new Date(reportData.from).toLocaleString() + ' - ' + new Date(reportData.to).toLocaleString(), 20, 30)
+  doc.text(convertToLocaleString(reportData.from, lang, timezone) + ' - ' + convertToLocaleString(reportData.to, lang, timezone), 20, 30)
+  doc.text()
 
   const data = []
   reportData.drivers.forEach(d => {
@@ -375,6 +379,9 @@ 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 headers = [translations.report.vehicle,
     translations.report.group,
     translations.report.start,
@@ -388,14 +395,14 @@ function exportActivityReportToPDFVehicle (doc, translations, reportData, userDa
     translations.report.spentFuel]
 
   doc.setFontSize(10)
-  doc.text(new Date(reportData.from).toLocaleString() + ' - ' + new Date(reportData.to).toLocaleString(), 20, 30)
+  doc.text(convertToLocaleString(reportData.from, lang, timezone) + ' - ' + convertToLocaleString(reportData.to, lang, timezone), 20, 30)
 
   const data = []
   reportData.devices.forEach(d => {
     const group = userData.groups.find(g => d.device.groupId === g.id)
 
     const temp = [
-      d.summary[0].deviceName,
+      d.device.name,
       group ? group.name : '',
       d.summary[0].startTime ? new Date(d.summary[0].startTime).toLocaleString() : '',
       d.summary[0].endTime ? new Date(d.summary[0].endTime).toLocaleString() : '',
@@ -513,7 +520,7 @@ function exportActivityReportToExcelVehicleGroupByDay (settings, translations, r
       data = data.concat([{}])
       data = data.concat(d.summary.map(s => {
         return {
-          name: s.deviceName,
+          name: d.device.name,
           group: group ? group.name : '',
           date: new Date(s.date).toLocaleDateString(),
           weekday: weekDays[s.date.getDay()],
@@ -713,7 +720,7 @@ function exportActivityReportToExcelVehicle (settings, translations, reportData,
       const group = userData.groups.find(g => d.device.groupId === g.id)
 
       data = data.concat([{
-        name: d.summary[0].deviceName,
+        name: d.device.name,
         group: group ? group.name : '',
         start: d.summary[0].startTime ? new Date(d.summary[0].startTime).toLocaleString() : '',
         end: d.summary[0].endTime ? new Date(d.summary[0].endTime).toLocaleString() : '',