fleetmap-reports 2.0.100 → 2.0.102

package/package.json

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

package/src/index.js

@@ -213,5 +213,15 @@ function Reports (config, axios) {
   this.gpsJumpReportToExcel = (userData, reportData) => {
     return require('./partnerReports/gpsjump-report').exportGPSJumpReportToExcel(userData, reportData)
   }
+
+  this.delayedStartReport = (from, to, userData) => {
+    return require('./partnerReports/delayedstart-report').create(from, to, userData, this.traccar)
+  }
+  this.delayedStartReportToPDF = (userData, reportData) => {
+    return require('./partnerReports/delayedstart-report').exportToPDF(userData, reportData)
+  }
+  this.delayedStartReportToExcel = (userData, reportData) => {
+    return require('./partnerReports/delayedstart-report').exportToExcel(userData, reportData)
+  }
 }
 module.exports = Reports

package/src/partnerReports/delayedstart-report.js

@@ -1,6 +1,6 @@
 const automaticReports = require('../automaticReports')
 const traccarHelper = require('../util/traccar')
-const { getDates, getTranslations } = require('../util/utils')
+const { getDates, getTranslations, convertMS } = require('../util/utils')
 const { getUserPartner } = require('fleetmap-partners')
 const { getDataByDay } = require('../util/trips')
 
@@ -26,15 +26,33 @@ async function createDelayedStartReport (from, to, userData, traccar) {
     deviceCount = deviceCount + slice.length
   }
 
+  reportData.devices = reportData.devices.flat()
+
   return reportData
 }
 
 function getDelayDescription (startTime, activityStart, lowDelay, mediumDelay, highDelay) {
-  return 'Low'
+  const startTimeDate = new Date(startTime)
+  const activityStartDate = new Date(startTime)
+  activityStartDate.setHours(activityStart.substring(0, 2), activityStart.substring(3, 5))
+
+  if (startTimeDate >= activityStartDate) {
+    const delay = startTimeDate.getTime() - activityStartDate.getTime()
+    if (delay < (lowDelay * 60 * 1000)) {
+      return '-'
+    } else if (delay < (mediumDelay * 60 * 1000)) {
+      return convertMS(delay, false) + ' - Low (+' + lowDelay + ')'
+    } else if (delay < (highDelay * 60 * 1000)) {
+      return convertMS(delay, false) + ' - Medium (+' + mediumDelay + ')'
+    } else {
+      return convertMS(delay, false) + ' - High (+' + highDelay + ')'
+    }
+  }
+
+  return ''
 }
 
 async function processDeviceData (from, to, allInOne, d, userData, traccar) {
-  const group = userData.groups.find(g => g.id === d.groupId)
   const trips = allInOne.trips.filter(t => t.deviceId === d.id)
   const translations = getTranslations(userData)
 
@@ -56,27 +74,24 @@ async function processDeviceData (from, to, allInOne, d, userData, traccar) {
 
     if (tripsByDay.length > 0) {
       const startTime = tripsByDay[0].startTime
-      const endTime = tripsByDay[tripsByDay.length].endTime
+      const endTime = tripsByDay[tripsByDay.length - 1].endTime
 
       const deviceDayData = {
         device: d.name,
+        groupId: d.groupId,
         licensePlate: d.attributes.license_plate,
-        group: group ? group.name : '',
         driver: '',
         weekDay: weekDays[new Date(date).getDay()],
-        startTime: startTime,
+        startTime,
         delayDescription: getDelayDescription(startTime, userData.activityStart, userData.lowDelay, userData.mediumDelay, userData.highDelay),
-        endTime: endTime
+        endTime
       }
 
       days.push(deviceDayData)
     }
   }
 
-  return {
-    device: d,
-    days
-  }
+  return days
 }
 
 async function exportDelayedStartReportToPDF (userData, reportData) {

package/src/util/geofence.js

@@ -19,7 +19,7 @@ exports.insideGeofence = function insideGeofence (position, geofence) {
 exports.getNearestPOI = (position, geofences) => getNearestPOIs(position.longitude, position.latitude, geofences)[0]
 function getNearestPOIs (long, lat, geofences) {
   const distance = geofences
-    .filter(g => g && g.area.startsWith('CIRCLE'))
+    .filter(g => g && g.area && g.area.startsWith('CIRCLE'))
     .map(g => {
       const str = g.area.substring('CIRCLE ('.length, g.area.indexOf(','))
       const radius = g.area.substring(g.area.indexOf(',') + 1, g.area.indexOf(')'))

package/src/util/utils.js

@@ -19,7 +19,7 @@ exports.getLanguage = (userData) => {
   return userData.user.attributes.lang ||
     ((typeof navigator !== 'undefined') && navigator.language) ||
     getUserPartner(userData.user).lang ||
-    'en-GB'
+    'pt-BR'
 }
 
 function convertMS (duration, withSeconds) {