fleetmap-reports 1.0.718 → 1.0.720

package/package.json

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

package/src/activity-report.js

@@ -395,7 +395,7 @@ function exportActivityReportToPDFVehicle (doc, translations, reportData, userDa
     const group = userData.groups.find(g => d.device.groupId === g.id)
 
     const temp = [
-      d.summary[0].deviceName,
+      d.device.name,
       group ? group.name : '',
       d.summary[0].startTime ? new Date(d.summary[0].startTime).toLocaleString() : '',
       d.summary[0].endTime ? new Date(d.summary[0].endTime).toLocaleString() : '',
@@ -513,7 +513,7 @@ function exportActivityReportToExcelVehicleGroupByDay (settings, translations, r
       data = data.concat([{}])
       data = data.concat(d.summary.map(s => {
         return {
-          name: s.deviceName,
+          name: d.device.name,
           group: group ? group.name : '',
           date: new Date(s.date).toLocaleDateString(),
           weekday: weekDays[s.date.getDay()],
@@ -713,7 +713,7 @@ function exportActivityReportToExcelVehicle (settings, translations, reportData,
       const group = userData.groups.find(g => d.device.groupId === g.id)
 
       data = data.concat([{
-        name: d.summary[0].deviceName,
+        name: d.device.name,
         group: group ? group.name : '',
         start: d.summary[0].startTime ? new Date(d.summary[0].startTime).toLocaleString() : '',
         end: d.summary[0].endTime ? new Date(d.summary[0].endTime).toLocaleString() : '',

package/src/stop-report.js

@@ -7,6 +7,7 @@ const jsPDF = require('jspdf')
 const { headerFromUser, addTable } = require('./util/pdfDocument')
 const { getStyle } = require('./reportStyle')
 const { getUserPartner } = require('fleetmap-partners')
+const { calculateStopDuration } = require('./util/trips')
 
 const fileName = 'StopReport'
 
@@ -67,8 +68,7 @@ function processDevices (from, to, devices, data, userData) {
         stop.geofenceGroup = (group && group.name) || ''
       }
 
-      const totalStopTime = new Date(stop.endTime) - new Date(stop.startTime)
-      stop.stopDuration = totalStopTime > stop.engineHours ? (totalStopTime - stop.engineHours) : 0
+      stop.stopDuration = calculateStopDuration(stop)
     })
 
     if (deviceStops.length > 0) {

package/src/trip-report.js

@@ -10,7 +10,7 @@ const { headerFromUser, addTable } = require('./util/pdfDocument')
 const { getStyle } = require('./reportStyle')
 const traccarHelper = require('./util/traccar')
 const trips = require('./util/trips')
-const { isInsideTimetable, isPartialInsideTimetable, calculateTrip, getTripIdleTime } = require('./util/trips')
+const { isInsideTimetable, isPartialInsideTimetable, calculateTrip, getTripIdleTime, calculateStopDuration } = require('./util/trips')
 const { devicesToProcess, deviceName } = require('./util/device')
 const { getIdleEvents } = require('./util/route')
 const { reportByDriver, getDriverName, getDriverData } = require('./util/driver')
@@ -179,7 +179,7 @@ function processDevices (from, to, devices, data, userData, traccar) {
       const stop = getStop(new Date(trip.startTime), stops)
 
       if (stop && !trip.endTimeIsOut) {
-        trip.stopDuration = ((new Date(stop.endTime) - new Date(stop.startTime)) - stop.engineHours)
+        trip.stopDuration = calculateStopDuration(stop)
         trip.stopEngineHours = trip.idleTime + stop.engineHours
       } else {
         trip.stopDuration = 0

package/src/util/trips.js

@@ -141,8 +141,15 @@ function getTripIdleTime (trip, idleEvents) {
   return idleEventsInsideTrip.reduce((a, b) => a + b.idleTime, 0)
 }
 
+function calculateStopDuration (stop) {
+  const totalStopTime = new Date(stop.endTime) - new Date(stop.startTime)
+  if (totalStopTime < stop.engineHours) return 0
+  return totalStopTime - (stop.engineHours > 0 ? stop.engineHours : 0)
+}
+
 exports.checkTripsKms = checkTripsKms
 exports.isInsideTimetable = isInsideTimetable
 exports.isPartialInsideTimetable = isPartialInsideTimetable
 exports.calculateTrip = calculateTrip
 exports.getTripIdleTime = getTripIdleTime
+exports.calculateStopDuration = calculateStopDuration