fleetmap-reports 1.0.970 → 1.0.972

package/package.json

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

package/src/activity-report.js

@@ -105,7 +105,7 @@ async function createActivityReportByDevice (from, to, userData, traccarInstance
     let summaryByDay = []
     if (userData.allWeek && userData.groupByDay) {
       const dates = getDates(from, to, userData.user.attributes.timezone || getUserPartner(userData.user).timezone)
-      summaryByDay = await getSummaryByDay(dates, userData, traccarInstance, allDevices, true)
+      summaryByDay = await getSummaryByDay(dates, userData, traccarInstance, allDevices, true, from, to)
     }
 
     let deviceCount = 0

package/src/fuelconsumption-report.js

@@ -26,7 +26,7 @@ async function createFuelConsumptionReport (from, to, userData, traccar) {
 
   const allInOne = await traccarHelper.getAllInOne(traccar, from, to, devices, true, true, false, false)
   const dates = getDates(from, to, userData.user.attributes.timezone || getUserPartner(userData.user).timezone)
-  const summary = await getSummaryByDay(dates, userData, traccar, devices)
+  const summary = await getSummaryByDay(dates, userData, traccar, devices, true, from, to)
 
   const fuelServicesData = []
   if (devices.some(d => d.attributes.odooId)) {

package/src/kms-report.js

@@ -50,7 +50,7 @@ async function createKmsReportByDevice (from, to, userData, traccarInstance) {
   } else {
     if (userData.allWeek && userData.groupByDay) {
       const dates = getDates(from, to, userData.user.attributes.timezone || getUserPartner(userData.user).timezone)
-      const summary = await getSummaryByDay(dates, userData, traccarInstance, allDevices)
+      const summary = await getSummaryByDay(dates, userData, traccarInstance, allDevices, false, from, to)
       for (const device of allDevices) {
         const days = []
         dates.forEach(date => {

package/src/tests/performance.test.js

@@ -2,7 +2,9 @@ const { getReports } = require('./index')
 const { createPerformanceReport, exportPerformanceReportToExcel } = require('../partnerReports/performance-report')
 const assert = require('assert')
 const { convertMS } = require('../util/utils')
-const xlsx = require("@jcardus/json-as-xlsx");
+const xlsx = require('@jcardus/json-as-xlsx')
+const {createActivityReport} = require("../activity-report");
+const {createFuelConsumptionReport} = require("../fuelconsumption-report");
 
 // eslint-disable-next-line no-undef
 describe('performance', function () {
@@ -29,11 +31,19 @@ describe('performance', function () {
     const userData = await report.getUserData()
     userData.devices = userData.devices.filter(d => d.id === 126442)
     const data = await createPerformanceReport(
-      new Date(Date.UTC(2023, 11, 9, 0, 0, 0, 0)),
-      new Date(Date.UTC(2023, 11, 18, 23, 59, 59, 0)),
+      new Date(Date.UTC(2023, 11, 9, 14, 58, 0, 0)),
+      new Date(Date.UTC(2023, 11, 18, 9, 28, 0, 0)),
       userData,
       report.traccar)
     console.log(data)
+
+    const data2 = await createFuelConsumptionReport(
+      new Date(Date.UTC(2023, 11, 9, 14, 58, 0, 0)),
+      new Date(Date.UTC(2023, 11, 18, 9, 28, 0, 0)),
+      userData,
+      report.traccar)
+    console.log(data2)
+
     assert.equal(data[0].consumption, 168.51989999999998)
   }, 8000000)
 

package/src/util/traccar.js

@@ -129,12 +129,22 @@ async function getAllInOne (
   }
 }
 
-async function getSummaryByDay (dates, userData, traccarInstance, allDevices, ignorePercentage = false) {
+async function getSummaryByDay (dates, userData, traccarInstance, allDevices, ignorePercentage = false, from, to) {
   const days = []
   let counter = 0
-  for (const date of dates) {
-    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)
+  for (const [index, date] of dates.entries()) {
+    let startDateLocal = new Date(convertFromUTC(date, userData.user.attributes.timezone).toISOString().split('T')[0] + ' ' + userData.dayHours.startTime)
+    if (index === 0) {
+      const _startDateLocal = new Date(convertFromUTC(date, userData.user.attributes.timezone).toISOString().split('T')[0] + ' ' + from.toTimeString())
+      startDateLocal = startDateLocal.getTime() > _startDateLocal.getTime() ? startDateLocal : _startDateLocal
+    }
+
+    let endDateLocal = new Date(convertFromUTC(date, userData.user.attributes.timezone).toISOString().split('T')[0] + ' ' + userData.dayHours.endTime)
+    if (index === dates.length - 1) {
+      const _endDateLocal = new Date(convertFromUTC(date, userData.user.attributes.timezone).toISOString().split('T')[0] + ' ' + to.toTimeString())
+      endDateLocal = endDateLocal.getTime() < _endDateLocal.getTime() ? endDateLocal : _endDateLocal
+    }
+
     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

@@ -109,6 +109,8 @@ function convertToFeature (geofence) {
 function getDates (startDate, endDate, timezone) {
   const dates = []
   let currentDate = new Date(startDate.getFullYear(), startDate.getMonth(), startDate.getDate(), 12, 0, 0, 0)
+  const _endDate = new Date(endDate.getFullYear(), endDate.getMonth(), endDate.getDate(), 23, 59, 59, 0)
+
   if (!isClientSide() && timezone) {
     const startDateUserTimezone = convertFromUTC(startDate, timezone)
     currentDate = new Date(startDateUserTimezone.getFullYear(), startDateUserTimezone.getMonth(), startDateUserTimezone.getDate(), 12, 0, 0, 0)
@@ -118,7 +120,7 @@ function getDates (startDate, endDate, timezone) {
     date.setDate(date.getDate() + days)
     return date
   }
-  while (currentDate <= endDate) {
+  while (currentDate <= _endDate) {
     dates.push(currentDate)
     currentDate = addDays.call(currentDate, 1)
   }