fleetmap-reports 1.0.803 → 1.0.805

package/package.json

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

package/src/location-report.js

@@ -325,6 +325,11 @@ function getDigitalPortValue (row, index, translations, dAttributes) {
           ? dAttributes.sensor1on || row.attributes.sensor
           : dAttributes.sensor1off || row.attributes.sensor
       }
+      if (row.attributes && row.attributes[dAttributes.sensor1Attribute] !== undefined) {
+        return row.attributes[dAttributes.sensor1Attribute]
+          ? dAttributes.sensor1on || row.attributes.sensor
+          : dAttributes.sensor1off || row.attributes.sensor
+      }
       break
     case 2:
       if (row.attributes && row.attributes.door2) {

package/src/partnerReports/afriquia.js

@@ -7,6 +7,10 @@ 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 = []
@@ -122,6 +126,4 @@ async function createActivityReport (from, to, userData, traccarInstance) {
   return reportData
 }
 
-
-
 exports.createActivityReport = createActivityReport

package/src/tests/activity.test.js

@@ -7,9 +7,9 @@ describe('activity report', function () {
   it('Activity by device', async () => {
     const report = await getReports()
     const userData = await report.getUserData()
-    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),
+
+    const data = await report.activityReport(new Date(2022, 0, 1, 0, 0, 0, 0),
+      new Date(2022, 0, 31, 23, 59, 59, 0),
       userData)
     assert.equal(data.length, 1)
     const device = data[0].devices.find(d => d.device.id === 22326)