Changeset ee137aa for Farmatiko/ClientApp/src/app/counter/counter.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/counter/counter.component.ts (modified) (2 diffs)

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

@@ -1 @@
-import { Component, OnInit, ViewChild, Inject, Input } from '@angular/core';
-import { HttpClient } from '@angular/common/http';
-import { HealthFacilities } from '../models/HealthFacilities';
-import { MatTableDataSource } from '@angular/material/table';
-import { MatPaginator } from '@angular/material/paginator';
-import { MatSort } from '@angular/material/sort';
-import { HealthcareWorkers } from '../models/HealthcareWorkers';
+import { Component, OnInit } from '@angular/core';
+import { IHealthFacilities, IHealthcareWorkers } from '../shared/interfaces';
+import { DataService } from '../shared/data.service';
+import { MatDialog } from '@angular/material/dialog';
+import { FacilityDialogComponent } from '../dialogs/facility-dialog/facility-dialog.component';
+import { WorkerDialogComponent } from '../dialogs/worker-dialog/worker-dialog.component';
 
 @Component({
@@ -13 +12 @@
 })
 export class CounterComponent implements OnInit {
-  @Input() facilities: HealthFacilities[];
-  public workers: HealthcareWorkers[];
-  displayedColumns = ['id','createdOn','deletedOn','Име','Општина','Адреса', 'Тип', 'Е-пошта', 'Телефон'];
-  displayedColumnsWorkers = ['Име','Гранка','Установа', 'Назив'];
-  dataSource = new MatTableDataSource<HealthFacilities>();
-  dataSourceWorkers = new MatTableDataSource<HealthcareWorkers>();
+  public facilities: IHealthFacilities[] = [];
+  public workers: IHealthcareWorkers[] = [];
+  public filteredFacilities: IHealthFacilities[] = [];
+  public filteredWorkers: IHealthcareWorkers[] = [];
 
-  @ViewChild(MatPaginator, {static: false}) paginator: MatPaginator;
-  @ViewChild(MatSort) sort: MatSort;
-
-  constructor(http: HttpClient, @Inject('BASE_URL') baseUrl: string) {
-    http.get<HealthFacilities[]>(baseUrl + 'HealthFacilities/Get?').subscribe(result => {
-      this.facilities = result;
-      console.log(this.facilities);
-      this.dataSource = new MatTableDataSource<HealthFacilities>(this.facilities);
-    }, error => console.error(error));
-    http.get<HealthcareWorkers[]>(baseUrl + 'HealthcareWorker/Get?').subscribe(result => {
-      this.workers = result;
-      console.log(this.workers);
-      this.dataSourceWorkers = new MatTableDataSource<HealthcareWorkers>(this.workers);
-    }, error => console.error(error));
-  }
-  ngOnInit(): void {
+  constructor(private dataService: DataService, private dialog: MatDialog) {
+    
   }
 
-  ngAfterViewInit(): void {
-    this.dataSource.paginator = this.paginator;
-    this.dataSource.sort = this.sort;
+  ngOnInit(): void {
+    this.dataService.getFacilities()
+        .subscribe((facility: IHealthFacilities[]) => {
+          this.facilities = this.filteredFacilities = facility;
+        },
+        (err: any) => console.log(err),
+        () => console.log('Facility data retrieved!'));
+
+    this.dataService.getWorkers()
+        .subscribe((worker: IHealthcareWorkers[]) => {
+          this.workers = this.filteredWorkers = worker;
+        },
+        (err: any) => console.log(err),
+        () => console.log('Facility data retrieved!'));
   }
 
-  applyFilter(filterValue: string) {
-    filterValue = filterValue.trim();
-    filterValue = filterValue.toLowerCase();
-    this.dataSource.filter = filterValue;
+  applyFilterFacilities(filterValue: string) {
+    console.log("applyFilterFacilities works!")
+    if(filterValue) {
+      this.dataService.searchFacilities(filterValue)
+          .subscribe((facility: IHealthFacilities[]) => {
+            this.filteredFacilities = facility;
+          },
+          (err: any) => console.log(err),
+          () => console.log('Facility data retrieved!'));
+    }
+    else {
+      this.filteredFacilities = this.facilities;
+    }
   }
 
   applyFilterWorkers(filterValue: string) {
-    filterValue = filterValue.trim();
-    filterValue = filterValue.toLowerCase();
-    this.dataSourceWorkers.filter = filterValue;
+    console.log("applyFilterWorkers works!")
+    if(filterValue) {
+      this.dataService.searchWorkers(filterValue)
+          .subscribe((worker: IHealthcareWorkers[]) => {
+            this.filteredWorkers = worker;
+          },
+          (err: any) => console.log(err),
+          () => console.log('Worker data retrieved!'));
+    }
+    else {
+      this.filteredWorkers = this.workers;
+    }
+  }
+
+  openFacilityDialog(facility: IHealthFacilities): void {
+    this.dialog.open(FacilityDialogComponent, {
+      width: '450px',
+      data: facility
+    });
+  }
+  
+  openWorkerDialog(worker: IHealthcareWorkers): void {
+    this.dialog.open(WorkerDialogComponent, {
+      width: '450px',
+      data: worker
+    });
   }
 }