fleetmap-reports 2.0.51 → 2.0.53

package/package.json

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

package/src/tests/kms.test.js

@@ -58,7 +58,16 @@ describe('Kms_Reports', function () {
     userData.byDriver = true
     console.log(userData.drivers)
     const data = await reports.kmsReport(new Date(2024, 0, 1, 0, 0, 0), new Date(2024, 0, 31, 23, 59, 59),
-        userData)
+      userData)
     assert.equal(data.length, 1)
   }, 3000000)
+  it('KmsReport by timezone marrocos', async () => {
+    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 device = data[0].devices.find(d => d.device.id === 292563)
+    assert.equal(device, 1)
+  }, 3000000)
 })

package/src/util/traccar.js

@@ -135,13 +135,13 @@ async function getSummaryByDay (dates, userData, traccarInstance, allDevices, ig
   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().slice(0, 8))
+      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)))
       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().slice(0, 8))
+      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)))
       endDateLocal = endDateLocal.getTime() < _endDateLocal.getTime() ? endDateLocal : _endDateLocal
     }
 

package/src/util/utils.js

@@ -240,7 +240,7 @@ async function executeServerSide (type, sliced, from, to, userData, totalItems,
     await Promise.all(_sliced.map(async items => {
       const url = `https://${getServerHost()}/reports/${type}`
       try {
-        const data = await axios.post(url, {
+        await axios.post(url, {
           from,
           to,
           userData: userData.byDriver
@@ -254,8 +254,9 @@ async function executeServerSide (type, sliced, from, to, userData, totalItems,
                 devices: items,
                 geofences: []
               }
-        }, { withCredentials: true }).then(d => d.data)
-        reportData.push(...(userData.byDriver ? data[0].drivers : data[0].devices))
+        }, { withCredentials: true }).then(d => {
+          reportData.push(...(userData.byDriver ? d.data[0].drivers : d.data[0].devices))
+        })
         itemsCount = itemsCount + items.length
       } catch (e) {
         console.error(e)