Changeset ee137aa for Farmatiko/ClientApp/src/app/home/home.component.ts

Timestamp:

08/07/20 10:59:56 (4 years ago)

Author:

Mile Jankuloski <mile.jankuloski@…>

Branches:

master

Children:

63d885e

Parents:

c73269d

Message:

Added DataService and dialogs, all bindings needed implemented

File:

• Farmatiko/ClientApp/src/app/home/home.component.ts (modified) (2 diffs)

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

@@ -1 @@
-import { Component, OnInit, ViewChild, Inject } from '@angular/core';
-import { HttpClient } from '@angular/common/http';
-import { Medicine } from '../models/Medicine';
-import { Pharmacy } from '../models/Pharmacy';
-import { MatTableDataSource } from '@angular/material/table';
-import { MatPaginator } from '@angular/material/paginator';
-import { MatSort } from '@angular/material/sort';
+import { Component, OnInit } from '@angular/core';
+import { IMedicine, IPharmacy } from '../shared/interfaces';
+import { DataService } from '../shared/data.service';
+import { MatDialog } from '@angular/material/dialog';
+import { MedicineDialogComponent } from '../dialogs/medicine-dialog/medicine-dialog.component';
+import { PharmacyDialogComponent } from '../dialogs/pharmacy-dialog/pharmacy-dialog.component';
 
 @Component({
@@ -13 +12 @@
 })
 export class HomeComponent implements OnInit {
-  public medicines: Medicine[];
-  public pharmacies: Pharmacy[];
-  displayedColumns = ['Име','Јачина','Форма', 'Начин на издавање', 'Производител', 'Цена', 'Пакување'];
-  displayedColumnsPharmacies = ['Име','Локација','Адреса', 'Работи 27/7?'];
-  dataSource = new MatTableDataSource<Medicine>();
-  dataSourcePharmacies = new MatTableDataSource<Pharmacy>();
+  public medicines: IMedicine[] = [];
+  public pharmacies: IPharmacy[] = [];
+  public filteredMedicines: IMedicine[] = [];
+  public filteredPharmacies: IPharmacy[] = [];
 
-  @ViewChild(MatPaginator, {static: true}) paginator: MatPaginator;
-  @ViewChild(MatSort) sort: MatSort;
+  constructor(private dataService: DataService, private dialog: MatDialog) {
 
-  constructor(http: HttpClient, @Inject('BASE_URL') baseUrl: string) {
-    http.get<Medicine[]>(baseUrl + 'Medicine/Get?').subscribe(result => {
-      this.medicines = result;
-      console.log(this.medicines);
-      this.dataSource = new MatTableDataSource<Medicine>(this.medicines);
-    }, error => console.error(error));
-    http.get<Pharmacy[]>(baseUrl + 'Pharmacy/Get?').subscribe(result => {
-      this.pharmacies = result;
-      console.log(this.pharmacies);
-      this.dataSourcePharmacies = new MatTableDataSource<Pharmacy>(this.pharmacies);
-    }, error => console.error(error));
-  }
-  ngOnInit(): void {
   }
 
-  ngAfterViewInit(): void {
-    this.dataSource.paginator = this.paginator;
-    this.dataSource.sort = this.sort;
-    this.dataSourcePharmacies.paginator = this.paginator;
-    this.dataSourcePharmacies.sort = this.sort;
+  ngOnInit(): void {
+    this.dataService.getMedicines()
+        .subscribe((medicine: IMedicine[]) => {
+          this.medicines = this.filteredMedicines = medicine;
+        },
+        (err: any) => console.log(err),
+        () => console.log('Medicine data retrieved'));
+
+    this.dataService.getPharmacies()
+        .subscribe((pharmacy: IPharmacy[]) => {
+          this.pharmacies = this.filteredPharmacies = pharmacy;
+        },
+        (err: any) => console.log(err),
+        () => console.log('Pharmacy data retrieved'));
   }
 
-  applyFilter(filterValue: string) {
-    filterValue = filterValue.trim();
-    filterValue = filterValue.toLowerCase();
-    this.dataSource.filter = filterValue;
+  applyFilterMedicines(filterValue: string) {
+    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')); 
+    }
+    else {
+      this.filteredMedicines = this.medicines;
+    }
   }
   
   applyFilterPharmacies(filterValue: string) {
-    filterValue = filterValue.trim();
-    filterValue = filterValue.toLowerCase();
-    this.dataSourcePharmacies.filter = filterValue;
+    console.log("applyFilterPharmacies works!")
+    if(filterValue) {
+      this.dataService.searchPharmacies(filterValue)
+          .subscribe((pharmacy: IPharmacy[]) => {
+            this.filteredPharmacies = pharmacy;
+          },
+          (err: any) => console.log(err),
+          () => console.log('Pharmacy data retrieved')); 
+    }
+    else {
+      this.filteredPharmacies = this.pharmacies;
+    }
+  }
+
+  openMedicineDialog(medicine: IMedicine): void {
+    this.dialog.open(MedicineDialogComponent, {
+      width: '450px',
+      data: medicine
+    });
+  }
+
+  openPharmacyDialog(pharmacy: IPharmacy): void {
+    this.dialog.open(PharmacyDialogComponent, {
+      width: '450px',
+      data: pharmacy
+    });
   }
 }