opendev/gerrit
Code Issues Proposed changes

Fix issue with rounding in calculation of time duration

Browse Source 
Before fix, fromNow function will calculation duration between
9:30 and 12:00 as 3 hours ago, but duration is only 2 hours and 30
minutes.

Using floor function instead of round will produce in the example
2 hours ago as expected.

Change-Id: I62506f0d906656c53665c02791467b0aa7bff0c5
This commit is contained in:
Milutin Kristofic
2021-01-25 10:47:34 +01:00
parent 9d76606167
commit fa21e8d789
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
polygerrit-ui/app/utils/date-util.ts
View File

@@ -39,25 +39,25 @@ export function isValidDate(date: any): date is Date {
export function fromNow(date: Date, noAgo = false) {
const now = new Date();
const ago = noAgo ? '' : ' ago';
const secondsAgo = Math.round((now.valueOf() - date.valueOf()) / 1000);
const secondsAgo = Math.floor((now.valueOf() - date.valueOf()) / 1000);
if (secondsAgo <= 59) return 'just now';
if (secondsAgo <= 119) return `1 minute${ago}`;
const minutesAgo = Math.round(secondsAgo / 60);
const minutesAgo = Math.floor(secondsAgo / 60);
if (minutesAgo <= 59) return `${minutesAgo} minutes${ago}`;
if (minutesAgo === 60) return `1 hour${ago}`;
if (minutesAgo <= 119) return `1 hour ${minutesAgo - 60} min${ago}`;
const hoursAgo = Math.round(minutesAgo / 60);
const hoursAgo = Math.floor(minutesAgo / 60);
if (hoursAgo <= 23) return `${hoursAgo} hours${ago}`;
if (hoursAgo === 24) return `1 day${ago}`;
if (hoursAgo <= 47) return `1 day ${hoursAgo - 24} hr${ago}`;
const daysAgo = Math.round(hoursAgo / 24);
const daysAgo = Math.floor(hoursAgo / 24);
if (daysAgo <= 30) return `${daysAgo} days${ago}`;
if (daysAgo <= 60) return `1 month${ago}`;
const monthsAgo = Math.round(daysAgo / 30);
const monthsAgo = Math.floor(daysAgo / 30);
if (monthsAgo <= 11) return `${monthsAgo} months${ago}`;
if (monthsAgo === 12) return `1 year${ago}`;
if (monthsAgo <= 24) return `1 year ${monthsAgo - 12} m${ago}`;
const yearsAgo = Math.round(daysAgo / 365);
const yearsAgo = Math.floor(daysAgo / 365);
return `${yearsAgo} years${ago}`;
}

5
polygerrit-ui/app/utils/date-util_test.js
View File

@@ -53,6 +53,11 @@ suite('date-util tests', () => {
assert.equal('1 year ago', fromNow(new Date('May 05 2019 12:00:00')));
assert.equal('10 years ago', fromNow(new Date('May 05 2010 12:00:00')));
});
test('rounding error', () => {
const fakeNow = new Date('May 08 2020 12:00:00');
sinon.useFakeTimers(fakeNow.getTime());
assert.equal('2 hours ago', fromNow(new Date('May 08 2020 9:30:00')));
});
});
suite('isWithinDay', () => {