fleetmap-reports 1.0.899 → 1.0.901

package/package.json

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

package/src/partnerReports/afriquia.js

@@ -6,6 +6,11 @@ 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/tests/activity.test.js

@@ -72,14 +72,4 @@ 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,7 +2,6 @@
 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 () {
@@ -19,19 +18,12 @@ 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()
@@ -62,7 +54,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,7 +2,6 @@ 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
@@ -34,15 +33,4 @@ 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,18 +27,6 @@ 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)

package/src/util/timetable.js

@@ -11,13 +11,12 @@ function isInside (start, end, userData) {
     const startDate = isClientSide() ? startDateLocal : convertFromLocal(startDateLocal, userData.user.attributes.timezone)
     const endDate = isClientSide() ? endDateLocal : convertFromLocal(endDateLocal, userData.user.attributes.timezone)
 
-    // Trips inside time period
-    if (startDate.getTime() < endDate.getTime()) {
-      return tripStart.getTime() > startDate.getTime() && tripEnd.getTime() < endDate.getTime()
-    } else {
-      return (tripStart.getTime() < endDate.getTime() && tripEnd.getTime() < endDate.getTime()) ||
-                (tripStart.getTime() > startDate.getTime())
+    // next day
+    if (startDate.getTime() > endDate.getTime()) {
+      endDate.setDate(endDate.getDate() + 1)
     }
+    // Trips inside time period
+    return tripStart.getTime() > startDate.getTime() && tripEnd.getTime() < endDate.getTime()
   }
 
   return false

package/src/zone-report.js

@@ -145,7 +145,7 @@ async function processDevices (from, to, devices, userData, data) {
           const zoneInOutDayData = zoneInOutData.filter(z => (!z.inTime || (new Date(z.inTime.fixTime) < toByDay)) &&
               (!z.outTime || (new Date(z.outTime.fixTime) > fromByDay)))
 
-          const distanceOut = calculateDistanceOut(zoneInOutDayData, deviceRoute, fromByDay, toByDay, 'distanceOutAny')
+          const distanceOut = calculateDistanceOut(zoneInOutDayData, deviceRoute, fromByDay, toByDay, 'distanceOutAny', d)
 
           const geofences = geofencesData.map(g => {
             const day = g.days.find(day => day.date === date)