fleetmap-reports 1.0.896 → 1.0.898

package/package.json

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

package/src/activity-report.js

@@ -176,7 +176,7 @@ function processDevices (from, to, devices, data, userData) {
     if (userData.groupByDay) {
       const trips = deviceTrips.filter(t => userData.allWeek || !userData.weekDays || isInsideTimetable(t, userData) || isPartialInsideTimetable(t, userData, deviceRoute))
 
-      const dates = getDates(from, to, userData.user.attributes.timezone)
+      const dates = getDates(from, to, userData.user.attributes.timezone || getUserPartner(userData.user).timezone)
       for (const date of dates) {
         const fromByDay = new Date(date.getFullYear(), date.getMonth(), date.getDate(), 0, 0, 0)
         const toByDay = new Date(date.getFullYear(), date.getMonth(), date.getDate(), 23, 59, 59)

package/src/partnerReports/afriquia.js

@@ -6,11 +6,6 @@ const { convertToFeature, convertPositionToFeature } = require('../util/utils')
 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 = []

package/src/partnerReports/dailyuse-report.js

@@ -1,5 +1,5 @@
 const traccarHelper = require('../util/traccar')
-const { isInsideTimetable, isPartialInsideTimetable } = require('../util/trips')
+const { isInsideTimetable } = require('../util/trips')
 const { convertFromUTCDate } = require('../util/utils')
 
 async function createDailyUseReport (from, to, userData, traccar) {
@@ -7,13 +7,12 @@ async function createDailyUseReport (from, to, userData, traccar) {
 
   const devices = userData.devices
 
-  const allInOne = await traccarHelper.getAllInOne(traccar, from, to, devices, true, true, true, true)
+  const allInOne = await traccarHelper.getAllInOne(traccar, from, to, devices, false, true, true, true)
 
   for (const d of devices) {
     const group = userData.groups.find(g => g.id === d.groupId)
 
     const deviceTrips = allInOne.trips.filter(t => t.deviceId === d.id)
-    const deviceRoute = allInOne.route.filter(t => t.deviceId === d.id)
     const deviceStops = allInOne.stops.filter(t => t.deviceId === d.id)
 
     userData.weekDays = {
@@ -30,7 +29,7 @@ async function createDailyUseReport (from, to, userData, traccar) {
       endTime: '12:00'
     }
 
-    const morningTrips = deviceTrips.filter(t => isInsideTimetable(t, userData) || isPartialInsideTimetable(t, userData, deviceRoute))
+    const morningTrips = deviceTrips.filter(t => isInsideTimetable(t, userData))
     const morningStart = morningTrips.length && convertFromUTCDate(new Date(morningTrips[0].startTime), userData.user)
     const morningEnd = morningTrips.length && convertFromUTCDate(new Date(morningTrips[morningTrips.length - 1].endTime), userData.user)
 
@@ -39,7 +38,7 @@ async function createDailyUseReport (from, to, userData, traccar) {
       endTime: '23:59'
     }
 
-    const afternoonTrips = deviceTrips.filter(t => isInsideTimetable(t, userData) || isPartialInsideTimetable(t, userData, deviceRoute))
+    const afternoonTrips = deviceTrips.filter(t => isInsideTimetable(t, userData))
 
     const afternoonStart = afternoonTrips.length && convertFromUTCDate(new Date(afternoonTrips[0].startTime), userData.user)
     const afternoonEnd = afternoonTrips.length && convertFromUTCDate(new Date(afternoonTrips[afternoonTrips.length - 1].endTime), userData.user)

package/src/tests/activity.test.js

@@ -72,4 +72,14 @@ describe('activity report', function () {
     console.log(device)
     assert.equal(device.summary.reduce((a, b) => a + b.convertedSpentFuel, 0), 168.79999999999995)
   }, 800000)
+  it('Activity test performance', async () => {
+    const report = await getReports('q.trans', 'quality1214')
+    const userData = await report.getUserData()
+    console.log(userData)
+    userData.groupByDay = true
+    const data = await report.activityReport(new Date(2023, 7, 1, 0, 0, 0, 0),
+        new Date(2023, 31, 5, 23, 59, 59, 0),
+        userData)
+    assert.equal(data.length, 1)
+  }, 8000000)
 })

package/src/tests/index.test.js

@@ -2,6 +2,7 @@
 const { getReports } = require('./index')
 const assert = require('assert')
 const utils = require('../util/utils')
+const { createGPSJumpReport } = require('../partnerReports/gpsjump-report')
 
 // eslint-disable-next-line no-undef
 describe('Test_Reports', function () {
@@ -18,12 +19,19 @@ describe('Test_Reports', function () {
     const pdf = await report.speedingReportToPDF(userData, data[0])
     pdf.save()
   }, 40000)
-
   it('converts madrid time', async () => {
     assert.equal(false, utils.isClientSide())
     console.log(utils.convertToLocaleString(new Date(), 'es-CL', 'Europe/Madrid'))
   })
-
+  it('gps jump device', async () => {
+    const report = await getReports('HASSANE', 'movitec.1637')
+    const userData = await report.getUserData()
+    userData.devices = userData.devices.filter(d => d.id === 148725)
+    const data = await createGPSJumpReport(new Date(2023, 8, 22, 0, 0, 0, 0),
+      new Date(2023, 8, 24, 23, 59, 59, 0),
+      userData, report.traccar)
+    console.log(data)
+  }, 40000)
   it('Idle by device', async () => {
     const report = await getReports()
     const userData = await report.getUserData()
@@ -54,7 +62,7 @@ describe('Test_Reports', function () {
     const totalIdleTime = driver.idleEvents.reduce((a, b) => a + b.idleTime, 0)
     assert.equal(driver.idleEvents.length, 15) // Total Alerts
     assert.equal(totalIdleTime, 16000) // Total Duration
-  }, 20000)
+  }, 20000),
   // eslint-disable-next-line no-undef
   it('test allinone', async () => {
     console.log('Start')

package/src/tests/performance.test.js

@@ -2,6 +2,7 @@ const { getReports } = require('./index')
 const { createPerformanceReport } = require('../partnerReports/performance-report')
 const assert = require('assert')
 const { convertMS } = require('../util/utils')
+const {createDailyUseReport} = require("../partnerReports/dailyuse-report");
 // eslint-disable-next-line no-undef
 describe('performance', function () {
   // eslint-disable-next-line no-undef
@@ -33,4 +34,15 @@ describe('performance', function () {
     console.log(data)
     assert.equal(data[0].consumption, 168.51989999999998)
   }, 8000000)
+
+  it('dailyuse report inofleet', async () => {
+    const report = await getReports()
+    const userData = await report.getUserData()
+    const data = await createDailyUseReport(
+        new Date(Date.UTC(2023, 9, 1, 0, 0, 0, 0)),
+        new Date(Date.UTC(2023, 9, 1, 23, 59, 59, 0)),
+        userData,
+        report.traccar)
+    console.log(data)
+  }, 8000000)
 })

package/src/tests/zones.test.js

@@ -27,6 +27,18 @@ describe('zones', function () {
     console.log('result', result)
   }, 4000000)
 
+  it('works with afriquia', async () => {
+    const report = await getReports(process.env.USER_AFRIQUIA, process.env.PASS_AFRIQUIA)
+    const userData = await report.getUserData()
+    console.log(userData.devices.length)
+    console.log(userData.geofences)
+    const result = await report.zoneReport(
+        new Date(Date.UTC(2023, 5, 11, 0, 0, 0, 0)),
+        new Date(Date.UTC(2023, 5, 11, 23, 59, 59, 0)),
+        userData)
+    console.log('result', result)
+  }, 4000000)
+
   // eslint-disable-next-line no-undef
   it('works with casais', async () => {
     const report = await getReports(process.env.USER_CASAIS, process.env.PASS_CASAIS)