Changeset 28d7d35 for Farmatiko/ClientApp/src/app/dashboard/dashboard.component.ts

Timestamp:

01/31/21 06:27:26 (3 years ago)

Author:

Mile Jankuloski <mile.jankuloski@…>

Branches:

master

Children:

de9d697

Parents:

7520f88

Message:

Maps, geolocation api, dialogs & more

File:

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

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

@@ -40 +40 @@
     this.dataService.getPharmacies()
         .subscribe((pharmacy: IPharmacy[]) => {
-          this.pharmacies = pharmacy;
-          this.head.Pharmacy.forEach((pharma) => {
-            this.filteredPharmacies = this.pharmacies = this.pharmacies.filter(x => x == pharma);
-          });
+          this.pharmacies = this.filteredPharmacies = pharmacy;
+          // Iskluceno filtriranje na farmacies (Star metod)
+          // this.head.Pharmacy.forEach((pharma) => {
+          //   this.filteredPharmacies = this.pharmacies = this.pharmacies.filter(x => x == pharma);
+          // });
         },
         (err: any) => console.log(err),
@@ -147 +148 @@
       if(listMedicines){
         listMedicines.forEach((medicine) => {
-          this.head.PharmacyMedicines = this.head.PharmacyMedicines.filter(x => x != medicine);
+          if(this.head.PharmacyMedicines) {
+            this.head.PharmacyMedicines = this.head.PharmacyMedicines.filter(x => x != medicine);
+          }
+          else {
+            this.head.PharmacyMedicines = [];
+          }
           this.head.PharmacyMedicines.push(medicine);
           this.filteredMedicines = this.head.PharmacyMedicines;
@@ -175 +181 @@
           .subscribe((pharmacy: IPharmacy[]) => {
             this.filteredPharmacies = pharmacy;
-            this.head.Pharmacy.forEach((pharma) => {
-              this.filteredPharmacies = this.filteredPharmacies.filter(x => x == pharma);
-            });
+            // this.head.Pharmacy.forEach((pharma) => {
+            //   this.filteredPharmacies = this.filteredPharmacies.filter(x => x == pharma);
+            // });
           },
           (err: any) => console.log(err),