From 09b5bfe0db8271c0c7531e22e3123d7e29e2bb1e Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Thu, 3 Sep 2020 17:29:09 +0530 Subject: towards auto-refresh --- packages/taler-wallet-core/src/util/time.ts | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) (limited to 'packages/taler-wallet-core/src/util') diff --git a/packages/taler-wallet-core/src/util/time.ts b/packages/taler-wallet-core/src/util/time.ts index 1641924a1..512d5e908 100644 --- a/packages/taler-wallet-core/src/util/time.ts +++ b/packages/taler-wallet-core/src/util/time.ts @@ -89,22 +89,25 @@ export function timestampMax(t1: Timestamp, t2: Timestamp): Timestamp { const SECONDS = 1000 const MINUTES = SECONDS * 60; const HOURS = MINUTES * 60; +const DAYS = HOURS * 24; +const MONTHS = DAYS * 30; +const YEARS = DAYS * 365; export function durationFromSpec(spec: { seconds?: number, - hours?: number, minutes?: number, + hours?: number, + days?: number, + months?: number, + years?: number, }): Duration { let d_ms = 0; - if (spec.seconds) { - d_ms += spec.seconds * SECONDS; - } - if (spec.minutes) { - d_ms += spec.minutes * MINUTES; - } - if (spec.hours) { - d_ms += spec.hours * HOURS; - } + d_ms += (spec.seconds ?? 0) * SECONDS; + d_ms += (spec.minutes ?? 0) * MINUTES; + d_ms += (spec.hours ?? 0) * HOURS; + d_ms += (spec.days ?? 0) * DAYS; + d_ms += (spec.months ?? 0) * MONTHS; + d_ms += (spec.years ?? 0) * YEARS; return { d_ms }; } -- cgit v1.2.3