diff --git a/CHANGELOG.md b/CHANGELOG.md index a9224405d..eb0017d04 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed +- Modernized the layout of the overview tab in the admin control panel - Upgraded `papaparse` from version `5.3.1` to `5.5.3` ### Fixed diff --git a/apps/client/src/app/components/admin-overview/admin-overview.component.ts b/apps/client/src/app/components/admin-overview/admin-overview.component.ts index ff55bb2bc..9b92c5b11 100644 --- a/apps/client/src/app/components/admin-overview/admin-overview.component.ts +++ b/apps/client/src/app/components/admin-overview/admin-overview.component.ts @@ -144,6 +144,21 @@ export class GfAdminOverviewComponent implements OnInit { }); } + public get activitiesCountPerUser() { + if (!this.activitiesCount || !this.userCount) { + return undefined; + } + + const formattedActivitiesCountPerUser = ( + this.activitiesCount / this.userCount + ).toLocaleString(this.user?.settings?.locale, { + maximumFractionDigits: 2, + minimumFractionDigits: 2 + }); + + return `(${formattedActivitiesCountPerUser} ${$localize`per User`})`; + } + public ngOnInit() { this.fetchAdminData(); } diff --git a/apps/client/src/app/components/admin-overview/admin-overview.html b/apps/client/src/app/components/admin-overview/admin-overview.html index 3a8a81024..5514c57d0 100644 --- a/apps/client/src/app/components/admin-overview/admin-overview.html +++ b/apps/client/src/app/components/admin-overview/admin-overview.html @@ -1,38 +1,51 @@
+
+
+ + + Version + + +
+
+ + + Users + + +
+
+ + + Activities + + +
+
+
-
-
Version
-
- -
-
-
-
User Count
-
- -
-
-
-
Activity Count
-
- - @if (activitiesCount && userCount) { -
- {{ activitiesCount / userCount | number: '1.2-2' }} - per User -
- } -
-
User Signup