Index: Farmatiko/ClientApp/src/app/admin/admin.component.html
===================================================================
--- Farmatiko/ClientApp/src/app/admin/admin.component.html	(revision e42f61a81e3d21811e04fddc9568197a096eadd7)
+++ Farmatiko/ClientApp/src/app/admin/admin.component.html	(revision de1885844e352817b8711a3b764f742bc7f4e375)
@@ -31,12 +31,14 @@
               </thead>
               <tbody>
-                <tr *ngFor="">
-                  <td>data1</td>
-                  <td>data2</td>
-                  <td>data3</td>
+                <tr *ngFor="let head of heads">
+                  <td>{{head.Name}} | {{head.Email}}</td>
+                  <td>{{head.Pharmacy[0].name}}</td>
+                  <td><a (click)="Approve()">Approve</a> | <a (click)="Reject()">Reject</a></td>
                 </tr>
               </tbody>
             </table>
         </div>
+        </div>
+      </mat-tab>
       <mat-tab label="Manage accounts">
         <div class="wrapper">
@@ -50,25 +52,31 @@
               </thead>
               <tbody>
-                <tr *ngFor="">
-                  <td>data1</td>
-                  <td>data2</td>
+                <tr *ngFor="let head of heads">
+                  <td>{{head.Name}} | {{head.Email}}</td>
+                  <td><a (click)="Del(head)">Delete</a> | <a (click)="ChangeDialog(head)">Change</a></td>
                 </tr>
               </tbody>
             </table>
+          </div>
         </div>
+      </mat-tab>
         <mat-tab label="Create new account">
           <div class="createform">
           <mat-form-field appearance="fill">
             <mat-label>Name</mat-label>
-            <input matInput>
+            <input matInput [(ngModel)]="head.Name">
           </mat-form-field><br>
           <mat-form-field appearance="fill">
             <mat-label>Email</mat-label>
-            <input matInput>
+            <input matInput [(ngModel)]="head.Email">
           </mat-form-field><br>
           <mat-form-field appearance="fill">
             <mat-label>Password</mat-label>
-            <input matInput>
+            <input matInput [(ngModel)]="head.Passwd">
           </mat-form-field><br>
-            <button mat-raised-button color="primary">Create</button>
+            <button onclick="createHead()" mat-raised-button color="primary">Create</button>
           </div>
+        </mat-tab>
+</mat-tab-group>
+
+<div class="status">{{status}}</div>
Index: Farmatiko/ClientApp/src/app/admin/admin.component.ts
===================================================================
--- Farmatiko/ClientApp/src/app/admin/admin.component.ts	(revision e42f61a81e3d21811e04fddc9568197a096eadd7)
+++ Farmatiko/ClientApp/src/app/admin/admin.component.ts	(revision de1885844e352817b8711a3b764f742bc7f4e375)
@@ -1,4 +1,11 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, Inject, Output, EventEmitter } from '@angular/core';
+import { Pharmacy } from '../models/Pharmacy';
+import { HttpClient } from '@angular/common/http';
+import { MatDialog } from '@angular/material/dialog';
+import { MatSnackBar, MatSnackBarRef, SimpleSnackBar } from '@angular/material/snack-bar';
+import { Router, RouterModule } from '@angular/router';
+import { PharmacyHead } from '../models/PharmacyHead';
 import { FormControl } from '@angular/forms';
+
 
 @Component({
@@ -8,8 +15,49 @@
 })
 export class AdminComponent implements OnInit {
+  public heads: PharmacyHead[];
+  public head: PharmacyHead;
+  public status: string;
 
-  constructor() { }
+  constructor(http: HttpClient, @Inject('BASE_URL') baseUrl: string, private dialog: MatDialog, private _snackBar: MatSnackBar, private router: Router) {
+    http.get<PharmacyHead[]>(baseUrl + 'PharmacyHead/Get?').subscribe(result => {
+      this.heads = result;
+      console.log(this.heads);
+    }, error => console.error(error));
+  }
 
   ngOnInit(): void {
+    this.head = new PharmacyHead();
+  }
+
+  createHead() {
+    console.log(this.head);
+    // post request vo prodolzenie
+
+    this.status="Status bar createHead";
+    //window.location.reload();
+  }
+
+  Del(head: PharmacyHead) {
+    console.log(this.head);
+    // post request vo prodolzenie
+
+    this.status="Status bar Del";
+  }
+
+  ChangeDialog(head: PharmacyHead) {
+    console.log(this.head);
+
+  }
+
+  Reject() {
+    console.log('Rejected');
+    // post request vo prodolzenie
+
+  }
+
+  Approve() {
+    console.log('Approved');
+    // post request vo prodolzenie
+
   }
 
Index: Farmatiko/ClientApp/src/app/app.module.ts
===================================================================
--- Farmatiko/ClientApp/src/app/app.module.ts	(revision e42f61a81e3d21811e04fddc9568197a096eadd7)
+++ Farmatiko/ClientApp/src/app/app.module.ts	(revision de1885844e352817b8711a3b764f742bc7f4e375)
@@ -11,5 +11,4 @@
 import { HomeComponent } from './home/home.component';
 import { CounterComponent } from './counter/counter.component';
-import { FetchDataComponent } from './fetch-data/fetch-data.component';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { KoronaComponent } from './korona/korona.component';
@@ -24,5 +23,4 @@
     HomeComponent,
     CounterComponent,
-    FetchDataComponent,
     KoronaComponent,
     AdminComponent,
@@ -37,5 +35,4 @@
       { path: '', component: HomeComponent, pathMatch: 'full' },
       { path: 'mapa', component: CounterComponent },
-      { path: 'fetch-data', component: FetchDataComponent },
       { path: 'koronavirus', component: KoronaComponent },
       { path: 'admin', component: AdminComponent },
Index: Farmatiko/ClientApp/src/app/counter/counter.component.html
===================================================================
--- Farmatiko/ClientApp/src/app/counter/counter.component.html	(revision e42f61a81e3d21811e04fddc9568197a096eadd7)
+++ Farmatiko/ClientApp/src/app/counter/counter.component.html	(revision de1885844e352817b8711a3b764f742bc7f4e375)
@@ -53,5 +53,5 @@
     <h2>Здравствени работници</h2>
     <mat-form-field>
-      <input matInput (keyup)="applyFilter($event.target.value)" placeholder="Пронајди работник">
+      <input matInput (keyup)="applyFilterWorkers($event.target.value)" placeholder="Пронајди работник">
     </mat-form-field>
     </div>
@@ -77,6 +77,4 @@
         </ng-container>
 
-
-
           <tr mat-header-row *matHeaderRowDef="displayedColumnsWorkers"></tr>
           <tr mat-row *matRowDef="let row; columns: displayedColumnsWorkers;"></tr>
Index: Farmatiko/ClientApp/src/app/counter/counter.component.ts
===================================================================
--- Farmatiko/ClientApp/src/app/counter/counter.component.ts	(revision e42f61a81e3d21811e04fddc9568197a096eadd7)
+++ Farmatiko/ClientApp/src/app/counter/counter.component.ts	(revision de1885844e352817b8711a3b764f742bc7f4e375)
@@ -49,4 +49,9 @@
     filterValue = filterValue.toLowerCase();
     this.dataSource.filter = filterValue;
+  }
+
+  applyFilterWorkers(filterValue: string) {
+    filterValue = filterValue.trim();
+    filterValue = filterValue.toLowerCase();
     this.dataSourceWorkers.filter = filterValue;
   }
Index: Farmatiko/ClientApp/src/app/dashboard/dashboard.component.html
===================================================================
--- Farmatiko/ClientApp/src/app/dashboard/dashboard.component.html	(revision e42f61a81e3d21811e04fddc9568197a096eadd7)
+++ Farmatiko/ClientApp/src/app/dashboard/dashboard.component.html	(revision de1885844e352817b8711a3b764f742bc7f4e375)
@@ -12,5 +12,5 @@
         <div class="navbar-collapse collapse d-sm-inline-flex flex-sm-row-reverse">
           <ul class="navbar-nav flex-grow">
-            <li>Logged as ...</li>
+            <li>Logged as  <!--{{head.Name}}--> </li>
           </ul>
         </div>
@@ -19,5 +19,5 @@
         <mat-menu #menu="matMenu">
           <button mat-menu-item (click)="openDialog()"><mat-icon>person_add</mat-icon>View homepage</button>
-          <button mat-menu-item (click)="test()"><mat-icon> directions</mat-icon>Go to homepage</button>
+          <button mat-menu-item (click)="test()"><mat-icon>directions</mat-icon>Go to homepage</button>
         </mat-menu>
       </div>
@@ -30,20 +30,23 @@
     <div class="header">
     <h2>Мои аптеки</h2>
+    <p *ngIf="!mypharmacies"><em>Loading...</em></p>
     </div>
     <table class='table table-striped table-bordered table-sm' cellspacing="0" width="100%" aria-labelledby="tableLabel" *ngIf="true">
       <thead>
         <tr>
-          <th>Placeholder1</th>
-          <th>Placeholder2</th>
-          <th>Placeholder3</th>
-          <th>Placeholder4</th>
+          <th>Име</th>
+          <th>Локација</th>
+          <th>Адреса</th>
+          <th>Работи 24/7</th>
+          <th>Actions</th>
         </tr>
       </thead>
       <tbody>
-        <tr *ngFor="let facility of facilities">
-          <td>data1</td>
-          <td>data2</td>
-          <td>data3</td>
-          <td>data4</td>
+        <tr *ngFor="let pharmacies of mypharmacies">
+          <td>{{pharmacies.name}}</td>
+          <td>{{pharmacies.location}}</td>
+          <td>{{pharmacies.address}}</td>
+          <td>{{pharmacies.workAllTime}}</td>
+          <td><a (click)="works24hrs(pharmacies)">Работи 24/7</a> | <a (click)="doesntWork24hrs(pharmacies)">Не работи 24/7</a></td>
         </tr>
       </tbody>
@@ -56,40 +59,30 @@
     <h2>Сите аптеки</h2>
     <mat-form-field>
-      <input matInput (keyup)="applyFilter($event.target.value)" placeholder="Пронајди аптека">
+      <input matInput (keyup)="applyFilterPharmacies($event.target.value)" placeholder="Пронајди аптека">
     </mat-form-field>
     </div>
       <table [dataSource]="dataSource" mat-table matSort class="mat-elevation-z8">
-        <ng-container matColumnDef="Име">
+        <ng-container matColumnDef="Име">a
           <th mat-header-cell *matHeaderCellDef mat-sort-header> Име </th>
-          <td mat-cell *matCellDef="let facilities"> {{facilities.name}} </td>
+          <td mat-cell *matCellDef="let pharmacies"> {{pharmacies.name}} </td>
         </ng-container>
     
-        <ng-container matColumnDef="Општина">
-          <th mat-header-cell *matHeaderCellDef mat-sort-header> Општина </th>
-          <td mat-cell *matCellDef="let facilities"> {{facilities.municipality}} </td>
+        <ng-container matColumnDef="Локација">
+          <th mat-header-cell *matHeaderCellDef mat-sort-header> Локација </th>
+          <td mat-cell *matCellDef="let pharmacies"> {{pharmacies.location}} </td>
         </ng-container>
       
         <ng-container matColumnDef="Адреса">
           <th mat-header-cell *matHeaderCellDef mat-sort-header> Адреса </th>
-          <td mat-cell *matCellDef="let facilities"> {{facilities.address}} </td>
+          <td mat-cell *matCellDef="let pharmacies"> {{pharmacies.address}} </td>
         </ng-container>
-        
-        <ng-container matColumnDef="Тип">
-          <th mat-header-cell *matHeaderCellDef mat-sort-header> Тип </th>
-          <td mat-cell *matCellDef="let facilities"> {{facilities.type}} </td>
-        </ng-container>
-    
-        <ng-container matColumnDef="Е-пошта">
-          <th mat-header-cell *matHeaderCellDef mat-sort-header> Е-пошта </th>
-          <td mat-cell *matCellDef="let facilities"> {{facilities.email}} </td>
-        </ng-container>
-      
-        <ng-container matColumnDef="Телефон">
-          <th mat-header-cell *matHeaderCellDef mat-sort-header> Телефон </th>
-          <td mat-cell *matCellDef="let facilities"> {{facilities.phone}} </td>
+
+        <ng-container matColumnDef="Actions">
+          <th mat-header-cell *matHeaderCellDef mat-sort-header> Actions </th>
+          <td mat-cell *matCellDef="let pharmacies"> <a (click)="claimPharmacy(pharmacies)">Claim Pharmacy</a> </td>
         </ng-container>
   
-          <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
-          <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
+          <tr mat-header-row *matHeaderRowDef="displayedColumnsPharmacies"></tr>
+          <tr mat-row *matRowDef="let row; columns: displayedColumnsPharmacies;"></tr>
       </table>
       <mat-paginator #paginator [pageSize]="5" [pageSizeOptions]="[5, 10, 20, 100]"></mat-paginator>
@@ -97,4 +90,6 @@
     </mat-tab>
   </mat-tab-group>
+
+  <div class="statusbar">{{status}}</div>
 
 <div class="wrapper">
@@ -104,34 +99,44 @@
       <input matInput (keyup)="applyFilter($event.target.value)" placeholder="Пронајди лек">
     </mat-form-field>
-    </div>
+      </div>
       <table [dataSource]="dataSource" mat-table matSort class="mat-elevation-z8">
         <ng-container matColumnDef="Име">
           <th mat-header-cell *matHeaderCellDef mat-sort-header> Име </th>
-          <td mat-cell *matCellDef="let facilities"> {{facilities.name}} </td>
+          <td mat-cell *matCellDef="let mymedicines"> {{mymedicines.name}} </td>
         </ng-container>
     
-        <ng-container matColumnDef="Општина">
-          <th mat-header-cell *matHeaderCellDef mat-sort-header> Општина </th>
-          <td mat-cell *matCellDef="let facilities"> {{facilities.municipality}} </td>
+        <ng-container matColumnDef="Јачина">
+          <th mat-header-cell *matHeaderCellDef mat-sort-header> Јачина </th>
+          <td mat-cell *matCellDef="let mymedicines"> {{mymedicines.strength}} </td>
         </ng-container>
       
-        <ng-container matColumnDef="Адреса">
-          <th mat-header-cell *matHeaderCellDef mat-sort-header> Адреса </th>
-          <td mat-cell *matCellDef="let facilities"> {{facilities.address}} </td>
+        <ng-container matColumnDef="Форма">
+          <th mat-header-cell *matHeaderCellDef mat-sort-header> Форма </th>
+          <td mat-cell *matCellDef="let mymedicines"> {{mymedicines.form}} </td>
         </ng-container>
         
-        <ng-container matColumnDef="Тип">
-          <th mat-header-cell *matHeaderCellDef mat-sort-header> Тип </th>
-          <td mat-cell *matCellDef="let facilities"> {{facilities.type}} </td>
+        <ng-container matColumnDef="Начин на издавање">
+          <th mat-header-cell *matHeaderCellDef mat-sort-header> Начин на издавање </th>
+          <td mat-cell *matCellDef="let mymedicines"> {{mymedicines.wayOfIssuing}} </td>
         </ng-container>
     
-        <ng-container matColumnDef="Е-пошта">
-          <th mat-header-cell *matHeaderCellDef mat-sort-header> Е-пошта </th>
-          <td mat-cell *matCellDef="let facilities"> {{facilities.email}} </td>
+        <ng-container matColumnDef="Производител">
+          <th mat-header-cell *matHeaderCellDef mat-sort-header> Производител </th>
+          <td mat-cell *matCellDef="let mymedicines"> {{mymedicines.manufacturer}} </td>
         </ng-container>
       
-        <ng-container matColumnDef="Телефон">
-          <th mat-header-cell *matHeaderCellDef mat-sort-header> Телефон </th>
-          <td mat-cell *matCellDef="let facilities"> {{facilities.phone}} </td>
+        <ng-container matColumnDef="Цена">
+          <th mat-header-cell *matHeaderCellDef mat-sort-header> Цена </th>
+          <td mat-cell *matCellDef="let mymedicines"> {{mymedicines.price}} </td>
+        </ng-container>
+  
+        <ng-container matColumnDef="Пакување">
+          <th mat-header-cell *matHeaderCellDef mat-sort-header> Пакување </th>
+          <td mat-cell *matCellDef="let mymedicines"> {{mymedicines.packaging}} </td>
+        </ng-container>
+  
+        <ng-container matColumnDef="Actions">
+          <th mat-header-cell *matHeaderCellDef mat-sort-header> Actions </th>
+          <td mat-cell *matCellDef="let mymedicines"> <a (click)="medicineExists(mymedicines)">Exists</a> | <a (click)="medicineDoesntSell(mymedicines)">Doesnt sell</a> </td>
         </ng-container>
   
Index: Farmatiko/ClientApp/src/app/dashboard/dashboard.component.ts
===================================================================
--- Farmatiko/ClientApp/src/app/dashboard/dashboard.component.ts	(revision e42f61a81e3d21811e04fddc9568197a096eadd7)
+++ Farmatiko/ClientApp/src/app/dashboard/dashboard.component.ts	(revision de1885844e352817b8711a3b764f742bc7f4e375)
@@ -4,5 +4,4 @@
 import { MatPaginator } from '@angular/material/paginator';
 import { MatSort } from '@angular/material/sort';
-import { HealthFacilities } from '../models/HealthFacilities';
 import { HttpClient } from '@angular/common/http';
 import { MatDialog } from '@angular/material/dialog';
@@ -10,4 +9,7 @@
 import { Router, RouterModule } from '@angular/router';
 import { HomeComponent } from '../home/home.component';
+import { Medicine } from '../models/Medicine';
+import { PharmacyHead } from '../models/PharmacyHead';
+import { MedicineList } from '../models/MedicineList';
 
 @Component({
@@ -17,7 +19,14 @@
 })
 export class DashboardComponent implements OnInit {
-  public facilities: HealthFacilities[];
-  displayedColumns = ['Име','Општина','Адреса', 'Тип', 'Е-пошта', 'Телефон'];
-  dataSource = new MatTableDataSource<HealthFacilities>();
+  public mymedicines: Medicine[];
+  public hasmymedicines: boolean[];
+  public pharmacies: Pharmacy[];
+  public mypharmacies: Pharmacy[];
+  public head: PharmacyHead;
+  public status: string;
+  displayedColumns = ['Име','Јачина','Форма', 'Начин на издавање', 'Производител', 'Цена', 'Пакување', 'Actions'];
+  displayedColumnsPharmacies = ['Име','Локација','Адреса', 'Actions'];
+  dataSource = new MatTableDataSource<Medicine>();
+  dataSourcePharmacies = new MatTableDataSource<Pharmacy>();
 
   @ViewChild(MatPaginator, {static: true}) paginator: MatPaginator;
@@ -25,10 +34,20 @@
 
   constructor(http: HttpClient, @Inject('BASE_URL') baseUrl: string, private dialog: MatDialog, private _snackBar: MatSnackBar, private router: Router) {
-    http.get<HealthFacilities[]>(baseUrl + 'HealthFacilities/Get?').subscribe(result => {
-      this.facilities = result;
-      console.log(this.facilities);
-      this.dataSource = new MatTableDataSource<HealthFacilities>(this.facilities);
+    http.get<PharmacyHead>(baseUrl + 'PharmacyHead/GetLoggedHead?').subscribe(result => {
+      this.head = result;
+      console.log(this.head);
+      this.mymedicines = this.head.PharmacyMedicines.Medicines;
+      console.log(this.mymedicines);
+      this.mypharmacies = this.head.Pharmacy;
+      console.log(this.mypharmacies);
+      this.dataSource = new MatTableDataSource<Medicine>(this.mymedicines);
+    }, 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 {
   }
@@ -37,4 +56,41 @@
     this.dataSource.paginator = this.paginator;
     this.dataSource.sort = this.sort;
+    this.dataSourcePharmacies.paginator = this.paginator;
+    this.dataSourcePharmacies.sort = this.sort;
+  }
+
+  works24hrs(pharmacy: Pharmacy) {
+    console.log(pharmacy);
+    // post request vo prodolzenie
+
+    this.status="Status bar works24hrs";
+  }
+
+  doesntWork24hrs(pharmacy: Pharmacy) {
+    console.log(pharmacy);
+    // post request vo prodolzenie
+
+    this.status="Status bar doesntWork24hrs";
+  }
+
+  claimPharmacy(pharmacy: Pharmacy) {
+    console.log(pharmacy);
+    // post request vo prodolzenie
+
+    this.status="Status bar claimPharmacy";
+  }
+
+  medicineExists(mymedicine: Medicine) {
+    console.log(mymedicine);
+    // post request vo prodolzenie
+
+    this.status="Status bar medicineexists";
+  }
+
+  medicineDoesntSell(mymedicine: Medicine) {
+    console.log(mymedicine);
+    // post request vo prodolzenie
+
+    this.status="Status bar medicineDoesntSell";
   }
 
@@ -44,4 +100,11 @@
     this.dataSource.filter = filterValue;
   }
+  
+  applyFilterPharmacies(filterValue: string) {
+    filterValue = filterValue.trim();
+    filterValue = filterValue.toLowerCase();
+    this.dataSourcePharmacies.filter = filterValue;
+  }
+
   test(): void {
     console.log('Snackbar works!');
Index: rmatiko/ClientApp/src/app/fetch-data/fetch-data.component.html
===================================================================
--- Farmatiko/ClientApp/src/app/fetch-data/fetch-data.component.html	(revision e42f61a81e3d21811e04fddc9568197a096eadd7)
+++ 	(revision )
@@ -1,24 +1,0 @@
-<h1 id="tableLabel">Weather forecast</h1>
-
-<p>This component demonstrates fetching data from the server.</p>
-
-<p *ngIf="!forecasts"><em>Loading...</em></p>
-
-<table class='table table-striped' aria-labelledby="tableLabel" *ngIf="forecasts">
-  <thead>
-    <tr>
-      <th>Date</th>
-      <th>Temp. (C)</th>
-      <th>Temp. (F)</th>
-      <th>Summary</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr *ngFor="let forecast of forecasts">
-      <td>{{ forecast.date }}</td>
-      <td>{{ forecast.temperatureC }}</td>
-      <td>{{ forecast.temperatureF }}</td>
-      <td>{{ forecast.summary }}</td>
-    </tr>
-  </tbody>
-</table>
Index: rmatiko/ClientApp/src/app/fetch-data/fetch-data.component.ts
===================================================================
--- Farmatiko/ClientApp/src/app/fetch-data/fetch-data.component.ts	(revision e42f61a81e3d21811e04fddc9568197a096eadd7)
+++ 	(revision )
@@ -1,24 +1,0 @@
-import { Component, Inject } from '@angular/core';
-import { HttpClient } from '@angular/common/http';
-
-@Component({
-  selector: 'app-fetch-data',
-  templateUrl: './fetch-data.component.html'
-})
-export class FetchDataComponent {
-  public forecasts: WeatherForecast[];
-
-  constructor(http: HttpClient, @Inject('BASE_URL') baseUrl: string) {
-    http.get<WeatherForecast[]>(baseUrl + 'weatherforecast').subscribe(result => {
-      this.forecasts = result;
-      console.log(this.forecasts);
-    }, error => console.error(error));
-  }
-}
-
-interface WeatherForecast {
-  date: string;
-  temperatureC: number;
-  temperatureF: number;
-  summary: string;
-}
Index: Farmatiko/ClientApp/src/app/home/home.component.html
===================================================================
--- Farmatiko/ClientApp/src/app/home/home.component.html	(revision e42f61a81e3d21811e04fddc9568197a096eadd7)
+++ Farmatiko/ClientApp/src/app/home/home.component.html	(revision de1885844e352817b8711a3b764f742bc7f4e375)
@@ -13,30 +13,35 @@
       <ng-container matColumnDef="Име">
         <th mat-header-cell *matHeaderCellDef mat-sort-header> Име </th>
-        <td mat-cell *matCellDef="let facilities"> {{facilities.name}} </td>
+        <td mat-cell *matCellDef="let medicines"> {{medicines.name}} </td>
       </ng-container>
   
-      <ng-container matColumnDef="Општина">
-        <th mat-header-cell *matHeaderCellDef mat-sort-header> Општина </th>
-        <td mat-cell *matCellDef="let facilities"> {{facilities.municipality}} </td>
+      <ng-container matColumnDef="Јачина">
+        <th mat-header-cell *matHeaderCellDef mat-sort-header> Јачина </th>
+        <td mat-cell *matCellDef="let medicines"> {{medicines.strength}} </td>
       </ng-container>
     
-      <ng-container matColumnDef="Адреса">
-        <th mat-header-cell *matHeaderCellDef mat-sort-header> Адреса </th>
-        <td mat-cell *matCellDef="let facilities"> {{facilities.address}} </td>
+      <ng-container matColumnDef="Форма">
+        <th mat-header-cell *matHeaderCellDef mat-sort-header> Форма </th>
+        <td mat-cell *matCellDef="let medicines"> {{medicines.form}} </td>
       </ng-container>
       
-      <ng-container matColumnDef="Тип">
-        <th mat-header-cell *matHeaderCellDef mat-sort-header> Тип </th>
-        <td mat-cell *matCellDef="let facilities"> {{facilities.type}} </td>
+      <ng-container matColumnDef="Начин на издавање">
+        <th mat-header-cell *matHeaderCellDef mat-sort-header> Начин на издавање </th>
+        <td mat-cell *matCellDef="let medicines"> {{medicines.wayOfIssuing}} </td>
       </ng-container>
   
-      <ng-container matColumnDef="Е-пошта">
-        <th mat-header-cell *matHeaderCellDef mat-sort-header> Е-пошта </th>
-        <td mat-cell *matCellDef="let facilities"> {{facilities.email}} </td>
+      <ng-container matColumnDef="Производител">
+        <th mat-header-cell *matHeaderCellDef mat-sort-header> Производител </th>
+        <td mat-cell *matCellDef="let medicines"> {{medicines.manufacturer}} </td>
       </ng-container>
     
-      <ng-container matColumnDef="Телефон">
-        <th mat-header-cell *matHeaderCellDef mat-sort-header> Телефон </th>
-        <td mat-cell *matCellDef="let facilities"> {{facilities.phone}} </td>
+      <ng-container matColumnDef="Цена">
+        <th mat-header-cell *matHeaderCellDef mat-sort-header> Цена </th>
+        <td mat-cell *matCellDef="let medicines"> {{medicines.price}} </td>
+      </ng-container>
+
+      <ng-container matColumnDef="Пакување">
+        <th mat-header-cell *matHeaderCellDef mat-sort-header> Пакување </th>
+        <td mat-cell *matCellDef="let medicines"> {{medicines.packaging}} </td>
       </ng-container>
 
@@ -52,40 +57,30 @@
     <h2>Аптеки</h2>
     <mat-form-field>
-      <input matInput (keyup)="applyFilter($event.target.value)" placeholder="Пронајди аптека">
+      <input matInput (keyup)="applyFilterPharmacies($event.target.value)" placeholder="Пронајди аптека">
     </mat-form-field>
     </div>
       <table [dataSource]="dataSource" mat-table matSort class="mat-elevation-z8">
-        <ng-container matColumnDef="Име">
+        <ng-container matColumnDef="Име">a
           <th mat-header-cell *matHeaderCellDef mat-sort-header> Име </th>
-          <td mat-cell *matCellDef="let facilities"> {{facilities.name}} </td>
+          <td mat-cell *matCellDef="let pharmacies"> {{pharmacies.name}} </td>
         </ng-container>
     
-        <ng-container matColumnDef="Општина">
-          <th mat-header-cell *matHeaderCellDef mat-sort-header> Општина </th>
-          <td mat-cell *matCellDef="let facilities"> {{facilities.municipality}} </td>
+        <ng-container matColumnDef="Локација">
+          <th mat-header-cell *matHeaderCellDef mat-sort-header> Локација </th>
+          <td mat-cell *matCellDef="let pharmacies"> {{pharmacies.location}} </td>
         </ng-container>
       
         <ng-container matColumnDef="Адреса">
           <th mat-header-cell *matHeaderCellDef mat-sort-header> Адреса </th>
-          <td mat-cell *matCellDef="let facilities"> {{facilities.address}} </td>
+          <td mat-cell *matCellDef="let pharmacies"> {{pharmacies.address}} </td>
         </ng-container>
         
-        <ng-container matColumnDef="Тип">
-          <th mat-header-cell *matHeaderCellDef mat-sort-header> Тип </th>
-          <td mat-cell *matCellDef="let facilities"> {{facilities.type}} </td>
-        </ng-container>
-    
-        <ng-container matColumnDef="Е-пошта">
-          <th mat-header-cell *matHeaderCellDef mat-sort-header> Е-пошта </th>
-          <td mat-cell *matCellDef="let facilities"> {{facilities.email}} </td>
-        </ng-container>
-      
-        <ng-container matColumnDef="Телефон">
-          <th mat-header-cell *matHeaderCellDef mat-sort-header> Телефон </th>
-          <td mat-cell *matCellDef="let facilities"> {{facilities.phone}} </td>
+        <ng-container matColumnDef="Работи 27/7?">
+          <th mat-header-cell *matHeaderCellDef mat-sort-header> Работи 27/7? </th>
+          <td mat-cell *matCellDef="let pharmacies"> {{pharmacies.workAllTime}} </td>
         </ng-container>
   
-          <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
-          <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
+          <tr mat-header-row *matHeaderRowDef="displayedColumnsPharmacies"></tr>
+          <tr mat-row *matRowDef="let row; columns: displayedColumnsPharmacies;"></tr>
       </table>
       <mat-paginator #paginator [pageSize]="5" [pageSizeOptions]="[5, 10, 20, 100]"></mat-paginator>
Index: Farmatiko/ClientApp/src/app/home/home.component.ts
===================================================================
--- Farmatiko/ClientApp/src/app/home/home.component.ts	(revision e42f61a81e3d21811e04fddc9568197a096eadd7)
+++ Farmatiko/ClientApp/src/app/home/home.component.ts	(revision de1885844e352817b8711a3b764f742bc7f4e375)
@@ -1,9 +1,9 @@
 import { Component, OnInit, ViewChild, Inject } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
-import { HealthFacilities } from '../models/HealthFacilities';
+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';
-
 
 @Component({
@@ -13,7 +13,10 @@
 })
 export class HomeComponent implements OnInit {
-  public facilities: HealthFacilities[];
-  displayedColumns = ['Име','Општина','Адреса', 'Тип', 'Е-пошта', 'Телефон'];
-  dataSource = new MatTableDataSource<HealthFacilities>();
+  public medicines: Medicine[];
+  public pharmacies: Pharmacy[];
+  displayedColumns = ['Име','Јачина','Форма', 'Начин на издавање', 'Производител', 'Цена', 'Пакување'];
+  displayedColumnsPharmacies = ['Име','Локација','Адреса', 'Работи 27/7?'];
+  dataSource = new MatTableDataSource<Medicine>();
+  dataSourcePharmacies = new MatTableDataSource<Pharmacy>();
 
   @ViewChild(MatPaginator, {static: true}) paginator: MatPaginator;
@@ -21,8 +24,13 @@
 
   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);
+    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));
   }
@@ -33,4 +41,6 @@
     this.dataSource.paginator = this.paginator;
     this.dataSource.sort = this.sort;
+    this.dataSourcePharmacies.paginator = this.paginator;
+    this.dataSourcePharmacies.sort = this.sort;
   }
 
@@ -40,3 +50,9 @@
     this.dataSource.filter = filterValue;
   }
+  
+  applyFilterPharmacies(filterValue: string) {
+    filterValue = filterValue.trim();
+    filterValue = filterValue.toLowerCase();
+    this.dataSourcePharmacies.filter = filterValue;
+  }
 }
Index: Farmatiko/ClientApp/src/app/korona/korona.component.html
===================================================================
--- Farmatiko/ClientApp/src/app/korona/korona.component.html	(revision e42f61a81e3d21811e04fddc9568197a096eadd7)
+++ Farmatiko/ClientApp/src/app/korona/korona.component.html	(revision de1885844e352817b8711a3b764f742bc7f4e375)
@@ -8,13 +8,10 @@
       <p>статистика</p>
     </div>
-
-
-
   </div>
   <div class="row text-center pads">
     <div class="col">
       <div class="counter">
-        <i class="fa fa-code fa-2x">0</i>
-        <h2 class="timer count-title count-number" data-to="100" data-speed="1500"></h2>
+        <i class="fa fa-code fa-2x" *ngIf="korona">{{korona.totalMK}}</i>
+        <h2 class="timer count-title count-number"></h2>
         <p class="count-text ">Вкупно случаи во земјата</p>
       </div>
@@ -22,6 +19,6 @@
     <div class="col">
       <div class="counter">
-        <i class="fa fa-coffee fa-2x">0</i>
-        <h2 class="timer count-title count-number" data-to="1700" data-speed="1500"></h2>
+        <i class="fa fa-coffee fa-2x" *ngIf="korona">{{korona.activeMK}}</i>
+        <h2 class="timer count-title count-number"></h2>
         <p class="count-text ">Активни случаи во земјата</p>
       </div>
@@ -29,6 +26,6 @@
     <div class="col">
       <div class="counter">
-        <i class="fa fa-lightbulb-o fa-2x">0</i>
-        <h2 class="timer count-title count-number" data-to="11900" data-speed="1500"></h2>
+        <i class="fa fa-lightbulb-o fa-2x" *ngIf="korona">{{korona.deathsMK}}</i>
+        <h2 class="timer count-title count-number"></h2>
         <p class="count-text ">Смртни случаи во земјата</p>
       </div>
@@ -36,6 +33,6 @@
     <div class="col">
       <div class="counter">
-        <i class="fa fa-bug fa-2x">0</i>
-        <h2 class="timer count-title count-number" data-to="157" data-speed="1500"></h2>
+        <i class="fa fa-bug fa-2x" *ngIf="korona">{{korona.newMK}}</i>
+        <h2 class="timer count-title count-number"></h2>
         <p class="count-text ">Нови случаи во земјата</p>
       </div>
@@ -45,6 +42,6 @@
     <div class="col">
       <div class="counter">
-        <i class="fa fa-bug fa-2x">0</i>
-        <h2 class="timer count-title count-number" data-to="157" data-speed="1500"></h2>
+        <i class="fa fa-bug fa-2x" *ngIf="korona">{{korona.totalGlobal}}</i>
+        <h2 class="timer count-title count-number"></h2>
         <p class="count-text ">Вкупно случаи глобално</p>
       </div>
@@ -52,6 +49,6 @@
     <div class="col">
       <div class="counter">
-        <i class="fa fa-bug fa-2x">0</i>
-        <h2 class="timer count-title count-number" data-to="157" data-speed="1500"></h2>
+        <i class="fa fa-bug fa-2x" *ngIf="korona">{{korona.activeGlobal}}</i>
+        <h2 class="timer count-title count-number"></h2>
         <p class="count-text ">Активни случаи глобално</p>
       </div>
@@ -59,6 +56,6 @@
     <div class="col">
       <div class="counter">
-        <i class="fa fa-bug fa-2x">0</i>
-        <h2 class="timer count-title count-number" data-to="157" data-speed="1500"></h2>
+        <i class="fa fa-bug fa-2x" *ngIf="korona">{{korona.deathsGlobal}}</i>
+        <h2 class="timer count-title count-number"></h2>
         <p class="count-text ">Смртни случаи глобално</p>
       </div>
Index: Farmatiko/ClientApp/src/app/korona/korona.component.ts
===================================================================
--- Farmatiko/ClientApp/src/app/korona/korona.component.ts	(revision e42f61a81e3d21811e04fddc9568197a096eadd7)
+++ Farmatiko/ClientApp/src/app/korona/korona.component.ts	(revision de1885844e352817b8711a3b764f742bc7f4e375)
@@ -1,3 +1,6 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, Inject } from '@angular/core';
+import { Pandemic } from '../models/Pandemic';
+import { MatTableDataSource } from '@angular/material/table';
+import { HttpClient } from '@angular/common/http';
 
 @Component({
@@ -7,6 +10,12 @@
 })
 export class KoronaComponent implements OnInit {
+  public korona: Pandemic;
 
-  constructor() { }
+  constructor(http: HttpClient, @Inject('BASE_URL') baseUrl: string) { 
+    http.get<Pandemic>(baseUrl + 'Pandemic/Get?').subscribe(result => {
+      this.korona = result;
+      console.log(this.korona);
+    }, error => console.error(error));
+  }
 
   ngOnInit(): void {
Index: Farmatiko/ClientApp/src/app/models/HealthcareWorkers.ts
===================================================================
--- Farmatiko/ClientApp/src/app/models/HealthcareWorkers.ts	(revision e42f61a81e3d21811e04fddc9568197a096eadd7)
+++ Farmatiko/ClientApp/src/app/models/HealthcareWorkers.ts	(revision de1885844e352817b8711a3b764f742bc7f4e375)
@@ -2,7 +2,7 @@
 
 export class HealthcareWorkers {
-  Name: string;
-  Branch: Date;
-  Facility: HealthFacilities;
-  Title: string;
+  name: string;
+  branch: Date;
+  facility: HealthFacilities;
+  title: string;
 }
Index: Farmatiko/ClientApp/src/app/models/Medicine.ts
===================================================================
--- Farmatiko/ClientApp/src/app/models/Medicine.ts	(revision e42f61a81e3d21811e04fddc9568197a096eadd7)
+++ Farmatiko/ClientApp/src/app/models/Medicine.ts	(revision de1885844e352817b8711a3b764f742bc7f4e375)
@@ -1,9 +1,9 @@
 export class Medicine {
-  Name: string;
-  Strength: string;
-  Form: string;
-  WayOfIssuing: string;
-  Manufacturer: string;
-  Price: Float32Array;
-  Packaging: string;
+  name: string;
+  strength: string;
+  form: string;
+  wayOfIssuing: string;
+  manufacturer: string;
+  price: number;
+  packaging: string;
 }
Index: Farmatiko/ClientApp/src/app/models/Pandemic.ts
===================================================================
--- Farmatiko/ClientApp/src/app/models/Pandemic.ts	(revision e42f61a81e3d21811e04fddc9568197a096eadd7)
+++ Farmatiko/ClientApp/src/app/models/Pandemic.ts	(revision de1885844e352817b8711a3b764f742bc7f4e375)
@@ -1,10 +1,10 @@
 export class Pandemic {
-  Name: string;
-  TotalMK: number;
-  ActiveMK: number;
-  DeathsMK: number;
-  NewMK: number;
-  TotalGlobal: number;
-  DeathsGlobal: number;
-  ActiveGlobal: number;
+  name: string;
+  totalMK: number;
+  activeMK: number;
+  deathsMK: number;
+  newMK: number;
+  totalGlobal: number;
+  deathsGlobal: number;
+  activeGlobal: number;
 }
Index: Farmatiko/ClientApp/src/app/models/Pharmacy.ts
===================================================================
--- Farmatiko/ClientApp/src/app/models/Pharmacy.ts	(revision e42f61a81e3d21811e04fddc9568197a096eadd7)
+++ Farmatiko/ClientApp/src/app/models/Pharmacy.ts	(revision de1885844e352817b8711a3b764f742bc7f4e375)
@@ -1,6 +1,6 @@
 export class Pharmacy {
-  Name: string;
-  Location: string;
-  Address: string;
-  WorkAllTime: boolean;
+  name: string;
+  location: string;
+  address: string;
+  workAllTime: boolean;
 }