fleetmap-reports 2.0.109 → 2.0.110

package/package.json

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

package/src/partnerReports/performance-report.js

@@ -98,10 +98,11 @@ function getDeviceData (allInOne, d) {
     deviceTrips.push(uncompletedTrip)
   }
 
-  if (deviceRoute.find(p => p.attributes.xpert)) {
+  if (deviceRoute.find(p => p.attributes.rawXpert)) {
     // Inofleet unit with xpert data
-    const endTripData = getEndTripMessages(deviceRoute).map(m => parseEndTripMessage(m.xpertString || m)).sort((a, b) => a.date.localeCompare(b.date))
-    const canDriverStyle = getCanDriverStyleMessages(deviceRoute).map(m => parseCanDriverStyleMessage(m.xpertString || m)).sort((a, b) => a.date.localeCompare(b.date))
+    const xpertMessages = deviceRoute.map(p => p.attributes.rawXpert).filter(a => a)
+    const endTripData = getEndTripMessages(xpertMessages).map(m => parseEndTripMessage(m.xpertString || m)).sort((a, b) => a.date.localeCompare(b.date))
+    const canDriverStyle = getCanDriverStyleMessages(xpertMessages).map(m => parseCanDriverStyleMessage(m.xpertString || m)).sort((a, b) => a.date.localeCompare(b.date))
 
     const drivingTime = endTripData.length > 1 ? endTripData[endTripData.length - 1].totalTimeDriving - endTripData[0].totalTimeDriving : 0
     const idleTime = endTripData.length > 1 ? (endTripData[endTripData.length - 1].totalTimeInIdle || 0) - (endTripData[0].totalTimeInIdle || 0) : 0
@@ -145,7 +146,7 @@ function getDeviceData (allInOne, d) {
     const drivingTime = deviceTrips.reduce((a, b) => a + b.duration, 0)
     const drivingConsumption = calculateConsumption(d, { trips: deviceTrips, stops: [], route: deviceRoute, summary: deviceSummary }, undefined)
     const drivingDistance = deviceSummary ? deviceSummary.distance / 1000 : 0
-    const idleTime = deviceTrips.reduce((a, b) => a + b.idleTime, 0) + deviceStops.reduce((a, b) => a + b.engineHours, 0)
+    const idleTime = deviceTrips.reduce((a, b) => a + (b.idleTime ? b.idleTime : 0), 0) + deviceStops.reduce((a, b) => a + b.engineHours, 0)
     const idleConsumption = deviceSummary && deviceSummary.spentFuel > drivingConsumption ? deviceSummary.spentFuel - drivingConsumption : 0
 
     const highEngineRPMSections = calculateRPMSections(deviceRoute, d.attributes.highRPM || 1300)

package/src/util/xpert.js

@@ -44,18 +44,12 @@ function parseCanDriverStyleMessage (xpertMessage) {
   }
 }
 
-function getEndTripMessages (route) {
-  const positions = route.filter(p => p.attributes.xpert &&
-        (Array.isArray(p.attributes.xpert) ? p.attributes.xpert.find(x => x.type === '3') : p.attributes.xpert.split(';').find(m => m.startsWith('3'))))
-
-  return positions.map(p => (Array.isArray(p.attributes.xpert) ? p.attributes.xpert.find(x => x.type === '3') : p.attributes.xpert.split(';').find(m => m.startsWith('3'))))
+function getEndTripMessages (xpertMessages) {
+  return xpertMessages.map(xpert => (Array.isArray(xpert) ? xpert.find(x => x.type === '3') : xpert.split(';').find(m => m.startsWith('3')))).filter(a => a)
 }
 
-function getCanDriverStyleMessages (route) {
-  const positions = route.filter(p => p.attributes.xpert &&
-      (Array.isArray(p.attributes.xpert) ? p.attributes.xpert.find(x => x.type === '4') : p.attributes.xpert.split(';').find(m => m.startsWith('4'))))
-
-  return positions.map(p => (Array.isArray(p.attributes.xpert) ? p.attributes.xpert.find(x => x.type === '4') : p.attributes.xpert.split(';').find(m => m.startsWith('4'))))
+function getCanDriverStyleMessages (xpertMessages) {
+  return xpertMessages.map(xpert => (Array.isArray(xpert) ? xpert.find(x => x.type === '4') : xpert.split(';').find(m => m.startsWith('4')))).filter(a => a)
 }
 
 exports.parseEndTripMessage = parseEndTripMessage