Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍
TypeScript angularetffinancefintechghostfoliohacktoberfestinvestingnestjsosspersonal-financeportfolioprismasoftwarestocktrackertradingtypescriptwealth-managementweb
Feature/add subscription expiration dates to the admin control panel (#1796)
Thomas Kaul1009b462e974
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex 4162b3d073..c54218f15b 100644--- a/CHANGELOG.md+++ b/CHANGELOG.md@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).+## Unreleased++### Added++- Added the subscription expiration date to the users table of the admin control panel+## 1.246.0 - 2023-03-18### Addeddiff --git a/apps/client/src/app/components/admin-users/admin-users.component.ts b/apps/client/src/app/components/admin-users/admin-users.component.tsindex 0e76a87331..bae725e539 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.htmlindex 15127802e5..ad1fe26f50 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"></gf-premium-indicator></div></td>