fleetmap-reports 1.0.807 → 1.0.809

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fleetmap-reports",
-  "version": "1.0.807",
+  "version": "1.0.809",
   "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 => {

package/src/partnerReports/afriquia.js

@@ -7,10 +7,6 @@ function calculateLastStopTime (stopTime, to, time) {
   return stopTime + (to.getTime() - new Date(time).getTime())
 }
 
-function calculateFirstStopTime (stopTime, from, time) {
-  return stopTime + (new Date(time).getTime() - from.getTime())
-}
-
 async function createActivityReport (from, to, userData, traccarInstance) {
   const unauthorizedGeofences = []
   const authorizedGeofences = []
@@ -126,4 +122,6 @@ async function createActivityReport (from, to, userData, traccarInstance) {
   return reportData
 }
 
+
+
 exports.createActivityReport = createActivityReport

package/src/tests/activity.test.js

@@ -7,13 +7,13 @@ describe('activity report', function () {
   it('Activity by device', async () => {
     const report = await getReports()
     const userData = await report.getUserData()
-
-    const data = await report.activityReport(new Date(2022, 0, 1, 0, 0, 0, 0),
-      new Date(2022, 0, 31, 23, 59, 59, 0),
+    userData.groupByDay = true
+    const data = await report.activityReport(new Date(2023, 0, 1, 0, 0, 0, 0),
+      new Date(2023, 0, 31, 23, 59, 59, 0),
       userData)
     assert.equal(data.length, 1)
     const device = data[0].devices.find(d => d.device.id === 22326)
-    assert.equal(device.summary[0].startOdometer, 0)
+    assert.equal(device.summary[0].startOdometer, 248891759.24)
     assert.equal(device.summary[0].distance, 0)
     assert.equal(device.summary[0].startTime, 0)
     assert.equal(device.summary[0].endTime, 0)