fleetmap-reports 2.0.59 → 2.0.61

package/package.json

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

package/src/tests/kms.test.js

@@ -1,6 +1,7 @@
 /* eslint-disable no-undef */
 const { getReports } = require('./index')
 const assert = require('assert')
+const {convertFromUTC, convertFromLocal} = require("../util/utils");
 
 describe('Kms_Reports', function () {
   // eslint-disable-next-line no-undef
@@ -65,8 +66,8 @@ describe('Kms_Reports', function () {
     const reports = await getReports(process.env.email, process.env.password)
     const userData = await reports.getUserData()
     userData.groupByDay = true
-    const data = await reports.kmsReport(new Date(2024, 0, 31, 23, 0, 0), new Date(2024, 1, 28, 22, 59, 59),
-        userData)
+    const data = await reports.kmsReport(convertFromLocal(new Date(2024, 3, 5, 0, 0, 0), userData.user.attributes.timezone), convertFromLocal(new Date(2024, 3, 5, 23, 59, 59), userData.user.attributes.timezone),
+      userData)
     const device = data[0].devices.find(d => d.device.id === 292563)
     assert.equal(device, 1)
   }, 3000000)

package/src/util/traccar.js

@@ -132,23 +132,19 @@ async function getAllInOne (
 async function getSummaryByDay (dates, userData, traccarInstance, allDevices, ignorePercentage = false, from, to) {
   const days = []
   let counter = 0
-  console.log('dates', dates.length)
   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] + ' ' + (isClientSide() ? from.toTimeString().slice(0, 8) : convertFromUTC(from, userData.user.attributes.timezone).toTimeString().slice(0, 8)))
-      console.log(_startDateLocal)
       startDateLocal = startDateLocal.getTime() > _startDateLocal.getTime() ? startDateLocal : _startDateLocal
     }
 
-    console.log(convertFromUTC(date, userData.user.attributes.timezone).toISOString().split('T')[0] + ' ' + userData.dayHours.endTime)
     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] + ' ' + (isClientSide() ? to.toTimeString().slice(0, 8) : convertFromUTC(to, userData.user.attributes.timezone).toTimeString().slice(0, 8)))
-      console.log(_endDateLocal)
       endDateLocal = endDateLocal.getTime() < _endDateLocal.getTime() ? endDateLocal : _endDateLocal
     }
-    console.log(date, startDateLocal, endDateLocal)
+
     const startDate = isClientSide() ? startDateLocal : convertFromLocal(startDateLocal, userData.user.attributes.timezone)
     const endDate = isClientSide() ? endDateLocal : convertFromLocal(endDateLocal, userData.user.attributes.timezone)
 

package/src/zone-report.js

@@ -694,7 +694,7 @@ function exportZoneReportToExcel (userData, reportData) {
   }
   const headers = []
   if (userData.groupByDay) {
-    headers.push([
+    headers.push(...[
       { label: translations.report.geofence, value: 'zone' },
       { label: translations.report.vehicle, value: 'name' },
       { label: translations.report.date, value: 'date' },