Index: Farmatiko/ClientApp/src/app/dialogs/add-medicine-dialog/add-medicine-dialog.component.css
===================================================================
--- Farmatiko/ClientApp/src/app/dialogs/add-medicine-dialog/add-medicine-dialog.component.css	(revision 8b13eb2317b2e7d696c9fee54d24a67a25e17b50)
+++ Farmatiko/ClientApp/src/app/dialogs/add-medicine-dialog/add-medicine-dialog.component.css	(revision 8b13eb2317b2e7d696c9fee54d24a67a25e17b50)
@@ -0,0 +1,6 @@
+.wrapper {
+    display: block;
+    text-align: center;
+    align-items: center;
+    justify-content: center;
+}
Index: Farmatiko/ClientApp/src/app/dialogs/add-medicine-dialog/add-medicine-dialog.component.html
===================================================================
--- Farmatiko/ClientApp/src/app/dialogs/add-medicine-dialog/add-medicine-dialog.component.html	(revision 8b13eb2317b2e7d696c9fee54d24a67a25e17b50)
+++ Farmatiko/ClientApp/src/app/dialogs/add-medicine-dialog/add-medicine-dialog.component.html	(revision 8b13eb2317b2e7d696c9fee54d24a67a25e17b50)
@@ -0,0 +1,34 @@
+<div class="wrapper">
+<form [formGroup]="forma" (ngSubmit)="save()">
+  <mat-form-field appearance="fill">
+      <mat-label>Име</mat-label>
+      <input matInput type="text" formControlName="name" required>
+  </mat-form-field><br/>
+  <mat-form-field appearance="fill">
+      <mat-label>Јачина</mat-label>
+      <input matInput type="text" formControlName="strength" required>
+  </mat-form-field><br/>
+  <mat-form-field appearance="fill">
+      <mat-label>Форма</mat-label>
+      <input matInput type="text" formControlName="form" required>
+  </mat-form-field><br/>
+  <mat-form-field appearance="fill">
+    <mat-label>Начин на издавање</mat-label>
+    <input matInput type="text" formControlName="wayOfIssuing" required>
+  </mat-form-field><br/>
+  <mat-form-field appearance="fill">
+    <mat-label>Производител</mat-label>
+    <input matInput type="text" formControlName="manufacturer" required>
+  </mat-form-field><br/>
+  <mat-form-field appearance="fill">
+      <mat-label>Цена</mat-label>
+      <input matInput type="text" formControlName="price" required>
+  </mat-form-field><br/>
+  <mat-form-field appearance="fill">
+      <mat-label>Пакување</mat-label>
+      <input matInput type="text" formControlName="packaging" required>
+  </mat-form-field><br/>
+  <button type="reset" class="btn btn-default" (click)="close()">Cancel</button>&nbsp;&nbsp;
+  <button type="submit" class="btn btn-success" [disabled]="!forma.valid">Save</button>
+</form>
+</div>
Index: Farmatiko/ClientApp/src/app/dialogs/add-medicine-dialog/add-medicine-dialog.component.ts
===================================================================
--- Farmatiko/ClientApp/src/app/dialogs/add-medicine-dialog/add-medicine-dialog.component.ts	(revision 8b13eb2317b2e7d696c9fee54d24a67a25e17b50)
+++ Farmatiko/ClientApp/src/app/dialogs/add-medicine-dialog/add-medicine-dialog.component.ts	(revision 8b13eb2317b2e7d696c9fee54d24a67a25e17b50)
@@ -0,0 +1,42 @@
+import { Component, OnInit } from '@angular/core';
+import { MatDialogRef } from '@angular/material/dialog';
+import { IMedicine } from '../../shared';
+import { FormGroup, Validators, FormBuilder }  from '@angular/forms';
+
+@Component({
+  selector: 'app-add-medicine-dialog',
+  templateUrl: './add-medicine-dialog.component.html',
+  styleUrls: ['./add-medicine-dialog.component.css']
+})
+export class AddMedicineDialogComponent implements OnInit {
+  medicine: IMedicine;
+  forma: FormGroup;
+
+  constructor(private dialogRef: MatDialogRef<AddMedicineDialogComponent>, private formBuilder: FormBuilder) {
+
+  }
+
+  ngOnInit(): void {
+    this.forma = this.formBuilder.group({
+      name: ['', [Validators.required]],
+      strength: ['', [Validators.required]],
+      form: ['', [Validators.required]],
+      wayOfIssuing: ['', [Validators.required]],
+      manufacturer: ['', [Validators.required]],
+      price: ['', [Validators.required, Validators.min(0)]],
+      packaging: ['', [Validators.required]]
+    });
+  }
+
+  save() {
+    this.medicine = this.forma.value;
+    console.log(this.forma.value);
+    console.log(this.medicine);
+    this.forma.reset();
+    this.dialogRef.close(this.medicine);
+  }
+
+  close() {
+    this.dialogRef.close();
+  }
+}
Index: Farmatiko/ClientApp/src/app/dialogs/list-medicines-dialog/list-medicines-dialog.component.css
===================================================================
--- Farmatiko/ClientApp/src/app/dialogs/list-medicines-dialog/list-medicines-dialog.component.css	(revision 8b13eb2317b2e7d696c9fee54d24a67a25e17b50)
+++ Farmatiko/ClientApp/src/app/dialogs/list-medicines-dialog/list-medicines-dialog.component.css	(revision 8b13eb2317b2e7d696c9fee54d24a67a25e17b50)
@@ -0,0 +1,3 @@
+mat-form-field {
+    width: 100%;
+}
Index: Farmatiko/ClientApp/src/app/dialogs/list-medicines-dialog/list-medicines-dialog.component.html
===================================================================
--- Farmatiko/ClientApp/src/app/dialogs/list-medicines-dialog/list-medicines-dialog.component.html	(revision 8b13eb2317b2e7d696c9fee54d24a67a25e17b50)
+++ Farmatiko/ClientApp/src/app/dialogs/list-medicines-dialog/list-medicines-dialog.component.html	(revision 8b13eb2317b2e7d696c9fee54d24a67a25e17b50)
@@ -0,0 +1,36 @@
+<div class="wrapper">
+    <div class="header">
+    <h2>Листа на постоечки лекови</h2>
+  <mat-form-field>
+    <input matInput (keyup)="applyFilterMedicines($event.target.value)" placeholder="Пронајди лек">
+  </mat-form-field>
+    </div>
+  <table class='table table-striped' aria-labelledby="tableLabel" *ngIf="filteredListMedicines">
+      <thead>
+        <tr>
+      	  <th>Име</th>
+      	  <th>Јачина</th>
+      	  <th>Форма</th>
+      	  <th>Начин на издавање</th>
+      	  <th>Производител</th>
+      	  <th>Цена</th>
+          <th>Пакување</th>
+          <th>Додај</th>
+      	</tr>
+      </thead>
+      <tbody>
+      	<tr *ngFor="let medicine of filteredListMedicines">
+      	  <td>>{{ medicine.name }}</td>
+      	  <td>{{ medicine.strength }}</td>
+      	  <td>{{ medicine.form }}</td>
+      	  <td>{{ medicine.wayOfIssuing }}</td>
+      	  <td>{{ medicine.manufacturer }}</td>
+      	  <td>{{ medicine.price }}</td>
+          <td>{{ medicine.packaging }}</td>
+          <td><mat-checkbox (click)="selectMedicine(medicine)"></mat-checkbox></td>
+      	</tr>
+    </tbody>
+  </table>
+</div>
+<button type="reset" class="btn btn-default" (click)="close()">Cancel</button>&nbsp;&nbsp;
+<button type="submit" class="btn btn-success" (click)="save()">Додај ги лековите</button>
Index: Farmatiko/ClientApp/src/app/dialogs/list-medicines-dialog/list-medicines-dialog.component.ts
===================================================================
--- Farmatiko/ClientApp/src/app/dialogs/list-medicines-dialog/list-medicines-dialog.component.ts	(revision 8b13eb2317b2e7d696c9fee54d24a67a25e17b50)
+++ Farmatiko/ClientApp/src/app/dialogs/list-medicines-dialog/list-medicines-dialog.component.ts	(revision 8b13eb2317b2e7d696c9fee54d24a67a25e17b50)
@@ -0,0 +1,60 @@
+import { Component, OnInit } from '@angular/core';
+import { MatDialogRef } from '@angular/material/dialog';
+import { IMedicine } from '../../shared';
+import { DataService } from '../../shared/data.service';
+
+@Component({
+  selector: 'app-list-medicines-dialog-component',
+  templateUrl: './list-medicines-dialog.component.html',
+  styleUrls: ['./list-medicines-dialog.component.css']
+})
+export class ListMedicinesDialogComponent implements OnInit {
+  medicines: IMedicine[];
+  listMedicines: IMedicine[];
+  filteredListMedicines: IMedicine[];
+
+  constructor(private dialogRef: MatDialogRef<ListMedicinesDialogComponent>, private dataService: DataService) {
+  }
+
+  ngOnInit(): void {
+    this.dataService.getMedicines()
+        .subscribe((medicine: IMedicine[]) => {
+          this.listMedicines = this.filteredListMedicines = medicine;
+        },
+        (err: any) => console.log(err),
+        () => console.log('Medicine data retrieved'));
+  }
+
+  selectMedicine(selectedMedicine: IMedicine) {
+    if(this.medicines.filter(x => x == selectedMedicine)) {
+      this.medicines = this.medicines.filter(x => x != selectedMedicine);
+    }
+    else {
+      this.medicines.push(selectedMedicine);
+    }
+  }
+
+  save() {
+    console.log(this.medicines);
+    this.dialogRef.close(this.medicines);
+  }
+
+  close() {
+    this.dialogRef.close();
+  }
+
+  applyFilterMedicines(filterValue: string) {
+    if(filterValue) {
+      this.dataService.searchMedicines(filterValue)
+          .subscribe((medicine: IMedicine[]) => {
+            this.filteredListMedicines = medicine;
+          },
+          (err: any) => console.log(err),
+          () => console.log('Medicine data retrieved')); 
+    }
+    else {
+      this.filteredListMedicines = this.listMedicines;
+    }
+  }
+
+}
Index: Farmatiko/ClientApp/src/app/dialogs/pharmacy-head-dialog/pharmacy-head-dialog.component.html
===================================================================
--- Farmatiko/ClientApp/src/app/dialogs/pharmacy-head-dialog/pharmacy-head-dialog.component.html	(revision 8b13eb2317b2e7d696c9fee54d24a67a25e17b50)
+++ Farmatiko/ClientApp/src/app/dialogs/pharmacy-head-dialog/pharmacy-head-dialog.component.html	(revision 8b13eb2317b2e7d696c9fee54d24a67a25e17b50)
@@ -0,0 +1,1 @@
+<p>pharmacy-head-dialog works!</p>
Index: Farmatiko/ClientApp/src/app/dialogs/pharmacy-head-dialog/pharmacy-head-dialog.component.ts
===================================================================
--- Farmatiko/ClientApp/src/app/dialogs/pharmacy-head-dialog/pharmacy-head-dialog.component.ts	(revision 8b13eb2317b2e7d696c9fee54d24a67a25e17b50)
+++ Farmatiko/ClientApp/src/app/dialogs/pharmacy-head-dialog/pharmacy-head-dialog.component.ts	(revision 8b13eb2317b2e7d696c9fee54d24a67a25e17b50)
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-pharmacy-head-dialog',
+  templateUrl: './pharmacy-head-dialog.component.html',
+  styleUrls: ['./pharmacy-head-dialog.component.css']
+})
+export class PharmacyHeadDialogComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit(): void {
+  }
+
+}