Skip to content
This repository was archived by the owner on Dec 26, 2022. It is now read-only.

Commit 3ad7295

Browse files
committed
Fix msToTime
1 parent 46db5b5 commit 3ad7295

File tree

1 file changed

+22
-12
lines changed

1 file changed

+22
-12
lines changed

src/helpers/DateTime.ts

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,27 @@ function timePad(time: number): string {
66
return String(time).padStart(2, '0');
77
}
88

9-
function onlySecs(secs: number) {
10-
return `${secs}s`;
9+
function onlySecs(sign: string, secs: number) {
10+
return `${sign}${secs}s`;
11+
}
12+
13+
function timeItemsToString(
14+
sign: string,
15+
hrs: number,
16+
mins: number,
17+
secs: number,
18+
showSeconds: boolean
19+
) {
20+
if (hrs === 0 && mins === 0) {
21+
return onlySecs(sign, secs);
22+
}
23+
24+
let result = `${sign}${timePad(hrs)}:${timePad(mins)}`;
25+
if (showSeconds) {
26+
result += `:${timePad(secs)}`;
27+
}
28+
29+
return result;
1130
}
1231

1332
export function msToTime(s: number, showSeconds: boolean = true) {
@@ -23,16 +42,7 @@ export function msToTime(s: number, showSeconds: boolean = true) {
2342
const mins = s % 60;
2443
const hrs = (s - mins) / 60;
2544

26-
if (showSeconds) {
27-
if (hrs === 0 && mins === 0) {
28-
return onlySecs(secs);
29-
}
30-
return `${timePad(hrs)}:${timePad(mins)}:${timePad(secs)}`;
31-
}
32-
if (hrs === 0 && mins === 0) {
33-
return onlySecs(secs);
34-
}
35-
return `${sign}${timePad(hrs)}:${timePad(mins)}`;
45+
return timeItemsToString(sign, hrs, mins, secs, showSeconds);
3646
}
3747

3848
export function calcDuration(taskTime: ITimeRangeModel[]): number {

0 commit comments

Comments
 (0)