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

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

File:

• Farmatiko/ClientApp/src/app/dashboard/dashboard.component.ts (modified) (6 diffs)

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

@@ -60 +60 @@
             .subscribe((req) => {
               if(req) {
-                this.openSnackBar("Claiming request sent!", "OK");
-              }
-              else {
-                this.openSnackBar("Unable to send a request", "Try again");
+                this.openSnackBar("Request sent!", "OK");
               }
             },
@@ -78 +75 @@
             .subscribe((req) => {
               if(req) {
-                this.openSnackBar("Claiming request sent!", "OK");
-              }
-              else {
-                this.openSnackBar("Unable to send a request", "Try again");
+                this.openSnackBar("Request sent!", "OK");
               }
             },
@@ -98 +92 @@
   saveDeletedMedicines() {
     this.dataService.updatePharmacyHead(this.head)
-      .subscribe((hd) => {
-        if(hd) {
-          this.openSnackBar("Success! Medicine deleted", "OK");
+      .subscribe(() => {
+          this.openSnackBar("Success!", "OK");
           this.editedMedicine = false;
-        }
-        else {
-          this.openSnackBar("Unable to delete Medicine", "Try again");
-        }
       },
-      (err: any) => console.log(err),
+      (err: any) => {
+        console.log(err);
+        this.openSnackBar("Failed!", "Try again");
+      },
       () => console.log('Update sent!'));
   }
@@ -132 +124 @@
           this.editedMedicine = true;
         }
-        this.openSnackBar("Success! Medicine added, please save changes now", "OK");
-      }
-      else {
-        this.openSnackBar("Failed! Please try again", "OK");
+        this.openSnackBar("Success!", "OK");
       }
     }, () => this.openSnackBar("Failed! Please try again", "OK"));
@@ -160 +149 @@
           this.editedMedicine = true;
         }
-        this.openSnackBar("Success! Medicines added, please save changes now", "OK");
-      }
-      else {
-        this.openSnackBar("Failed! Please try again", "OK");
+        this.openSnackBar("Success!", "OK");
       }
     }, () => this.openSnackBar("Failed! Please try again", "OK"));
@@ -215 +201 @@
         this.head.Pharmacy.push(editedPharmacy);
         this.dataService.updatePharmacyHead(this.head)
-            .subscribe((hd: IPharmacyHead) => {
-              if(hd) {
-                this.openSnackBar("Success! Pharmacy edited", "OK").onAction().subscribe(() => {
+            .subscribe((hd) => {
+                this.openSnackBar("Success!", "OK").onAction().subscribe(() => {
                   window.location.reload();
                 });
-              }
-              else {
-                this.openSnackBar("Pharmacy edit failed", "Try again");
-              }
             },
             (err: any) => console.log(err),