fleetmap-reports 1.0.724 → 1.0.726

package/package.json

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

package/src/tests/index.test.js

@@ -160,32 +160,6 @@ describe('Test_Reports', function () {
     assert.equal(driver.positions.length, 85) // Total Positions
   }, 20000)
   // eslint-disable-next-line no-undef
-  it('KmsReport by device', async () => {
-    const reports = await getReports()
-    const userData = await reports.getUserData()
-    userData.devices = userData.devices.filter(d => d.id === 22326)
-    const data = await reports.kmsReport(new Date(2021, 10, 1, 0, 0, 0), new Date(2021, 10, 31, 23, 59, 59),
-      userData)
-    assert.equal(data.length, 1)
-    assert.equal(data.length, 1)
-    const device = data[0].devices.find(d => d.device.id === 22326)
-    assert.equal(device.summary.distance, 1183950.9299999475) // Total Kms
-  }, 30000)
-  // eslint-disable-next-line no-undef
-  it('KmsReport byDevice groupByDay', async () => {
-    const reports = await getReports()
-    const userData = await reports.getUserData()
-    userData.devices = userData.devices.filter(d => d.id === 22326)
-    userData.groupByDay = true
-    const data = await reports.kmsReport(new Date(2021, 10, 1, 0, 0, 0), new Date(2021, 10, 10, 23, 59, 59),
-      userData)
-    assert.equal(data.length, 1)
-    assert.equal(data.length, 1)
-    const device = data[0].devices.find(d => d.device.id === 22326)
-    assert.equal(device.days.length, 10) // Total Kms
-    assert.equal(device.days[5].kms, 23124.280000001192) // Total Kms
-  }, 30000)
-  // eslint-disable-next-line no-undef
   it('Idle by device', async () => {
     const report = await getReports()
     const userData = await report.getUserData()

package/src/tests/kms.test.js

@@ -0,0 +1,45 @@
+/* eslint-disable no-undef */
+const { getReports } = require('./index')
+const assert = require('assert')
+
+describe('Kms_Reports', function () {
+  // eslint-disable-next-line no-undef
+  it('KmsReport by device', async () => {
+    const reports = await getReports()
+    const userData = await reports.getUserData()
+    userData.devices = userData.devices.filter(d => d.id === 22326)
+    const data = await reports.kmsReport(new Date(2021, 10, 1, 0, 0, 0), new Date(2021, 10, 31, 23, 59, 59),
+      userData)
+    assert.equal(data.length, 1)
+    assert.equal(data.length, 1)
+    const device = data[0].devices.find(d => d.device.id === 22326)
+    assert.equal(device.summary.distance, 1183950.9299999475) // Total Kms
+  }, 30000)
+  // eslint-disable-next-line no-undef
+  it('KmsReport byDevice groupByDay', async () => {
+    const reports = await getReports()
+    const userData = await reports.getUserData()
+    userData.devices = userData.devices.filter(d => d.id === 22326)
+    userData.groupByDay = true
+    const data = await reports.kmsReport(new Date(2021, 10, 1, 0, 0, 0), new Date(2021, 10, 10, 23, 59, 59),
+      userData)
+    assert.equal(data.length, 1)
+    assert.equal(data.length, 1)
+    const device = data[0].devices.find(d => d.device.id === 22326)
+    assert.equal(device.days.length, 10) // Total Kms
+    assert.equal(device.days[5].kms, 23124.280000001192) // Total Kms
+  }, 30000)
+  // eslint-disable-next-line no-undef
+  it('KmsReport by device2', async () => {
+    const reports = await getReports()
+    const userData = await reports.getUserData()
+    userData.groupByDay = true
+    userData.devices = userData.devices.filter(d => d.id === 25000)
+    const data = await reports.kmsReport(new Date(2023, 4, 26, 0, 0, 0), new Date(2023, 5, 24, 23, 59, 59),
+      userData)
+    assert.equal(data.length, 1)
+    const device = data[0].devices.find(d => d.device.id === 25000)// Total Kms
+    assert.equal(device.days.length, 30) // Total Kms
+    assert.equal(device.days[29].kms, 136174.93281451002) // Total Kms
+  }, 30000)
+})

package/src/util/parallel.js

@@ -5,7 +5,7 @@ exports.parallel = (report, method, toSlice, ...args) => {
   try {
     const cluster = require('cluster')
     const numCPUs = require('os').cpus().length
-    return new Promise((resolve) => {
+    return new Promise((resolve, reject) => {
       if (cluster.isPrimary) {
         console.log(`Master ${process.pid} is running`, process.cwd())
         cluster.setupPrimary({
@@ -15,19 +15,24 @@ exports.parallel = (report, method, toSlice, ...args) => {
         const _result = []
         let done = 0
         sliced.forEach((slice) => {
-          const worker = cluster.fork()
-          worker.send({
-            report,
-            method,
-            args: [slice, ...args]
-          })
-          worker.on('message', ({result}) => {
-            console.log('Received result from worker', worker.process.pid)
-            _result.push(result)
-            if (++done === sliced.length) {
-              resolve(_result.flat())
-            }
-          })
+          try {
+            const worker = cluster.fork()
+            worker.send({
+              report,
+              method,
+              args: [slice, ...args]
+            })
+            worker.on('message', ({ result }) => {
+              console.log('Received result from worker', worker.process.pid)
+              _result.push(result)
+              if (++done === sliced.length) {
+                resolve(_result.flat())
+              }
+            })
+          } catch (e) {
+            console.error(report, method, slice, e)
+            reject(e)
+          }
         })
 
         cluster.on('exit', (worker, code, signal) => {

package/src/util/utils.js

@@ -192,8 +192,11 @@ function getTimezoneOffset (timezone) {
 }
 
 function convertFromUTC (value, timezone) {
-  const offset = getTimezoneOffset(timezone)
+  if (isClientSide()) {
+    return new Date(value)
+  }
 
+  const offset = getTimezoneOffset(timezone)
   const valueDate = new Date(value)
   valueDate.setTime(valueDate.getTime() - (offset * 60 * 1000))
   return valueDate