Changes in Farmatiko/ClientApp/src/app/admin/admin.component.ts [dae4cde:e0cdea2]

File:

• Farmatiko/ClientApp/src/app/admin/admin.component.ts (modified) (5 diffs)

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

@@ -56 +56 @@
   createHead() {
     this.dataService.insertPharmacyHead(this.head)
-        .subscribe((cHead) => {
+        .subscribe((cHead: IPharmacyHead) => {
+          if(cHead) {
             this.heads.push(cHead);
             this.openSnackBar("New head created!","OK");
+          }
         },
         (err: any) => console.log(err),
@@ -77 +79 @@
         },
         (err: any) => console.log(err),
-        () => {
-          console.log("PharmacyHead deleted");
-          location.reload();
-        });
+        () => console.log("PharmacyHead deleted"));
   }
 
@@ -89 +88 @@
     });
     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) => {
-                  this.openSnackBar("Success! PharmacyHead edited", "OK").onAction().subscribe(() => {
-                    location.reload();
-                  });
-              },
-              (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) => {
+              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'));
       }
     });
@@ -123 +127 @@
         .subscribe((status: boolean) => {
           if(status) {
-            this.openSnackBar("Request processed!","OK");
+            this.openSnackBar("Request rejected!","OK");
+          }
+          else {
+            this.openSnackBar("Something went wrong","Try again");
           }
         },
         (err: any) => console.log(err),
-        () => {
-          console.log("PharmacyHeadRequest deleted");
-          location.reload();
-        });
+        () => console.log("PharmacyHeadRequest deleted"));
   }
 
@@ -144 +148 @@
         },
         (err: any) => console.log(err),
-        () => {
-          console.log("PharmacyHead updated");
-          location.reload();
-        })
+        () => console.log("PharmacyHead updated"))
     }
   }