Changeset e0cdea2 for Farmatiko/ClientApp/src/app

Timestamp:

02/08/21 16:39:25 (4 years ago)

Author:

Dimitar Slezenkovski <dslezenkovski@…>

Branches:

master

Children:

8eb1e21, dae4cde

Parents:

0a694bb

Message:

Fix all bugs

Location:

Farmatiko/ClientApp/src/app

Files:

• admin/admin.component.ts (modified) (2 diffs)
• dashboard/dashboard.component.ts (modified) (1 diff)
• shared/data.service.ts (modified) (1 diff)

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

@@ -124 +124 @@
 
   rejectRequest(req: IPharmacyHeadRequest) {
-    this.dataService.deleteClaimingRequest(req.id)
+    this.dataService.deleteClaimingRequest(req)
         .subscribe((status: boolean) => {
           if(status) {
@@ -139 +139 @@
   approveRequest(req: IPharmacyHeadRequest) {
     if(req) {
+      if (req.PharmacyHead.Pharmacy == null){
+        req.PharmacyHead.Pharmacy = [];
+      }
     req.PharmacyHead.Pharmacy.push(req.Pharmacy);
     this.dataService.updatePharmacyHead(req.PharmacyHead)

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

@@ -98 +98 @@
   saveDeletedMedicines() {
     this.dataService.updatePharmacyHead(this.head)
-      .subscribe((hd: IPharmacyHead) => {
+      .subscribe((hd) => {
         if(hd) {
           this.openSnackBar("Success! Medicine deleted", "OK");

Farmatiko/ClientApp/src/app/shared/data.service.ts

@@ -196 +196 @@
                     );
     }
-    deleteClaimingRequest(id: string) : Observable<boolean> {
-        return this.http.post<boolean>(this.basePharmacyHead + '/requests/' + id, id)
+    deleteClaimingRequest(req: IPharmacyHeadRequest) : Observable<boolean> {
+        return this.http.post<boolean>(this.basePharmacyHead + '/requests/' + req.id, req)
                     .pipe(
                         map((data) => {