From a543297200670f0c4836f5ce568d1d2e6c2c3234 Mon Sep 17 00:00:00 2001 From: Thomas <4159106+dtslvr@users.noreply.github.com> Date: Sat, 18 Mar 2023 16:23:15 +0100 Subject: [PATCH] Add expiration date --- .../app/components/admin-users/admin-users.component.ts | 7 ++++++- .../client/src/app/components/admin-users/admin-users.html | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/apps/client/src/app/components/admin-users/admin-users.component.ts b/apps/client/src/app/components/admin-users/admin-users.component.ts index 0e76a8733..bae725e53 100644 --- a/apps/client/src/app/components/admin-users/admin-users.component.ts +++ b/apps/client/src/app/components/admin-users/admin-users.component.ts @@ -1,7 +1,7 @@ import { ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core'; import { DataService } from '@ghostfolio/client/services/data.service'; import { UserService } from '@ghostfolio/client/services/user/user.service'; -import { getEmojiFlag } from '@ghostfolio/common/helper'; +import { getDateFormatString, getEmojiFlag } from '@ghostfolio/common/helper'; import { AdminData, InfoItem, User } from '@ghostfolio/common/interfaces'; import { hasPermission, permissions } from '@ghostfolio/common/permissions'; import { @@ -18,6 +18,7 @@ import { takeUntil } from 'rxjs/operators'; templateUrl: './admin-users.html' }) export class AdminUsersComponent implements OnDestroy, OnInit { + public defaultDateFormat: string; public getEmojiFlag = getEmojiFlag; public hasPermissionForSubscription: boolean; public info: InfoItem; @@ -43,6 +44,10 @@ export class AdminUsersComponent implements OnDestroy, OnInit { .subscribe((state) => { if (state?.user) { this.user = state.user; + + this.defaultDateFormat = getDateFormatString( + this.user.settings.locale + ); } }); } diff --git a/apps/client/src/app/components/admin-users/admin-users.html b/apps/client/src/app/components/admin-users/admin-users.html index 15127802e..ad1fe26f5 100644 --- a/apps/client/src/app/components/admin-users/admin-users.html +++ b/apps/client/src/app/components/admin-users/admin-users.html @@ -53,6 +53,7 @@ *ngIf="userItem?.subscription?.type === 'Premium'" class="ml-1" [enableLink]="false" + [title]="userItem.subscription.expiresAt | date: defaultDateFormat" >