diff --git a/dist/timehelper.d.ts b/dist/timehelper.d.ts index 9cdc507..c1b0a87 100644 --- a/dist/timehelper.d.ts +++ b/dist/timehelper.d.ts @@ -11,5 +11,6 @@ export interface TimeBetween { toReadable: (roundToMinutes?: boolean) => string; } export declare function calculateSecondsBetween(start: number, end: number): TimeBetween; -export declare function secondsToReadable(secs: number, roundToMinutes?: boolean): string; +export declare function formatSecondsToDHMS(secs: number, roundToMinutes?: boolean): string; +export declare function formatSecondsToMS(s: number): string; //# sourceMappingURL=timehelper.d.ts.map \ No newline at end of file diff --git a/dist/timehelper.d.ts.map b/dist/timehelper.d.ts.map index a7e8fd2..83f2974 100644 --- a/dist/timehelper.d.ts.map +++ b/dist/timehelper.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"timehelper.d.ts","sourceRoot":"","sources":["../src/timehelper.ts"],"names":[],"mappings":"AAAA,qBAAa,QAAQ;IACpB,OAAO,CAAC,KAAK,CAAqC;IAClD,OAAO,CAAC,GAAG,CAAqC;IAChD,OAAO,CAAC,QAAQ,CAAC;gBAEL,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;IAOjD,OAAO,CAAC,SAAS;IAKjB,QAAQ,CAAC,SAAS,GAAE,MAAmB,GAAG,OAAO;CAqBjD;AAED,MAAM,WAAW,WAAW;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,CAAC,cAAc,CAAC,EAAE,OAAO,KAAK,MAAM,CAAC;CACjD;AAED,wBAAgB,uBAAuB,CACtC,KAAK,EAAE,MAAM,EACb,GAAG,EAAE,MAAM,GACT,WAAW,CAOb;AAED,wBAAgB,iBAAiB,CAChC,IAAI,EAAE,MAAM,EACZ,cAAc,GAAE,OAAe,GAC7B,MAAM,CAmBR"} \ No newline at end of file +{"version":3,"file":"timehelper.d.ts","sourceRoot":"","sources":["../src/timehelper.ts"],"names":[],"mappings":"AAAA,qBAAa,QAAQ;IACpB,OAAO,CAAC,KAAK,CAAqC;IAClD,OAAO,CAAC,GAAG,CAAqC;IAChD,OAAO,CAAC,QAAQ,CAAC;gBAEL,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;IAOjD,OAAO,CAAC,SAAS;IAKjB,QAAQ,CAAC,SAAS,GAAE,MAAmB,GAAG,OAAO;CAqBjD;AAED,MAAM,WAAW,WAAW;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,CAAC,cAAc,CAAC,EAAE,OAAO,KAAK,MAAM,CAAC;CACjD;AAED,wBAAgB,uBAAuB,CACtC,KAAK,EAAE,MAAM,EACb,GAAG,EAAE,MAAM,GACT,WAAW,CAOb;AAED,wBAAgB,mBAAmB,CAClC,IAAI,EAAE,MAAM,EACZ,cAAc,GAAE,OAAe,GAC7B,MAAM,CAmBR;AAED,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAInD"} \ No newline at end of file diff --git a/dist/timehelper.js b/dist/timehelper.js index 149081c..8c03dff 100644 --- a/dist/timehelper.js +++ b/dist/timehelper.js @@ -36,18 +36,23 @@ export function calculateSecondsBetween(start, end) { const seconds = Math.max(60, (end - start) / 1000); return { seconds, - toReadable: (roundToMinutes) => secondsToReadable(seconds, roundToMinutes), + toReadable: (roundToMinutes) => formatSecondsToDHMS(seconds, roundToMinutes), }; } -export function secondsToReadable(secs, roundToMinutes = false) { +export function formatSecondsToDHMS(secs, roundToMinutes = false) { const totalSeconds = roundToMinutes ? Math.round(secs / 60) * 60 : secs; - var days = Math.floor(totalSeconds / (3600 * 24)); - var hours = Math.floor((totalSeconds % (3600 * 24)) / 3600); - var minutes = Math.floor((totalSeconds % 3600) / 60); - var seconds = Math.floor(totalSeconds % 60); - var dayDisplay = days > 0 ? days + (days === 1 ? " day, " : " days, ") : ""; - var hourDisplay = hours > 0 ? hours + (hours === 1 ? " hour, " : " hours, ") : ""; - var minuteDisplay = minutes > 0 ? minutes + (minutes === 1 ? " minute, " : " minutes, ") : ""; - var secondDisplay = seconds > 0 ? seconds + (seconds === 1 ? " second" : " seconds") : ""; + const days = Math.floor(totalSeconds / (3600 * 24)); + const hours = Math.floor((totalSeconds % (3600 * 24)) / 3600); + const minutes = Math.floor((totalSeconds % 3600) / 60); + const seconds = Math.floor(totalSeconds % 60); + const dayDisplay = days > 0 ? days + (days === 1 ? " day, " : " days, ") : ""; + const hourDisplay = hours > 0 ? hours + (hours === 1 ? " hour, " : " hours, ") : ""; + const minuteDisplay = minutes > 0 ? minutes + (minutes === 1 ? " minute, " : " minutes, ") : ""; + const secondDisplay = seconds > 0 ? seconds + (seconds === 1 ? " second" : " seconds") : ""; return (dayDisplay + hourDisplay + minuteDisplay + secondDisplay).replace(/,\s*$/, ""); } +export function formatSecondsToMS(s) { + const mins = Math.floor(s / 60); + const secs = s % 60; + return `${mins}:${secs < 10 ? "0" : ""}${secs}`; +}