fleetmap-reports 1.0.808 → 1.0.810

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fleetmap-reports",
-  "version": "1.0.808",
+  "version": "1.0.810",
   "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,9 +224,7 @@ function processDevices (from, to, devices, data, userData) {
           endAddress: trips.length && trips[trips.length - 1].endAddress
         })
       } else {
-        if (data.summaries) {
-          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 => {

package/src/events-report.js

@@ -226,7 +226,7 @@ function getEventType (a, translations, device) {
     if (a.attributes.alarm === 'sensor') { sensor = device.attributes.sensor1 }
     return sensor || translations.report['event_' + a.attributes.alarm] || a.attributes.alarm
   } else {
-    return translations.report['event_' + a.type]
+    return translations.report['event_' + a.type] || a.type
   }
 }