Changeset a6bbad1 for Farmatiko/ClientApp/src/app/counter/counter.component.ts

Timestamp:

07/31/20 21:01:19 (4 years ago)

Author:

DimitarSlezenkovski <dslezenkovski@…>

Branches:

master

Children:

c406ae5

Parents:

58fa654 (diff), c73269d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of ​https://develop.finki.ukim.mk/git/farmatiko

File:

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

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

@@ -1 @@
-import { Component, OnInit, ViewChild, Inject } from '@angular/core';
+import { Component, OnInit, ViewChild, Inject, Input } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
 import { HealthFacilities } from '../models/HealthFacilities';
@@ -13 +13 @@
 })
 export class CounterComponent implements OnInit {
-  public facilities: HealthFacilities[];
+  @Input() facilities: HealthFacilities[];
   public workers: HealthcareWorkers[];
-  displayedColumns = ['Име','Општина','Адреса', 'Тип', 'Е-пошта', 'Телефон'];
+  displayedColumns = ['id','createdOn','deletedOn','Име','Општина','Адреса', 'Тип', 'Е-пошта', 'Телефон'];
   displayedColumnsWorkers = ['Име','Гранка','Установа', 'Назив'];
   dataSource = new MatTableDataSource<HealthFacilities>();
   dataSourceWorkers = new MatTableDataSource<HealthcareWorkers>();
 
-  @ViewChild(MatPaginator, {static: true}) paginator: MatPaginator;
+  @ViewChild(MatPaginator, {static: false}) paginator: MatPaginator;
   @ViewChild(MatSort) sort: MatSort;
 
@@ -41 +41 @@
     this.dataSource.paginator = this.paginator;
     this.dataSource.sort = this.sort;
-    this.dataSourceWorkers.paginator = this.paginator;
-    this.dataSourceWorkers.sort = this.sort;
   }