Changeset 6e6f04b for Farmatiko/ClientApp/src/app/admin

Timestamp:

02/11/21 03:50:10 (4 years ago)

Author:

Dimitar Slezenkovski <dslezenkovski@…>

Branches:

master

Children:

f554983

Parents:

8eb1e21 (diff), dae4cde (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of ​https://develop.finki.ukim.mk/git/farmatiko

Location:

Farmatiko/ClientApp/src/app/admin

Files:

• admin.component.html (modified) (1 diff)
• admin.component.ts (modified) (5 diffs)

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

@@ -56 +56 @@
                 <tr *ngFor="let head of heads">
                   <td><a (click)="openPharmacyHeadDialog(head)">{{head.Name}}</a> | {{head.Email}}</td>
-                  <td><a (click)="deletePharmacyHead(head)">Delete</a> | <a (click)="openEditPharmacyHeadDialog(head)">Change</a></td>
+                  <td><a (click)="deletePharmacyHead(head)" *ngIf="head.Name !== 'Admin'">Delete</a><span *ngIf="head.Name == 'Admin'">Can't delete Admin</span> | <a (click)="openEditPharmacyHeadDialog(head)">Change</a></td>
                 </tr>
               </tbody>

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

@@ -56 +56 @@
   createHead() {
     this.dataService.insertPharmacyHead(this.head)
-        .subscribe((cHead: IPharmacyHead) => {
-          if(cHead) {
+        .subscribe((cHead) => {
             this.heads.push(cHead);
             this.openSnackBar("New head created!","OK");
-          }
         },
         (err: any) => console.log(err),
@@ -79 +77 @@
         },
         (err: any) => console.log(err),
-        () => console.log("PharmacyHead deleted"));
+        () => {
+          console.log("PharmacyHead deleted");
+          location.reload();
+        });
   }
 
@@ -88 +89 @@
     });
     dialogRef.afterClosed().subscribe((editedHead: IPharmacyHead) => {
-      if(editedHead){
-        console.log(editedHead);
-        this.heads = this.heads.filter(x => x !== eHead);
-        this.heads.push(editedHead);
-        this.dataService.updatePharmacyHead(editedHead)
-            .subscribe((hd: IPharmacyHead) => {
-              if(hd) {
-                this.openSnackBar("Success! PharmacyHead edited", "OK").onAction().subscribe(() => {
-                  window.location.reload();
-                });
-              }
-              else {
-                this.openSnackBar("PharmacyHead edit failed", "Try again");
-              }
-            },
-            (err: any) => console.log(err),
-            () => console.log('PharmacyHead data updated'));
+      if(editedHead) {
+          console.log(editedHead);
+          this.heads = this.heads.filter(x => x !== eHead);
+          this.heads.push(editedHead);
+          this.dataService.updatePharmacyHead(editedHead)
+              .subscribe((hd: IPharmacyHead) => {
+                  this.openSnackBar("Success! PharmacyHead edited", "OK").onAction().subscribe(() => {
+                    location.reload();
+                  });
+              },
+              (err: any) => console.log(err),
+              () => console.log('PharmacyHead data updated'));
       }
     });
@@ -127 +123 @@
         .subscribe((status: boolean) => {
           if(status) {
-            this.openSnackBar("Request rejected!","OK");
-          }
-          else {
-            this.openSnackBar("Something went wrong","Try again");
+            this.openSnackBar("Request processed!","OK");
           }
         },
         (err: any) => console.log(err),
-        () => console.log("PharmacyHeadRequest deleted"));
+        () => {
+          console.log("PharmacyHeadRequest deleted");
+          location.reload();
+        });
   }
 
@@ -148 +144 @@
         },
         (err: any) => console.log(err),
-        () => console.log("PharmacyHead updated"))
+        () => {
+          console.log("PharmacyHead updated");
+          location.reload();
+        })
     }
   }