fleetmap-reports 1.0.628 → 1.0.629

package/package.json

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

package/src/idle-report.js

@@ -1,6 +1,6 @@
 const jsPDF = require('jspdf')
 const { headerFromUser, AmiriRegular } = require('./util/pdfDocument')
-const { convertToLocaleString, convertMS, getTranslations, getLanguage } = require('./util/utils')
+const { convertToLocaleString, convertMS, getTranslations, getLanguage, convertToLocaleDateString, convertToLocaleTimeString } = require('./util/utils')
 const { getStyle } = require('./reportStyle')
 const { getUserPartner } = require('fleetmap-partners')
 const { devicesToProcess } = require('./util/device')
@@ -195,6 +195,7 @@ async function exportIdleReportToPDF (userData, reportData) {
   const idleData = userData.byDriver ? reportData.drivers : reportData.devices
 
   const headers = [
+    translations.report.date,
     translations.report.start,
     translations.report.end,
     translations.report.address,
@@ -236,7 +237,8 @@ async function exportIdleReportToPDF (userData, reportData) {
         d.idleEvents.forEach(a => {
           const temp = [
             getIdleEventDate(a.position, userData.user),
-            getIdleEventDate(a.lastPosition, userData.user),
+            getIdleEventTime(a.position, userData.user),
+            getIdleEventTime(a.lastPosition, userData.user),
             a.position.address,
             convertMS(a.idleTime, true),
             userData.byDriver ? a.deviceName : getDriver(a, userData.drivers)
@@ -306,6 +308,7 @@ function exportIdleReportToExcel (userData, reportData) {
   }
   const headers = [
     { label: userData.byDriver ? translations.report.driver : translations.report.vehicle, value: 'name' },
+    { label: translations.report.date, value: 'date' },
     { label: translations.report.start, value: 'start' },
     { label: translations.report.end, value: 'end' },
     { label: translations.report.address, value: 'address' },
@@ -321,8 +324,9 @@ function exportIdleReportToExcel (userData, reportData) {
         return {
           name: userData.byDriver ? d.driver.name : d.device.name,
           duration: convertMS(a.idleTime, true),
-          start: getIdleEventDate(a.position, userData.user),
-          end: getIdleEventDate(a.lastPosition, userData.user),
+          date: getIdleEventDate(a.position, userData.user),
+          start: getIdleEventTime(a.position, userData.user),
+          end: getIdleEventTime(a.lastPosition, userData.user),
           subname: userData.byDriver ? a.deviceName : getDriver(a, userData.drivers),
           address: a.position.address + (a.geofenceName ? ' - ' + a.geofenceName : '')
         }
@@ -347,8 +351,12 @@ function deviceName (device) {
   return device.name + (device.attributes.license_plate ? ', ' + device.attributes.license_plate : '') + (device.model ? ', ' + device.model : '')
 }
 
-function getIdleEventDate (position, user) {
-  return convertToLocaleString(position.fixTime, user.attributes.lang, user.attributes.timezone)
+function getIdleEventDate (user, position) {
+  return convertToLocaleDateString(position.fixTime, user.attributes.lang, user.attributes.timezone)
+}
+
+function getIdleEventTime (user, position) {
+  return convertToLocaleTimeString(position.fixTime, user.attributes.lang, user.attributes.timezone)
 }
 
 exports.createIdleReport = createIdleReport