feat(2594): adds email column & makes email selectable (#2613)

* feat(2594): adds email column in users table * fix(2594): makes name & email selectable
Brain-up · Sep 25, 2024 · f3ba6cc · f3ba6cc
1 parent 0922821
commit f3ba6cc
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 1 deletion.
diff --git a/...-angular/src/app/modules/admin/modules/users/modules/statistics/statistics.component.html b/...-angular/src/app/modules/admin/modules/users/modules/statistics/statistics.component.html
@@ -12,7 +12,7 @@
       <mat-icon svgIcon="arrow-back"></mat-icon>
     </button>
 
-    <div>
+    <div class="user-data">
       <h3 class="profile-name">{{ userData.name }}</h3>
       <p>{{ userData.name }}</p>
       <p>{{ userData.email }}</p>

diff --git a/...-angular/src/app/modules/admin/modules/users/modules/statistics/statistics.component.scss b/...-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
@@ -73,6 +73,20 @@
         </td>
       </ng-container>
 
+      <ng-container matColumnDef="email">
+        <th mat-header-cell *matHeaderCellDef mat-sort-header>
+          {{
+            'Admin.Modules.Users.Components.UsersTable.ColumnsName.Email'
+              | translate
+          }}
+        </th>
+        <td mat-cell *matCellDef="let user">
+          <div *ngIf="user.email" class="subItem">
+           {{ user.email }}
+          </div>
+        </td>
+      </ng-container>
+
       <ng-container matColumnDef="firstDone">
         <th mat-header-cell *matHeaderCellDef mat-sort-header>
           {{

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
@@ -30,6 +30,7 @@ export class UsersComponent implements OnInit, OnDestroy {
   public dataSource: MatTableDataSource<UserMapped>;
   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
@@ -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
@@ -73,6 +73,7 @@
           "UsersTable": {
             "ColumnsName": {
               "Favorite": "Любимый",
+              "Email": "Электронное письмо",
               "FirstVisit": "Первый визит",
               "LastVisit": "Последнее посещение",
               "LastStudyActivity": "Последнее учебное занятие",