Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

rounding bug #716

Merged
merged 2 commits into from
Jul 6, 2023
Merged

rounding bug #716

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
95d9ff8
rounding bug
PatrickCleary Jul 6, 2023
0602ac0
whoops
PatrickCleary Jul 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 11 additions & 24 deletions common/utils/time.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import React from 'react';
import dayjs from 'dayjs';
import type { DurationUnitType } from 'dayjs/plugin/duration';
import { WidgetText } from '../components/widgets/internal/WidgetText';
import { UnitText } from '../components/widgets/internal/UnitText';

Expand Down Expand Up @@ -46,28 +45,16 @@ export const getFormattedTimeValue = (value: number) => {
}
};

export const getFormattedTimeString = (value: number, unit: DurationUnitType = 'seconds') => {
if (unit === 'seconds') {
const absValue = Math.round(Math.abs(value));
const duration = dayjs.duration(absValue, unit);
switch (true) {
case absValue < 100:
return `${absValue}s`;
case absValue < 3600:
return `${duration.format('m')}m ${duration.format('s').padStart(2, '0')}s`;
default:
return `${duration.format('H')}h ${duration.format('m').padStart(2, '0')}m`;
}
} else if (unit === 'minutes') {
const absValue = Math.abs(value);
const duration = dayjs.duration(absValue, unit);
switch (true) {
case absValue < 1:
return `${duration.format('s')}s`;
case absValue < 60:
return `${duration.format('m')}m ${duration.format('s').padStart(2, '0')}s`;
default:
return `${duration.format('H')}h ${duration.format('m').padStart(2, '0')}m`;
}
export const getFormattedTimeString = (value: number, unit: 'minutes' | 'seconds' = 'seconds') => {
const secondsValue = unit === 'seconds' ? value : value * 60;
const absValue = Math.round(Math.abs(secondsValue));
const duration = dayjs.duration(absValue, 'seconds');
switch (true) {
case absValue < 100:
return `${absValue}s`;
case absValue < 3600:
return `${duration.format('m')}m ${duration.format('s').padStart(2, '0')}s`;
default:
return `${duration.format('H')}h ${duration.format('m').padStart(2, '0')}m`;
}
};
Loading