fleetmap-reports 2.0.342 → 2.0.344

package/package.json

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

package/src/trip-report.js

@@ -535,7 +535,9 @@ function exportTripReportToExcel (userData, reportData) {
     }
 
     tripsData.forEach(d => {
-      const group = userData.groups.find(g => g.id === d.device.groupId)
+      const group = userData.byDriver
+        ? userData.groups.find(g => g.drivers && g.drivers.includes(d.id))
+        : userData.groups.find(g => g.id === d.device.groupId)
       data = data.concat([{}])
       data = data.concat(d.trips.map(a => {
         return {
@@ -556,7 +558,7 @@ function exportTripReportToExcel (userData, reportData) {
           maxTemp: a.maxTemp,
           minTemp: a.minTemp,
           avgTemp: a.avgTemp && Number(a.avgTemp.toFixed(1)),
-          model: d.device.model,
+          model: d.device && d.device.model,
           group: group && group.name
         }
       }))

package/src/util/trips.js

@@ -219,7 +219,9 @@ function shouldRecalculate (trip, route) {
 function getTripTotalKms (trip, stop, route) {
   // we need to add stop kms to ensure that the total kms for the day, calculated with the odometer difference, will be equal to the sum of kms of all trips
   const stopKms = stop &&
-      !route.find(p => p.attributes.putAccumulators) && (stop.endOdometer - stop.startOdometer)
+      !route.find(p => p.attributes.putAccumulators
+          || p.protocol === 'startek') //fix ticket 2263
+      && (stop.endOdometer - stop.startOdometer)
   let distance = trip.distance + (stop && stopKms > 0 ? stopKms : 0)
   if (shouldRecalculate(trip, route)) {
     distance = 0