Changeset 8e74e2f for Farmatiko/ClientApp/src/app/dashboard/dashboard.component.ts

Timestamp:

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

Author:

DimitarSlezenkovski <dslezenkovski@…>

Branches:

master

Children:

db484c9

Parents:

8b13eb2

Message:

Fix bugs, add some more.

File:

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

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

@@ -9 +9 @@
 import { ActivatedRoute, Router } from '@angular/router';
 import { AuthService } from '../shared/services/auth.service';
+import { AddMedicineDialogComponent } from '../dialogs/add-medicine-dialog/add-medicine-dialog.component';
+import { ListMedicinesDialogComponent } from '../dialogs/list-medicines-dialog/list-medicines-dialog.component';
 
 @Component({
@@ -21 +23 @@
   public filteredMedicines: IMedicine[] = [];
   public request: IPharmacyHeadRequest;
+  editedMedicine: boolean = false;
+  medicinesEditMode: boolean = false;
 
   constructor(private dataService: DataService, private authService: AuthService, private dialog: MatDialog, private snackBar: MatSnackBar, private router: Router, private route: ActivatedRoute) {
@@ -37 +41 @@
         .subscribe((pharmacy: IPharmacy[]) => {
           this.pharmacies = pharmacy;
+          this.head.Pharmacy.forEach((pharma) => {
+            this.filteredPharmacies = this.pharmacies = this.pharmacies.filter(x => x == pharma);
+          });
         },
         (err: any) => console.log(err),
         () => console.log('Pharmacy data retrieved'));
+    this.filteredMedicines = this.head.PharmacyMedicines;
   }
   
@@ -83 +91 @@
   deleteMedicine(medicine: IMedicine){
     this.head.PharmacyMedicines = this.head.PharmacyMedicines.filter(x => x !== medicine);
+    this.filteredMedicines = this.head.PharmacyMedicines;
+    this.editedMedicine = true;
+  }
+  
+  saveDeletedMedicines() {
     this.dataService.updatePharmacyHead(this.head)
-        .subscribe((hd: IPharmacyHead) => {
-          if(hd) {
-            this.openSnackBar("Success! Medicine deleted", "OK");
-          }
-          else {
-            this.openSnackBar("Unable to delete Medicine", "Try again");
-          }
-        },
-        (err: any) => console.log(err),
-        () => console.log('Update sent!'));
+      .subscribe((hd: IPharmacyHead) => {
+        if(hd) {
+          this.openSnackBar("Success! Medicine deleted", "OK");
+          this.editedMedicine = false;
+        }
+        else {
+          this.openSnackBar("Unable to delete Medicine", "Try again");
+        }
+      },
+      (err: any) => console.log(err),
+      () => console.log('Update sent!'));
   }
 
@@ -99 +113 @@
     console.log("applyFilterMedicines works!")
     if(filterValue) {
-      this.dataService.searchMedicines(filterValue)
-          .subscribe((medicine: IMedicine[]) => {
-            this.filteredMedicines = medicine;
-          },
-          (err: any) => console.log(err),
-          () => console.log('Medicine data retrieved')); 
+      this.filteredMedicines = this.filteredMedicines.filter(x => x.name.toLocaleLowerCase().includes(filterValue.toLocaleLowerCase()));
     }
     else {
       this.filteredMedicines = this.head.PharmacyMedicines;
+    }
+  }
+
+  addMedicine() {
+    let dialogRef = this.dialog.open(AddMedicineDialogComponent, {
+      width: 'auto'
+    });
+    dialogRef.afterClosed().subscribe((newMedicine: IMedicine) => {
+      if(newMedicine){
+        this.head.PharmacyMedicines.push(newMedicine);
+        this.filteredMedicines = this.head.PharmacyMedicines;
+        if(this.editedMedicine == false) {
+          this.editedMedicine = true;
+        }
+        this.openSnackBar("Success! Medicine added, please save changes now", "OK");
+      }
+      else {
+        this.openSnackBar("Failed! Please try again", "OK");
+      }
+    }, () => this.openSnackBar("Failed! Please try again", "OK"));
+  }
+
+  addMedicinesFromList() {
+    let dialogRef = this.dialog.open(ListMedicinesDialogComponent, {
+      width: 'auto',
+      height: 'auto'
+    });
+    dialogRef.afterClosed().subscribe((listMedicines: IMedicine[]) => {
+      if(listMedicines){
+        listMedicines.forEach((medicine) => {
+          this.head.PharmacyMedicines = this.head.PharmacyMedicines.filter(x => x != medicine);
+          this.head.PharmacyMedicines.push(medicine);
+          this.filteredMedicines = this.head.PharmacyMedicines;
+        });
+        if(this.editedMedicine == false) {
+          this.editedMedicine = true;
+        }
+        this.openSnackBar("Success! Medicines added, please save changes now", "OK");
+      }
+      else {
+        this.openSnackBar("Failed! Please try again", "OK");
+      }
+    }, () => this.openSnackBar("Failed! Please try again", "OK"));
+  }
+
+  switchEditMedicineMode() {
+    this.medicinesEditMode = !this.medicinesEditMode;
+    if(this.editedMedicine == false) {
+      this.editedMedicine = true;
     }
   }
@@ -117 +175 @@
           .subscribe((pharmacy: IPharmacy[]) => {
             this.filteredPharmacies = pharmacy;
+            this.head.Pharmacy.forEach((pharma) => {
+              this.filteredPharmacies = this.filteredPharmacies.filter(x => x == pharma);
+            });
           },
           (err: any) => console.log(err),
@@ -123 +184 @@
     else {
       this.filteredPharmacies = this.pharmacies;
-    }    
+    }
   }
 
@@ -138 +199 @@
 
   openEditPharmacyDialog(pharmacy: IPharmacy): void {
+    console.log(pharmacy);
     let dialogRef = this.dialog.open(EditPharmacyDialogComponent, {
       width: '450px',