diff --git a/frontend-angular/src/app/modules/admin/modules/users/modules/statistics/statistics.component.html b/frontend-angular/src/app/modules/admin/modules/users/modules/statistics/statistics.component.html index dd50d2084..56d069291 100644 --- a/frontend-angular/src/app/modules/admin/modules/users/modules/statistics/statistics.component.html +++ b/frontend-angular/src/app/modules/admin/modules/users/modules/statistics/statistics.component.html @@ -12,7 +12,7 @@ -
+

{{ userData.name }}

{{ userData.name }}

{{ userData.email }}

diff --git a/frontend-angular/src/app/modules/admin/modules/users/modules/statistics/statistics.component.scss b/frontend-angular/src/app/modules/admin/modules/users/modules/statistics/statistics.component.scss index dc9109ad1..b5f17e25e 100644 --- a/frontend-angular/src/app/modules/admin/modules/users/modules/statistics/statistics.component.scss +++ b/frontend-angular/src/app/modules/admin/modules/users/modules/statistics/statistics.component.scss @@ -11,6 +11,10 @@ display: flex; align-items: flex-start; + .user-data { + z-index: 2; + } + .profile-name { margin-top: $margin-8; } diff --git a/frontend-angular/src/app/modules/admin/modules/users/users.component.html b/frontend-angular/src/app/modules/admin/modules/users/users.component.html index 06568b1b6..1f8cba2fd 100644 --- a/frontend-angular/src/app/modules/admin/modules/users/users.component.html +++ b/frontend-angular/src/app/modules/admin/modules/users/users.component.html @@ -73,6 +73,20 @@ + + + {{ + 'Admin.Modules.Users.Components.UsersTable.ColumnsName.Email' + | translate + }} + + +
+ {{ user.email }} +
+ +
+ {{ diff --git a/frontend-angular/src/app/modules/admin/modules/users/users.component.ts b/frontend-angular/src/app/modules/admin/modules/users/users.component.ts index 47ee7993b..1cac95e65 100644 --- a/frontend-angular/src/app/modules/admin/modules/users/users.component.ts +++ b/frontend-angular/src/app/modules/admin/modules/users/users.component.ts @@ -30,6 +30,7 @@ export class UsersComponent implements OnInit, OnDestroy { public dataSource: MatTableDataSource; public readonly displayedColumns: string[] = [ 'name', + 'email', 'firstDone', 'lastDone', 'lastVisit', diff --git a/frontend-angular/src/assets/i18n/en.json b/frontend-angular/src/assets/i18n/en.json index 0f58bb11e..b63ae7fa6 100644 --- a/frontend-angular/src/assets/i18n/en.json +++ b/frontend-angular/src/assets/i18n/en.json @@ -73,6 +73,7 @@ "UsersTable": { "ColumnsName": { "Favorite": "Favorite", + "Email": "Email", "FirstVisit": "First visit", "LastVisit": "Last visit", "LastStudyActivity": "Last study activity", diff --git a/frontend-angular/src/assets/i18n/ru.json b/frontend-angular/src/assets/i18n/ru.json index 24cae3309..58fc37935 100644 --- a/frontend-angular/src/assets/i18n/ru.json +++ b/frontend-angular/src/assets/i18n/ru.json @@ -73,6 +73,7 @@ "UsersTable": { "ColumnsName": { "Favorite": "Любимый", + "Email": "Электронное письмо", "FirstVisit": "Первый визит", "LastVisit": "Последнее посещение", "LastStudyActivity": "Последнее учебное занятие",