fleetmap-reports 2.0.54 → 2.0.56

package/package.json

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

package/src/activity-report.js

@@ -171,7 +171,14 @@ async function processDevices (from, to, devices, data, userData, traccarInstanc
 
     const summary = []
     if (userData.groupByDay) {
-      const trips = deviceTrips.filter(t => userData.allWeek || !userData.weekDays || isInsideTimetable(t, userData) || isPartialInsideTimetable(t, userData, deviceRoute))
+      const trips = []
+      for (const t of deviceTrips) {
+        const isInside = isInsideTimetable(t, userData)
+        const isPartialInside = await isPartialInsideTimetable(t, userData, deviceRoute)
+        if (userData.allWeek || !userData.weekDays || isInside || isPartialInside) {
+          trips.push(t)
+        }
+      }
       const dates = getDates(from, to, userData.user.attributes.timezone || getUserPartner(userData.user).timezone)
       for (const date of dates) {
         const { tripsByDay, routeByDay } = await getDataByDay(d, date, { trips, route: deviceRoute }, userData, traccarInstance)

package/src/kms-report.js

@@ -44,8 +44,8 @@ async function createKmsReportByDevice (from, to, userData, traccarInstance) {
   }
 
   if (isClientSide() && (allDevices.length > 50 || ((new Date(to).getTime() - new Date(from).getTime()) > (1000 * 60 * 60 * 24 * 15))) && userData.groupByDay) {
-    const sliced = automaticReports.sliceArray(allDevices, 2)
-    await executeServerSide('kms-report', sliced, from, to, userData, allDevices.length, traccarInstance, 1).then(devices => {
+    const sliced = automaticReports.sliceArray(allDevices, 1)
+    await executeServerSide('kms-report', sliced, from, to, userData, allDevices.length, traccarInstance).then(devices => {
       allData.devices = devices
     })
   } else {

package/src/tests/activity.test.js

@@ -72,4 +72,28 @@ describe('activity report', function () {
     console.log(device)
     assert.equal(device.summary.reduce((a, b) => a + b.convertedSpentFuel, 0), 168.79999999999995)
   }, 800000)
+  // eslint-disable-next-line no-undef
+  it('works with timetable', async () => {
+    const report = await getReports()
+    const userData = await report.getUserData()
+    userData.groupByDay = true
+    userData.allWeek = false
+    userData.weekDays = {
+      sunday: true,
+      monday: true,
+      tuesday: true,
+      wednesday: true,
+      thursday: true,
+      friday: true,
+      saturday: true
+    }
+    userData.dayHours = {
+      startTime: '22:00',
+      endTime: '05:00'
+    }
+    const data = await report.activityReport(new Date(2024, 1, 1, 0, 0, 0, 0),
+      new Date(2024, 1, 28, 23, 59, 59, 0),
+      userData)
+    assert.equal(data.length, 1)
+  }, 800000)
 })

package/src/util/timetable.js

@@ -1,27 +1,27 @@
 const { weekDaySelected, convertFromUTC, isClientSide, convertFromLocal } = require('./utils')
 
-function isInside (start, end, userData) {
-  const tripStart = new Date(start)
-  const tripEnd = new Date(end)
+function isInside (_tripStart, _tripEnd, userData) {
+  const tripStart = new Date(_tripStart)
+  const tripEnd = new Date(_tripEnd)
 
   if (weekDaySelected(tripStart, userData.weekDays)) {
-    const startDateLocal = new Date(convertFromUTC(start, userData.user.attributes.timezone).toISOString().split('T')[0] + ' ' + userData.dayHours.startTime)
-    const endDateLocal = new Date(convertFromUTC(end, userData.user.attributes.timezone).toISOString().split('T')[0] + ' ' + userData.dayHours.endTime)
+    const timeWindowStartLocal = new Date(convertFromUTC(_tripStart, userData.user.attributes.timezone).toISOString().split('T')[0] + ' ' + userData.dayHours.startTime)
+    const timeWindowEndLocal = new Date(convertFromUTC(_tripEnd, userData.user.attributes.timezone).toISOString().split('T')[0] + ' ' + userData.dayHours.endTime)
 
-    const startDate = isClientSide() ? startDateLocal : convertFromLocal(startDateLocal, userData.user.attributes.timezone)
-    const endDate = isClientSide() ? endDateLocal : convertFromLocal(endDateLocal, userData.user.attributes.timezone)
+    const timeWindowStartUTC = isClientSide() ? timeWindowStartLocal : convertFromLocal(timeWindowStartLocal, userData.user.attributes.timezone)
+    const timeWindowEndUTC = isClientSide() ? timeWindowEndLocal : convertFromLocal(timeWindowEndLocal, userData.user.attributes.timezone)
 
-    if (startDate.getTime() > endDate.getTime()) {
-      const startDatePreviousDay = new Date(startDate)
-      startDatePreviousDay.setDate(startDate.getDate() - 1)
-      const endDateNextDay = new Date(endDate)
-      endDateNextDay.setDate(endDate.getDate() + 1)
+    if (timeWindowStartUTC.getTime() > timeWindowEndUTC.getTime()) {
+      const startDatePreviousDay = new Date(timeWindowStartUTC)
+      startDatePreviousDay.setDate(timeWindowStartUTC.getDate() - 1)
+      const endDateNextDay = new Date(timeWindowEndUTC)
+      endDateNextDay.setDate(timeWindowEndUTC.getDate() + 1)
 
-      return (tripStart.getTime() > startDatePreviousDay.getTime() && tripEnd.getTime() < endDate.getTime()) ||
-          (tripStart.getTime() > startDate.getTime() && tripEnd.getTime() < endDateNextDay.getTime())
+      return (tripStart.getTime() > startDatePreviousDay.getTime() && tripEnd.getTime() < timeWindowEndUTC.getTime()) ||
+          (tripStart.getTime() > timeWindowStartUTC.getTime() && tripEnd.getTime() < endDateNextDay.getTime())
     }
     // Trips inside time period
-    return tripStart.getTime() > startDate.getTime() && tripEnd.getTime() < endDate.getTime()
+    return tripStart.getTime() > timeWindowStartUTC.getTime() && tripEnd.getTime() < timeWindowEndUTC.getTime()
   }
 
   return false

package/src/util/trips.js

@@ -111,8 +111,8 @@ function isPartialInsideTimetable (t, userData, route) {
 }
 
 async function getDataByDay (device, date, data, userData, traccarInstance) {
-  const startDateLocal = new Date(convertFromUTC(date, userData.user.attributes.timezone).toISOString().split('T')[0] + ' ' + userData.dayHours.startTime)
-  const endDateLocal = new Date(convertFromUTC(date, userData.user.attributes.timezone).toISOString().split('T')[0] + ' ' + userData.dayHours.endTime)
+  const startDateLocal = new Date(convertFromUTC(date, userData.user.attributes.timezone).toISOString().split('T')[0] + ' 00:00:00')
+  const endDateLocal = new Date(convertFromUTC(date, userData.user.attributes.timezone).toISOString().split('T')[0] + ' 23:59:59')
   const startDate = isClientSide() ? startDateLocal : convertFromLocal(startDateLocal, userData.user.attributes.timezone)
   const endDate = isClientSide() ? endDateLocal : convertFromLocal(endDateLocal, userData.user.attributes.timezone)
 

package/src/util/utils.js

@@ -265,6 +265,12 @@ async function executeServerSide (type, sliced, from, to, userData, totalItems,
     }))
   }
 
+  if (userData.byDriver) {
+    reportData.sort((a, b) => (a.driver.name > b.driver.name) ? 1 : -1)
+  } else {
+    reportData.sort((a, b) => (a.device.name > b.device.name) ? 1 : -1)
+  }
+
   return reportData
 }