From 4619461af8cc7efb6b4f5e71aeb92bfb7bf13996 Mon Sep 17 00:00:00 2001 From: lana-k Date: Wed, 5 May 2021 15:08:54 +0200 Subject: [PATCH] change period format --- src/lib/utils/time.js | 35 +++-------------------------------- tests/lib/utils/time.spec.js | 14 +++++++------- 2 files changed, 10 insertions(+), 39 deletions(-) diff --git a/src/lib/utils/time.js b/src/lib/utils/time.js index 8295734..3d276b1 100644 --- a/src/lib/utils/time.js +++ b/src/lib/utils/time.js @@ -1,36 +1,7 @@ export default { getPeriod (start, end) { - let diff = end.getTime() - start.getTime() - let result = '' - - const days = Math.floor(diff / (1000 * 60 * 60 * 24)) - diff -= days * (1000 * 60 * 60 * 24) - if (days) { - result += days + ' d ' - } - - const hours = Math.floor(diff / (1000 * 60 * 60)) - diff -= hours * (1000 * 60 * 60) - if (hours) { - result += hours + ' h ' - } - - const mins = Math.floor(diff / (1000 * 60)) - diff -= mins * (1000 * 60) - if (mins) { - result += mins + ' m ' - } - - const seconds = Math.floor(diff / (1000)) - diff -= seconds * (1000) - if (seconds) { - result += seconds + ' s ' - } - - if (diff) { - result += diff + ' ms ' - } - - return result.replace(/\s$/, '') + const diff = end.getTime() - start.getTime() + const seconds = diff / 1000 + return seconds.toFixed(3) + 's' } } diff --git a/tests/lib/utils/time.spec.js b/tests/lib/utils/time.spec.js index d33b7c9..a7b0807 100644 --- a/tests/lib/utils/time.spec.js +++ b/tests/lib/utils/time.spec.js @@ -6,18 +6,18 @@ describe('time.js', () => { // 1.01.2021 13:00:00 000 let start = new Date(2021, 0, 1, 13, 0, 0, 0) - // 3.01.2021 22:15:20 500 - let end = new Date(2021, 0, 3, 22, 15, 20, 500) + // 1.01.2021 13:01:00 500 + let end = new Date(2021, 0, 1, 13, 1, 0, 500) - expect(time.getPeriod(start, end)).to.equal('2 d 9 h 15 m 20 s 500 ms') + expect(time.getPeriod(start, end)).to.equal('60.500s') // 1.01.2021 13:00:00 000 start = new Date(2021, 0, 1, 13, 0, 0, 0) - // 1.01.2021 22:00:20 000 - end = new Date(2021, 0, 1, 22, 0, 20, 0) + // 1.01.2021 13:00:20 500 + end = new Date(2021, 0, 1, 13, 0, 20, 500) - expect(time.getPeriod(start, end)).to.equal('9 h 20 s') + expect(time.getPeriod(start, end)).to.equal('20.500s') // 1.01.2021 13:00:00 000 start = new Date(2021, 0, 1, 13, 0, 0, 0) @@ -25,6 +25,6 @@ describe('time.js', () => { // 1.01.2021 13:00:00 45 end = new Date(2021, 0, 1, 13, 0, 0, 45) - expect(time.getPeriod(start, end)).to.equal('45 ms') + expect(time.getPeriod(start, end)).to.equal('0.045s') }) })