fleetmap-reports 1.0.656 → 1.0.658

package/package.json

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

package/src/stop-report.js

@@ -2,7 +2,7 @@ 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, convertToLocaleDateString, convertToLocaleTimeString } = require('./util/utils')
+const { getTranslations, convertToLocaleString, convertMS } = require('./util/utils')
 const jsPDF = require('jspdf')
 const { headerFromUser, addTable } = require('./util/pdfDocument')
 const { getStyle } = require('./reportStyle')
@@ -98,7 +98,6 @@ async function exportStopReportToPDF (userData, reportData) {
   const stopsData = userData.byDriver ? reportData.drivers : reportData.devices
 
   const headers = [
-    translations.report.date,
     translations.report.start,
     translations.report.end,
     translations.report.address,
@@ -131,7 +130,6 @@ async function exportStopReportToPDF (userData, reportData) {
 
       d.stops.forEach(a => {
         data.push([
-          getStopDate(userData.user, a),
           getStopStart(userData.user, a),
           getStopEnd(userData.user, a),
           a.endPOIName || a.address,
@@ -171,7 +169,7 @@ function exportStopReportToExcel (userData, reportData) {
   }
 
   const headers = [
-    { label: translations.report.date, value: 'date' },
+    { label: translations.report.vehicle, value: 'name' },
     { label: translations.report.start, value: 'start' },
     { label: translations.report.end, value: 'end' },
     { label: translations.report.address, value: 'address' },
@@ -187,7 +185,6 @@ function exportStopReportToExcel (userData, reportData) {
       data = data.concat(d.stops.map(a => {
         return {
           name: a.deviceName,
-          date: getStopDate(userData.user, a),
           start: getStopStart(userData.user, a),
           end: getStopEnd(userData.user, a),
           address: a.endPOIName || a.address,
@@ -213,16 +210,12 @@ function exportStopReportToExcel (userData, reportData) {
   }
 }
 
-function getStopDate (user, stop) {
-  return convertToLocaleDateString(stop.startTime, user.attributes.lang, user.attributes.timezone)
-}
-
 function getStopStart (user, stop) {
-  return convertToLocaleTimeString(stop.startTime, user.attributes.lang, user.attributes.timezone)
+  return convertToLocaleString(stop.startTime, user.attributes.lang, user.attributes.timezone)
 }
 
 function getStopEnd (user, stop) {
-  return convertToLocaleTimeString(stop.endTime, user.attributes.lang, user.attributes.timezone)
+  return convertToLocaleString(stop.endTime, user.attributes.lang, user.attributes.timezone)
 }
 
 exports.createStopReport = createStopReport