fleetmap-reports 1.0.802 → 1.0.804

package/package.json

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

package/src/activity-report.js

@@ -51,16 +51,16 @@ async function createActivityReportByGroup (from, to, userData, traccarInstance)
       }
 
       const response = await traccarInstance.reports.reportsSummaryGet(from, to, null, [g.id])
-      const summaries = response.data
+      const summary = response.data
 
       const responseTrips = await traccarInstance.reports.reportsTripsGet(from, to, null, [g.id])
       const trips = responseTrips.data
 
       devices.sort((a, b) => (a.name > b.name) ? 1 : -1)
 
-      if (summaries.length > 0) {
-        console.log('Summary:' + summaries.length)
-        groupData.devices = processDevices(from, to, devices, { summaries, trips }, userData)
+      if (summary.length > 0) {
+        console.log('Summary:' + summary.length)
+        groupData.devices = processDevices(from, to, devices, { summary, trips }, userData)
 
         reportData.push(groupData)
       }
@@ -224,7 +224,7 @@ function processDevices (from, to, devices, data, userData) {
           endAddress: trips.length && trips[trips.length - 1].endAddress
         })
       } else {
-        summary.push(...data.summaries.filter(s => s.deviceId === d.id))
+        summary.push(...data.summary.filter(s => s.deviceId === d.id))
 
         if (summary.length) {
           summary.forEach(s => {
@@ -401,7 +401,7 @@ function exportActivityReportToPDFVehicle (doc, translations, reportData, userDa
         Math.round(d.summary[0].averageSpeed * 1.85200),
         Math.round(d.summary[0].maxSpeed * 1.85200),
         convertMS(d.summary[0].engineHours),
-        d.summary[0].convertedSpentFuel >= 0 ? d.summary[0].convertedSpentFuel : 0
+        Math.round(d.summary[0].convertedSpentFuel >= 0 ? d.summary[0].convertedSpentFuel : 0)
       ]
       data.push(temp)
     }
@@ -457,7 +457,7 @@ function exportActivityReportToPDFVehicleGroupByDay (doc, translations, reportDa
         Math.round(s.averageSpeed * 1.85200),
         Math.round(s.maxSpeed * 1.85200),
         convertMS(s.engineHours),
-        s.convertedSpentFuel >= 0 ? s.convertedSpentFuel : 0
+        Math.round(s.convertedSpentFuel >= 0 ? s.convertedSpentFuel : 0)
       ]
 
       data.push(temp)
@@ -522,7 +522,7 @@ function exportActivityReportToExcelVehicleGroupByDay (settings, translations, r
           avgSpeed: Math.round(s.averageSpeed * 1.85200),
           maxSpeed: Math.round(s.maxSpeed * 1.85200),
           engineHours: convertMS(s.engineHours),
-          spentFuel: s.convertedSpentFuel >= 0 ? s.convertedSpentFuel : 0
+          spentFuel: Math.round(s.convertedSpentFuel >= 0 ? s.convertedSpentFuel : 0)
         }
       }))
     })
@@ -721,7 +721,7 @@ function exportActivityReportToExcelVehicle (settings, translations, reportData,
           avgSpeed: Math.round(d.summary[0].averageSpeed * 1.85200),
           maxSpeed: Math.round(d.summary[0].maxSpeed * 1.85200),
           engineHours: convertMS(d.summary[0].engineHours),
-          spentFuel: d.summary[0].convertedSpentFuel >= 0 ? d.summary[0].convertedSpentFuel : 0
+          spentFuel: Math.round(d.summary[0].convertedSpentFuel >= 0 ? d.summary[0].convertedSpentFuel : 0)
         }])
       }
     })