Changeset 8e74e2f for Farmatiko/ClientApp/src/app/admin

Timestamp:

11/16/20 03:55:10 (3 years ago)

Author:

DimitarSlezenkovski <dslezenkovski@…>

Branches:

master

Children:

db484c9

Parents:

8b13eb2

Message:

Fix bugs, add some more.

Location:

Farmatiko/ClientApp/src/app/admin

Files:

• admin.component.html (modified) (2 diffs)
• admin.component.ts (modified) (6 diffs)

Farmatiko/ClientApp/src/app/admin/admin.component.html

@@ -12 +12 @@
         <div class="navbar-collapse collapse d-sm-inline-flex flex-sm-row-reverse">
           <ul class="navbar-nav flex-grow">
-            <li>Administration panel</li>
+            <li>Administration panel:</li> 
+            <li>&nbsp;Logged as <p *ngIf="head">{{adminHead.Name}}</p> </li>
+            <li (click)="logout()" class="btn btn-link"><a>Logout</a></li>
           </ul>
         </div>
@@ -18 +20 @@
     </nav>
 </header>
-<mat-tab-group mat-stretch-tabs>
+<mat-tab-group mat-stretch-tabs dynamicHeight>
       <mat-tab label="Claiming requests"> 
         <div class="wrapper">

Farmatiko/ClientApp/src/app/admin/admin.component.ts

@@ -7 +7 @@
 import { EditPharmacyHeadDialogComponent } from '../dialogs/edit-pharmacy-head-dialog/edit-pharmacy-head-dialog.component';
 import { PharmacyDialogComponent } from '../dialogs/pharmacy-dialog/pharmacy-dialog.component';
-import { PharmacyHeadDialogComponent } from '../nav-menu/dialogs/pharmacy-head-dialog/pharmacy-head-dialog.component';
+import { PharmacyHeadDialogComponent } from '../dialogs/pharmacy-head-dialog/pharmacy-head-dialog.component';
+import { AuthService } from '../shared/services/auth.service';
 
 
@@ -19 +20 @@
   public requests: IPharmacyHeadRequest[] = [];
   public head: IPharmacyHead = {
-    PharmacyMedicines: null,
-    Pharmacy: null,
     Email: '',
     Passwd: '',
     Name: ''
   };
+  public adminHead: IPharmacyHead;
 
-  constructor(private dataService: DataService, private dialog: MatDialog, private snackBar: MatSnackBar, private router: Router) {
+  constructor(private dataService: DataService, private authService: AuthService, private dialog: MatDialog, private snackBar: MatSnackBar, private router: Router) {
 
   }
 
   ngOnInit(): void {
+    this.authService.getUser()
+        .subscribe((data) => {
+          console.log(data);
+          this.adminHead = data;
+        },
+        (err: any) => console.log(err),
+        () => console.log('User data retrieved'));
+
     this.dataService.getPharmacyHeads()
         .subscribe((pHeads: IPharmacyHead[]) => {
@@ -39 +47 @@
 
     this.dataService.getClaimingRequests()
-    .subscribe((pRequests: IPharmacyHeadRequest[]) => {
-      this.requests = pRequests;
-    },
-    (err: any) => console.log(err),
-    () => console.log("PharmacyHead data retrieved"));
+        .subscribe((pRequests: IPharmacyHeadRequest[]) => {
+          this.requests = pRequests;
+        },
+        (err: any) => console.log(err),
+        () => console.log("PharmacyHead data retrieved"));
   }
 
@@ -57 +65 @@
         () => console.log("PharmacyHead inserted"));
     this.head = {
-      PharmacyMedicines: null,
-      Pharmacy: null,
       Email: '',
       Passwd: '',
@@ -83 +89 @@
     dialogRef.afterClosed().subscribe((editedHead: IPharmacyHead) => {
       if(editedHead){
+        console.log(editedHead);
         this.heads = this.heads.filter(x => x !== eHead);
         this.heads.push(editedHead);
@@ -142 +149 @@
   }
 
+  logout() {
+    this.authService.logout();
+  }
+
   openSnackBar(message: string, action: string) : MatSnackBarRef<SimpleSnackBar> {
     return this.snackBar.open(message, action, {