diff --git a/client/src/app/app-routing.module.ts b/client/src/app/app-routing.module.ts
index 2562a11cf6bcfcaca54c4fe634080c5c5dcb616f..5a4690e8ae5346970967456c32b08164373a9ed1 100644
--- a/client/src/app/app-routing.module.ts
+++ b/client/src/app/app-routing.module.ts
@@ -42,6 +42,8 @@ import { CreateEditFileComponent } from './components/file-management/create-edi
 import { EvaluationInstrumentComponent } from './components/evaluation-instrument-management/evaluation-instrument.component';
 import { CreateEditEvaluationInstrumentComponent } from './components/evaluation-instrument-management/create-edit-evaluation-instrument/create-edit-evaluation-instrument.component';
 
+import { UniversityManagementComponent } from './components/university-management/university-management.component';
+import { CreateEditUniversityComponent } from './components/university-management/create-edit-university/create-edit-university.component';
 const routes: Routes = [
   { path: 'home', component: HomeComponent },
   { path: 'login', component: LoginComponent },
@@ -76,6 +78,8 @@ const routes: Routes = [
   { path: 'teacheronrealizationtable/createeditteacheronrealization', component: CreateEditTeacherOnRealizationComponent },
   { path: 'subjectrealizationtable', component: SubjectRealizationManagementComponent},
   { path: 'subjectrealizationtable/createeditsubjectrealization', component: CreateEditSubjectRealizationComponent },
+  { path: 'universitytable', component: UniversityManagementComponent},
+  { path: 'universitytable/createedituniversity', component: CreateEditUniversityComponent },
   { path: 'evaluationknowledgetable', component: EvaluationKnowledgeManagementComponent},
   { path: 'evaluationknowledgetable/createeditevaluationknowledge', component: CreateEditEvaluationKnowledgeComponent },
   { path: 'filetable', component: FileManagementComponent},
diff --git a/client/src/app/app.module.ts b/client/src/app/app.module.ts
index d5c1b3fe5a900f031cfb538d0a01e1d272ed5d09..c3700cee4b988f2018b6b5e0c713bff540bfda35 100644
--- a/client/src/app/app.module.ts
+++ b/client/src/app/app.module.ts
@@ -66,6 +66,8 @@ import { CreateEditFileComponent } from './components/file-management/create-edi
 import { EvaluationInstrumentComponent } from './components/evaluation-instrument-management/evaluation-instrument.component';
 import { CreateEditEvaluationInstrumentComponent } from './components/evaluation-instrument-management/create-edit-evaluation-instrument/create-edit-evaluation-instrument.component';
 
+import { UniversityManagementComponent } from './components/university-management/university-management.component';
+import { CreateEditUniversityComponent } from './components/university-management/create-edit-university/create-edit-university.component';
 @NgModule({
   declarations: [
     AppComponent,
@@ -104,6 +106,8 @@ import { CreateEditEvaluationInstrumentComponent } from './components/evaluation
     CreateEditTeacherOnRealizationComponent,
     SubjectRealizationManagementComponent,
     CreateEditSubjectRealizationComponent,
+    UniversityManagementComponent,
+    CreateEditUniversityComponent,
     EvaluationKnowledgeManagementComponent,
     CreateEditEvaluationKnowledgeComponent,
     FileManagementComponent,
diff --git a/client/src/app/components/faculty-management/create-edit-faculty/create-edit-faculty.component.html b/client/src/app/components/faculty-management/create-edit-faculty/create-edit-faculty.component.html
index 91d0662793dcb55f94582b1cc0d0d7e276d78e91..bc38216ba203ec29f9ee59a4f75684074218179b 100644
--- a/client/src/app/components/faculty-management/create-edit-faculty/create-edit-faculty.component.html
+++ b/client/src/app/components/faculty-management/create-edit-faculty/create-edit-faculty.component.html
@@ -43,6 +43,13 @@
                             <mat-option *ngFor="let dean of deans;" [value]="dean">{{dean.user.name}} {{dean.user.surname}}</mat-option>
                         </mat-select>
                     </mat-form-field>
+
+                    <mat-form-field appearance="outline" class="example-full-width">
+                      <mat-label>Universities</mat-label>
+                      <mat-select formControlName="university" [compareWith]="comparator" required>
+                          <mat-option *ngFor="let university of university;" [value]="university">{{university.name}}</mat-option>
+                      </mat-select>
+                  </mat-form-field>
                       
 
                     
diff --git a/client/src/app/components/faculty-management/create-edit-faculty/create-edit-faculty.component.ts b/client/src/app/components/faculty-management/create-edit-faculty/create-edit-faculty.component.ts
index 60332403418ea05078fa63bfce16460d3610e849..2baae5d3d8bb20b9b7038c131889074ca4402730 100644
--- a/client/src/app/components/faculty-management/create-edit-faculty/create-edit-faculty.component.ts
+++ b/client/src/app/components/faculty-management/create-edit-faculty/create-edit-faculty.component.ts
@@ -8,6 +8,7 @@ import { University } from 'src/app/model/university';
 import { FacultyService } from 'src/app/service/faculty/faculty.service';
 import { StudyProgrammeService } from 'src/app/service/study-programme/study-programme.service';
 import { ProfessorService } from 'src/app/service/professor/professor.service';
+import { UniversityService } from 'src/app/service/university/university.service';
 
 @Component({
   selector: 'app-create-edit-faculty',
@@ -17,7 +18,7 @@ import { ProfessorService } from 'src/app/service/professor/professor.service';
 export class CreateEditFacultyComponent implements OnInit {
 
   deans: Professor[] = [];
-  // unis: University[] = [];
+  university: University[] = [];
   studyProgrammess: StudyProgramme[] = [];
 
 
@@ -27,7 +28,7 @@ export class CreateEditFacultyComponent implements OnInit {
     "name" : new FormControl(null, [Validators.required]),
     "dean" : new FormControl(null, [Validators.required]),
     "studyProgrammes" : new FormControl(null),
-    // "university" : new FormControl(null, [Validators.required])
+    "university" : new FormControl(null, [Validators.required])
   });
 
   formCreateEditAddress : FormGroup = new FormGroup({
@@ -38,7 +39,7 @@ export class CreateEditFacultyComponent implements OnInit {
 
 
   constructor(private route: ActivatedRoute, private location: Location, private studyProgrammeService: StudyProgrammeService, private professorService : ProfessorService, 
-    private facultyService : FacultyService) { }
+    private facultyService : FacultyService, private universityService : UniversityService) { }
 
   ngOnInit(): void {
     if(window.location.href.indexOf("id") > -1) {
@@ -51,6 +52,7 @@ export class CreateEditFacultyComponent implements OnInit {
 
     this.professorService.getAll().subscribe((professor: Professor[]) => { this.deans = professor; })
     this.studyProgrammeService.getAll().subscribe((studyProgramme: StudyProgramme[]) => { this.studyProgrammess = studyProgramme; })
+    this.universityService.getAll().subscribe((university: University[]) => { this.university = university; })
   
 }
   
@@ -62,7 +64,7 @@ export class CreateEditFacultyComponent implements OnInit {
       } else {
         this.formCreateEditFaculty.value.address = this.formCreateEditAddress.value;
         this.facultyService.update(this.formCreateEditFaculty.value.id, this.formCreateEditFaculty.value).subscribe(rank => { this.cancel(); });
-
+      
       }
     }
     else{
@@ -76,14 +78,7 @@ export class CreateEditFacultyComponent implements OnInit {
     this.location.back();
   }
 
-  // comparator(v1: any, v2: any) {
-  //   if(v1 && v2)
-  //   {
-  //     return v1["id"] == v2["id"]
-  //   } else {
-  //     return  v1 == v2
-  //   }
-  // }
+
   comparator(studyProgramme1: any, studyProgramme2: any) {
     return studyProgramme1 && studyProgramme2
       ? studyProgramme1.id === studyProgramme2.id
diff --git a/client/src/app/components/faculty-management/faculty-management.component.html b/client/src/app/components/faculty-management/faculty-management.component.html
index b9371c8ea14d16b9bc65067724c7e12408d92501..71bc73f11fb84e029ef910050a21ec61226f0d3f 100644
--- a/client/src/app/components/faculty-management/faculty-management.component.html
+++ b/client/src/app/components/faculty-management/faculty-management.component.html
@@ -44,7 +44,14 @@
               <ng-container matColumnDef="dean">
                 <th mat-header-cell *matHeaderCellDef mat-sort-header> Dean </th>
                 <ng-container *matCellDef="let faculty">
-                  <td mat-cell> {{faculty.dean.user.name}} </td>
+                  <td mat-cell> {{faculty.dean.user.name}} {{faculty.dean.user.surname}} </td>
+                </ng-container>
+              </ng-container>
+
+              <ng-container matColumnDef="university">
+                <th mat-header-cell *matHeaderCellDef mat-sort-header> University </th>
+                <ng-container *matCellDef="let faculty">
+                  <td mat-cell> {{faculty.university.name}}</td>
                 </ng-container>
               </ng-container>
       
diff --git a/client/src/app/components/faculty-management/faculty-management.component.ts b/client/src/app/components/faculty-management/faculty-management.component.ts
index 5551ac01da451b981cf7c9c01b82d031d29707a7..6fb527c2866b9195e1b15b4b4232dbf90f5f20e9 100644
--- a/client/src/app/components/faculty-management/faculty-management.component.ts
+++ b/client/src/app/components/faculty-management/faculty-management.component.ts
@@ -24,7 +24,7 @@ export class FacultyManagementComponent implements OnInit {
   @ViewChild(MatPaginator, {static: true}) paginator: MatPaginator;
   @ViewChild(MatSort) sort: MatSort;
 
-  displayedColumns: string[] = ['id', 'address', 'name', 'dean', 'actions'];
+  displayedColumns: string[] = ['id', 'address', 'name', 'dean', 'university', 'actions'];
   dataSource: MatTableDataSource<Faculty>;
   columnsToDisplayWithExpand = [...this.displayedColumns];
   expandedElement: Faculty | null;
diff --git a/client/src/app/components/main-menu/board-admin/board-admin.component.html b/client/src/app/components/main-menu/board-admin/board-admin.component.html
index 2232ea449fce42277f7ee2a7332f80787f8820b8..028d63cff594eaba0b8e5b073b3f6aedbe19df44 100644
--- a/client/src/app/components/main-menu/board-admin/board-admin.component.html
+++ b/client/src/app/components/main-menu/board-admin/board-admin.component.html
@@ -66,6 +66,7 @@
 </div>
 <div class="container">
   <p class="textInLine"><span>ADMINISTRATOR MENU</span></p>
+  <hr>
   <div class="example-button-row">
     <button mat-raised-button color="primary" [routerLink]="['/userstable']">User management</button>
 	<button mat-raised-button color="primary" [routerLink]="['/typerankstable']">Type ranks management</button>
@@ -81,12 +82,14 @@
 	<button mat-raised-button color="primary" [routerLink]="['/subjecttable']">Subject management</button>
 	<button mat-raised-button color="primary" [routerLink]="['/facultytable']">Faculty management</button>
 	<button mat-raised-button color="primary" [routerLink]="['/studyprogrammetable']">Study programme management table</button>
-	<hr>
+  </div>
+  <hr>
   <div class="example-button-row">
 	<button mat-raised-button color="primary" [routerLink]="['/studentservicetable']">Student Service management</button>
 	<button mat-raised-button color="primary" [routerLink]="['/teacheronrealizationtable']">Teacher on realization management</button>
 	<button mat-raised-button color="primary" [routerLink]="['/subjectrealizationtable']">Subject realization management</button>
+	<button mat-raised-button color="primary" [routerLink]="['/universitytable']">University management table</button>
 	<button mat-raised-button color="primary" [routerLink]="['/evaluationknowledgetable']">Evaluation knowledge management</button>
 	<button mat-raised-button color="primary" [routerLink]="['/evaluationinstrumenttable']">Evaluation instrument management</button>
-
+  </div>
 </div>
\ No newline at end of file
diff --git a/client/src/app/components/student-service-management/create-edit-student-service/create-edit-student-service.component.css b/client/src/app/components/student-service-management/create-edit-student-service/create-edit-student-service.component.css
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..374d1fda679ad529a26046826f7e482207e4fc8a 100644
--- a/client/src/app/components/student-service-management/create-edit-student-service/create-edit-student-service.component.css
+++ b/client/src/app/components/student-service-management/create-edit-student-service/create-edit-student-service.component.css
@@ -0,0 +1,38 @@
+.card-container.card {
+    max-width: 700px !important;
+    padding: 40px 40px;
+  }
+    
+  .card {
+    background-color: #f7f7f7;
+    padding: 20px 25px 30px;
+    margin: 0 auto 25px;
+    -moz-border-radius: 2px;
+    -webkit-border-radius: 2px;
+    border-radius: 2px;
+    -moz-box-shadow: 0px 2px 2px rgba(0, 0, 0, 0.3);
+    -webkit-box-shadow: 0px 2px 2px rgba(0, 0, 0, 0.3);
+    box-shadow: 0px 2px 2px rgba(0, 0, 0, 0.3);
+  }
+  
+    .profile-img-card {
+      width: 96px;
+      height: 96px;
+      margin: 0 auto 10px;
+      display: block;
+      -moz-border-radius: 50%;
+      -webkit-border-radius: 50%;
+      border-radius: 50%;
+    }
+  
+    .example-full-width {
+      width: 100%;
+    }
+  
+    .mat-stepper-horizontal {
+      margin-top: 8px;
+    }
+    
+    .mat-form-field {
+      margin-top: 16px;
+    }
\ No newline at end of file
diff --git a/client/src/app/components/student-service-management/create-edit-student-service/create-edit-student-service.component.html b/client/src/app/components/student-service-management/create-edit-student-service/create-edit-student-service.component.html
index ac1a30f0568ce52259ebd6417bb693102a1ced1c..f13255e99ce5701f4f93e81877fb8ac64cbecedc 100644
--- a/client/src/app/components/student-service-management/create-edit-student-service/create-edit-student-service.component.html
+++ b/client/src/app/components/student-service-management/create-edit-student-service/create-edit-student-service.component.html
@@ -1 +1,48 @@
-<p>create-edit-student-service works!</p>
+<div class="container">
+    <header class="jumbotron">
+        <div class="col-md-12">
+            <h2 *ngIf="formCreateEditStudent.value.id == null" style="text-align: center;">Add new student</h2>
+            <h2 *ngIf="formCreateEditStudent.value.id != null" style="text-align: center;">Edit student (ID: {{formCreateEditStudent.value.id}})</h2>
+                    
+            <div class="card card-container">
+
+                <form [formGroup]="formCreateEditStudent" novalidate>
+                    <div class="form-group">
+
+                    <mat-form-field appearance="outline" class="example-full-width">
+                        <mat-label>Students</mat-label>
+                        <mat-select formControlName="student" [compareWith]="comparator" required>
+                            <mat-option *ngFor="let s of student" [value]="s">{{s.indexNo}} </mat-option>
+                        </mat-select>
+                    </mat-form-field>
+                    
+                    <mat-form-field appearance="outline" class="example-full-width">
+                        <mat-label>Study programme</mat-label>
+                        <mat-select formControlName="studyProgrammes" [compareWith]="comparator" required>
+                            <mat-option *ngFor="let program of programme" [value]="program">{{program.name}} </mat-option >
+                        </mat-select>
+                    </mat-form-field>
+
+                    <mat-form-field appearance="outline" class="example-full-width">
+                        <mat-label>Year of study</mat-label>
+                        <mat-select formControlName="year" [compareWith]="comparator" multiple required>
+                            <div *ngFor="let pr of programme">
+                                <mat-option *ngFor="let yearofstudy of pr.yearOfStudy" [value]="yearofstudy">{{yearofstudy.year | date:'yyyy-MM-dd'}} </mat-option>
+                            </div>
+                    </mat-select>
+        
+                    </mat-form-field>
+                
+                    </div>
+
+                    <div class="form-group">
+                    <button class="btn btn-primary btn-block" type="button" (click)="saveStudent()" *ngIf="formCreateEditStudent.value.id == null">Add new year</button>
+                    <button class="btn btn-primary btn-block" type="button" (click)="saveStudent()" *ngIf="formCreateEditStudent.value.id != null">Edit year</button>
+                    <button mat-raised-button class="btn-block" type="button" (click)="cancel()" >Cancel</button>
+                    </div>
+                </form>
+
+            </div>
+        </div>
+    </header>
+</div>
diff --git a/client/src/app/components/student-service-management/create-edit-student-service/create-edit-student-service.component.ts b/client/src/app/components/student-service-management/create-edit-student-service/create-edit-student-service.component.ts
index 8069ac5c435a09ec585b73d1719894127ac54725..0f7ef0a3816691ead5b6f3d17db1e7cb8ba16798 100644
--- a/client/src/app/components/student-service-management/create-edit-student-service/create-edit-student-service.component.ts
+++ b/client/src/app/components/student-service-management/create-edit-student-service/create-edit-student-service.component.ts
@@ -1,4 +1,15 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, ElementRef, Input, OnChanges, OnInit, SimpleChanges, ViewChild } from '@angular/core';
+import { FormControl, FormGroup, Validators } from '@angular/forms';
+import { ActivatedRoute } from '@angular/router';
+import { Student } from 'src/app/model/student';
+import { StudyProgramme } from 'src/app/model/study-programme';
+import { Year } from 'src/app/model/year';
+import { Location } from '@angular/common';
+import { YearService } from 'src/app/service/yearofstudy/year.service';
+import { StudyProgrammeService } from 'src/app/service/study-programme/study-programme.service';
+import { StudentOnTheYear } from 'src/app/model/student-on-the-year';
+import { StudentOnTheYearService } from 'src/app/service/student-on-the-year/student-on-the-year.service';
+import { StudentServiceService } from 'src/app/service/student-service/student-service.service';
 
 @Component({
   selector: 'app-create-edit-student-service',
@@ -6,10 +17,52 @@ import { Component, OnInit } from '@angular/core';
   styleUrls: ['./create-edit-student-service.component.css']
 })
 export class CreateEditStudentServiceComponent implements OnInit {
+  
+  student: StudentOnTheYear[]=[];
+  programme: StudyProgramme[]=[];
+ // selected: StudyProgramme[]=[];
 
-  constructor() { }
+  constructor(private route: ActivatedRoute, private location: Location,private yearService: YearService,
+    private s:StudyProgrammeService, private stu:StudentOnTheYearService, private service: StudentServiceService) { }
+
+  formCreateEditStudent : FormGroup = new FormGroup({
+    "id" : new FormControl(null),
+    "student" : new FormControl(null, [Validators.required]),
+    "studyProgrammes" : new FormControl(null),
+    "year" : new FormControl(null)
+  });  
 
   ngOnInit(): void {
+    if(window.location.href.indexOf("id") > -1) {
+      this.formCreateEditStudent.patchValue(JSON.parse(this.route.snapshot.paramMap.get('studentForChange')));
+    }
+
+    this.stu.getAll().subscribe((sp: StudentOnTheYear[]) => { this.student = sp; });
+    this.s.getAll().subscribe((sp: StudyProgramme[]) => { 
+      console.log(sp);
+      this.programme = sp;});   
+  }
+
+  saveStudent(){
+    if(this.formCreateEditStudent.valid){
+      if(this.formCreateEditStudent.value["id"] == null){
+        this.service.create(this.formCreateEditStudent.value).subscribe(year => { this.cancel(); });
+      } else {
+        this.service.update(this.formCreateEditStudent.value.id, this.formCreateEditStudent.value).subscribe(year => { this.cancel(); });
+      }
+    }
+  };
+    
+  cancel(){
+    this.formCreateEditStudent.get("id")?.setValue(null);
+    this.formCreateEditStudent.reset();
+    this.location.back();
+  }
+
+  comparator(year1: any, year2: any) {
+    return year1 && year2
+      ? year1.id === year2.id
+      : year1 === year2;
   }
 
 }
diff --git a/client/src/app/components/student-service-management/student-service-management.component.html b/client/src/app/components/student-service-management/student-service-management.component.html
index c9460165a5ee2c676cd32e35fbaa474bd28f35e6..8c7f06b6393a8aab5aedd6b330ac32c4f5645f9b 100644
--- a/client/src/app/components/student-service-management/student-service-management.component.html
+++ b/client/src/app/components/student-service-management/student-service-management.component.html
@@ -22,24 +22,24 @@
               <ng-container matColumnDef="studentontheyear">
                 <th mat-header-cell *matHeaderCellDef mat-sort-header> Index No </th>
                 <ng-container *matCellDef="let studentservice">
-                  <td mat-cell> {{studentservice.studentOnTheYear.indexNo}} </td>
+                  <td mat-cell> {{studentservice.student.indexNo}} </td>
                 </ng-container>
               </ng-container> 
 
               <ng-container matColumnDef="programme">
                 <th mat-header-cell *matHeaderCellDef mat-sort-header> Study programme </th>
                 <ng-container *matCellDef="let studentservice">
-                  <td mat-cell> {{studentservice.studyProgramme.name}} </td>
+                  <td mat-cell> {{studentservice.studyProgrammes.name}} </td>
                 </ng-container>
               </ng-container>
-
-              <ng-container matColumnDef="year">
+              
+              <!--<ng-container matColumnDef="year">
                 <th mat-header-cell *matHeaderCellDef mat-sort-header> Year of study </th>
                 <ng-container *matCellDef="let studentservice">
                   <td mat-cell> {{studentservice.yearofstudy.year | date:'yyyy-MM-dd'}} </td>
                 </ng-container>
               </ng-container>
-              
+            -->
               <ng-container matColumnDef="actions">
                 <th mat-header-cell *matHeaderCellDef> Actions </th>
                 <ng-container *matCellDef="let studentservice">
@@ -64,10 +64,10 @@
               <ng-container matColumnDef="expandedDetail">
                 <td mat-cell *matCellDef="let studentservice" [attr.colspan]="columnsToDisplayWithExpand.length">
                   <div class="example-element-detail" [@detailExpand]="studentservice == expandedElement ? 'expanded' : 'collapsed'">
-                    <!--<div class="example-element-description" *ngFor="let st of studentservice.studyProgramme">
-                      <span class="example-element-description-attribution"> Study Programme({{st.name}}) -- </span>
+                    <div class="example-element-description" *ngFor="let st of studentservice.year">
+                      <span class="example-element-description-attribution"> Year of study({{st.year | date:'yyyy-MM-dd'}}) -- </span>
         
-                    </div>-->
+                    </div>
                     
                     <!-- <div class="example-element-diagram">
                       <div class="example-element-position" *ngFor="let topic of subject.topic"> {{topic.opis}} </div>
diff --git a/client/src/app/components/student-service-management/student-service-management.component.ts b/client/src/app/components/student-service-management/student-service-management.component.ts
index d18301907cae5a1bc5e8742f6e5def879dd46c9b..86dc4b3fda1f690b63d2e3d839b3bed5961fa39b 100644
--- a/client/src/app/components/student-service-management/student-service-management.component.ts
+++ b/client/src/app/components/student-service-management/student-service-management.component.ts
@@ -24,7 +24,7 @@ export class StudentServiceManagementComponent implements OnInit {
   @ViewChild(MatPaginator, {static: true}) paginator: MatPaginator;
   @ViewChild(MatSort) sort: MatSort;
 
-  displayedColumns: string[] = ['id', 'studentontheyear','programme','year', 'actions'];
+  displayedColumns: string[] = ['id', 'studentontheyear','programme', 'actions'];
   dataSource: MatTableDataSource<StudentService>;
   columnsToDisplayWithExpand = [...this.displayedColumns];
   expandedElement: StudentService | null;
@@ -40,7 +40,7 @@ export class StudentServiceManagementComponent implements OnInit {
   }
 
   selectForChange(year: StudentService){
-    this.router.navigate(['studentservicetable/createeditstudentservice', {yearForChange: JSON.stringify(year)}]);
+    this.router.navigate(['studentservicetable/createeditstudentservice', {studentForChange: JSON.stringify(year)}]);
   }
 
   deleteYear(id: number) {
diff --git a/client/src/app/components/study-programme-management/create-edit-study-programme/create-edit-study-programme.component.html b/client/src/app/components/study-programme-management/create-edit-study-programme/create-edit-study-programme.component.html
index 137d0a02a3b7dfb8d2e1a5efafa558ad008bd8b1..9714b89f930695f5eeddd59c0328d5e737264955 100644
--- a/client/src/app/components/study-programme-management/create-edit-study-programme/create-edit-study-programme.component.html
+++ b/client/src/app/components/study-programme-management/create-edit-study-programme/create-edit-study-programme.component.html
@@ -30,12 +30,7 @@
                         </mat-select>
                     </mat-form-field>
 
-                    <mat-form-field appearance="outline" class="example-full-width">
-                        <mat-label>Year of study</mat-label>
-                        <mat-select formControlName="yearOfStudy" [compareWith]="comparator" multiple required>
-                            <mat-option *ngFor="let year of year;" [value]="year">{{year.year | date:'yyyy-MM-dd'}}</mat-option>
-                        </mat-select>
-                    </mat-form-field>
+                    
 
                     </div>
 
diff --git a/client/src/app/components/study-programme-management/create-edit-study-programme/create-edit-study-programme.component.ts b/client/src/app/components/study-programme-management/create-edit-study-programme/create-edit-study-programme.component.ts
index 1ea4335da78b38eeb4887208b6c6d2d30f70373e..53725c13337d479bb4a29086bc5fa31cdfad8db3 100644
--- a/client/src/app/components/study-programme-management/create-edit-study-programme/create-edit-study-programme.component.ts
+++ b/client/src/app/components/study-programme-management/create-edit-study-programme/create-edit-study-programme.component.ts
@@ -25,8 +25,8 @@ export class CreateEditStudyProgrammeComponent implements OnInit {
     "id" : new FormControl(null),
     "name" : new FormControl(null, [Validators.required]),
     "director" : new FormControl(null, [Validators.required]),
-    "faculty" : new FormControl(null, [Validators.required]),
-    "yearOfStudy" : new FormControl(null,[Validators.required])
+    "faculty" : new FormControl(null, [Validators.required])
+    //"yearOfStudy" : new FormControl(null,[Validators.required])
   });
   
   constructor(private route: ActivatedRoute, private location: Location, private studyProgrammeService: StudyProgrammeService, private professorService : ProfessorService, 
diff --git a/client/src/app/components/study-programme-management/study-programme-management.component.html b/client/src/app/components/study-programme-management/study-programme-management.component.html
index 2fbe4741c6e29b393f1ca7e05e9e0593e2be6ae3..4e0632457ba396b9f386c72654b858b7198d379f 100644
--- a/client/src/app/components/study-programme-management/study-programme-management.component.html
+++ b/client/src/app/components/study-programme-management/study-programme-management.component.html
@@ -69,6 +69,9 @@
                   <div class="example-element-detail" [@detailExpand]="studyProgramme == expandedElement ? 'expanded' : 'collapsed'">
                     <div class="example-element-description" *ngFor="let year of studyProgramme.yearOfStudy">
                       <span class="example-element-description-attribution"> Year({{year.year | date:'yyyy-MM-dd'}})</span>
+                      <div class="example-element-description" *ngFor="let predmet of year.subjects">
+                          <span class="example-element-description-attribution"> Subject({{predmet.naziv}})</span>
+                      </div>
                     </div>
                   <!--
                   </div>
diff --git a/client/src/app/components/study-programme-management/study-programme-management.component.ts b/client/src/app/components/study-programme-management/study-programme-management.component.ts
index 3b6d967664e37313ef5ef70912699c380b240cd2..0f8ae2d291f73903bfad8a10726d9b469d5445fa 100644
--- a/client/src/app/components/study-programme-management/study-programme-management.component.ts
+++ b/client/src/app/components/study-programme-management/study-programme-management.component.ts
@@ -6,6 +6,7 @@ import { Router } from '@angular/router';
 import { StudyProgramme } from 'src/app/model/study-programme';
 import { StudyProgrammeService } from 'src/app/service/study-programme/study-programme.service';
 import {animate, state, style, transition, trigger} from '@angular/animations';
+import { FacultyService } from 'src/app/service/faculty/faculty.service';
 
 @Component({
   selector: 'app-study-programme-management',
diff --git a/client/src/app/components/subject-management/subject-management.component.ts b/client/src/app/components/subject-management/subject-management.component.ts
index 1e73166f0de377d77c902774aac3ad6c425d00c9..553a7d0c81df4fa74160a2b42a03aba652509eff 100644
--- a/client/src/app/components/subject-management/subject-management.component.ts
+++ b/client/src/app/components/subject-management/subject-management.component.ts
@@ -50,6 +50,7 @@ export class SubjectManagementComponent implements OnInit {
   refreshTable(){
     this.subjectService.getAll().subscribe(subjects => {
       //Data Table Data Source and pagination with dynamic data
+      console.log(subjects);
       this.dataSource = new MatTableDataSource(subjects);
       this.dataSource.paginator = this.paginator;
       this.dataSource.sort = this.sort;
diff --git a/client/src/app/components/topic-management/topic-management.component.ts b/client/src/app/components/topic-management/topic-management.component.ts
index ca1552e136431d933175928d3e8d505ece4a25a5..598bdf18754d1646e2fdb5239c2aaa8b0fe8cc05 100644
--- a/client/src/app/components/topic-management/topic-management.component.ts
+++ b/client/src/app/components/topic-management/topic-management.component.ts
@@ -40,6 +40,7 @@ export class TopicManagementComponent implements OnInit {
 
   refreshTable(){
     this.topicService.getAll().subscribe(topics => {
+      console.log(topics)
       //Data Table Data Source and pagination with dynamic data
       this.dataSource = new MatTableDataSource(topics);
       this.dataSource.paginator = this.paginator;
diff --git a/client/src/app/components/university-management/create-edit-university/create-edit-university.component.css b/client/src/app/components/university-management/create-edit-university/create-edit-university.component.css
new file mode 100644
index 0000000000000000000000000000000000000000..374d1fda679ad529a26046826f7e482207e4fc8a
--- /dev/null
+++ b/client/src/app/components/university-management/create-edit-university/create-edit-university.component.css
@@ -0,0 +1,38 @@
+.card-container.card {
+    max-width: 700px !important;
+    padding: 40px 40px;
+  }
+    
+  .card {
+    background-color: #f7f7f7;
+    padding: 20px 25px 30px;
+    margin: 0 auto 25px;
+    -moz-border-radius: 2px;
+    -webkit-border-radius: 2px;
+    border-radius: 2px;
+    -moz-box-shadow: 0px 2px 2px rgba(0, 0, 0, 0.3);
+    -webkit-box-shadow: 0px 2px 2px rgba(0, 0, 0, 0.3);
+    box-shadow: 0px 2px 2px rgba(0, 0, 0, 0.3);
+  }
+  
+    .profile-img-card {
+      width: 96px;
+      height: 96px;
+      margin: 0 auto 10px;
+      display: block;
+      -moz-border-radius: 50%;
+      -webkit-border-radius: 50%;
+      border-radius: 50%;
+    }
+  
+    .example-full-width {
+      width: 100%;
+    }
+  
+    .mat-stepper-horizontal {
+      margin-top: 8px;
+    }
+    
+    .mat-form-field {
+      margin-top: 16px;
+    }
\ No newline at end of file
diff --git a/client/src/app/components/university-management/create-edit-university/create-edit-university.component.html b/client/src/app/components/university-management/create-edit-university/create-edit-university.component.html
new file mode 100644
index 0000000000000000000000000000000000000000..98c13ac77fc0205c2405c0fcf7eae10322e4ab00
--- /dev/null
+++ b/client/src/app/components/university-management/create-edit-university/create-edit-university.component.html
@@ -0,0 +1,69 @@
+<div class="container">
+    <header class="jumbotron">
+        <div class="col-md-12">
+            <h2 *ngIf="formCreateEditUniversity.value.id == null" style="text-align: center;">Add new university</h2>
+            <h2 *ngIf="formCreateEditUniversity.value.id != null" style="text-align: center;">Edit university (ID: {{formCreateEditUniversity.value.id}})</h2>
+                    
+            <div class="card card-container">
+
+                <form [formGroup]="formCreateEditUniversity" novalidate>
+                    <div class="form-group">
+
+                    <mat-form-field appearance="outline" class="example-full-width">
+                        <mat-label>Name</mat-label>
+                        <input matInput type="text" name="name" formControlName="name" class="example-full-width" required>
+                    </mat-form-field>
+
+                    <mat-form-field appearance="outline" class="example-full-width">
+                        <mat-label>EST DATE</mat-label>
+                        <input matInput type="date" name="establishmentDate" formControlName="establishmentDate" class="example-full-width" required>
+                    </mat-form-field>
+
+                    <form [formGroup]="formCreateEditAddress" novalidate>
+                        <table class="example-full-width" cellspacing="0">
+                          <tr>
+                            <td>
+                              <mat-form-field style="width: 80%;" appearance="outline">
+                              <mat-label>country</mat-label>
+                              <input matInput type="text" name="country" formControlName="country" >
+                              </mat-form-field>
+                            </td>
+                            <td>
+                              <mat-form-field style="width: 80%;" appearance="outline">
+                              <mat-label>City</mat-label>
+                              <input matInput type="text" name="city" formControlName="city">
+                            </mat-form-field>
+                          </td>
+                              <td><mat-form-field style="width: 80%;" appearance="outline">
+                                <mat-label>Street and number</mat-label>
+                                <input matInput type="text" name="streetAndNumber" formControlName="streetAndNumber">
+                              </mat-form-field>
+                            </td>
+                          </tr>
+                        </table>
+                      </form>
+                      <mat-form-field appearance="outline" class="example-full-width">
+                        <mat-label>Headmaster</mat-label>
+                        <mat-select formControlName="headmaster" [compareWith]="comparator" required>
+                            <mat-option *ngFor="let headmaster of headmasters;" [value]="headmaster">{{headmaster.user.name}} {{headmaster.user.surname}}</mat-option>
+                        </mat-select>
+                    </mat-form-field>
+                      
+
+                    
+                    </div>
+
+
+
+                    <div class="form-group">
+                    <button class="btn btn-primary btn-block" type="button" (click)="save()" *ngIf="formCreateEditUniversity.value.id == null">Add University</button>
+                    <button class="btn btn-primary btn-block" type="button" (click)="save()" *ngIf="formCreateEditUniversity.value.id != null">Edit University</button>
+                    <button mat-raised-button class="btn-block" type="button" (click)="cancel()" >Cancel</button>
+                    </div>
+                </form>
+
+            </div>
+        </div>
+    </header>
+</div>
+
diff --git a/client/src/app/components/university-management/create-edit-university/create-edit-university.component.spec.ts b/client/src/app/components/university-management/create-edit-university/create-edit-university.component.spec.ts
new file mode 100644
index 0000000000000000000000000000000000000000..0fd516ecb5a3599f6092129f5c016b30b2a8a5af
--- /dev/null
+++ b/client/src/app/components/university-management/create-edit-university/create-edit-university.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { CreateEditUniversityComponent } from './create-edit-university.component';
+
+describe('CreateEditUniversityComponent', () => {
+  let component: CreateEditUniversityComponent;
+  let fixture: ComponentFixture<CreateEditUniversityComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ CreateEditUniversityComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(CreateEditUniversityComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/client/src/app/components/university-management/create-edit-university/create-edit-university.component.ts b/client/src/app/components/university-management/create-edit-university/create-edit-university.component.ts
new file mode 100644
index 0000000000000000000000000000000000000000..b7e6b7c3a2bab589028b53a68ca7c95577a549d9
--- /dev/null
+++ b/client/src/app/components/university-management/create-edit-university/create-edit-university.component.ts
@@ -0,0 +1,86 @@
+import { Component, OnInit } from '@angular/core';
+import { FormControl, FormGroup, Validators } from '@angular/forms';
+import { Location } from '@angular/common';
+import { ActivatedRoute } from '@angular/router';
+import { Professor } from 'src/app/model/professor';
+import { Faculty } from 'src/app/model/faculty';
+import { UniversityService } from 'src/app/service/university/university.service';
+import { FacultyService } from 'src/app/service/faculty/faculty.service';
+import { ProfessorService } from 'src/app/service/professor/professor.service';
+import { StudyProgrammeService } from 'src/app/service/study-programme/study-programme.service';
+import { StudyProgramme } from 'src/app/model/study-programme';
+
+@Component({
+  selector: 'app-create-edit-university',
+  templateUrl: './create-edit-university.component.html',
+  styleUrls: ['./create-edit-university.component.css']
+})
+export class CreateEditUniversityComponent implements OnInit {
+
+  headmasters: Professor[] = [];
+  faculty: Faculty[] = [];
+  studyProgrammes: StudyProgramme[] = [];
+
+
+  formCreateEditUniversity : FormGroup = new FormGroup({
+    "id" : new FormControl(null),
+    "address" : new FormControl(null),
+    "establishmentDate" : new FormControl(null),
+    "name" : new FormControl(null, [Validators.required]),
+    "faculty" : new FormControl(null),
+    "headmaster" : new FormControl(null, [Validators.required])
+  });
+
+  formCreateEditAddress : FormGroup = new FormGroup({
+    "country" : new FormControl(null),
+    "city" : new FormControl(null),
+    "streetAndNumber" : new FormControl(null)
+  });
+  constructor(private route: ActivatedRoute, private location: Location, private studyProgrammeService: StudyProgrammeService, private universityService: UniversityService, private professorService : ProfessorService, 
+    private facultyService : FacultyService) { }
+
+    ngOnInit(): void {
+      if(window.location.href.indexOf("id") > -1) {
+        this.formCreateEditUniversity.patchValue(JSON.parse(this.route.snapshot.paramMap.get('universityForChange')))
+        this.formCreateEditAddress.patchValue({["country"] : this.formCreateEditUniversity.value.address.country});
+        this.formCreateEditAddress.patchValue({["city"] : this.formCreateEditUniversity.value.address.city})
+        this.formCreateEditAddress.patchValue({["streetAndNumber"] : this.formCreateEditUniversity.value.address.streetAndNumber})
+      }
+  
+  
+      this.professorService.getAll().subscribe((professor: Professor[]) => { this.headmasters = professor; })
+      this.facultyService.getAll().subscribe((faculty: Faculty[]) => { this.faculty = faculty; })
+      this.studyProgrammeService.getAll().subscribe((studyProgramme: StudyProgramme[]) => { this.studyProgrammes = studyProgramme; })
+    
+  }
+
+  save(){
+    if(this.formCreateEditUniversity.valid){
+      if(this.formCreateEditUniversity.value["id"] == null){
+        this.formCreateEditUniversity.value.address = this.formCreateEditAddress.value;
+        this.universityService.create(this.formCreateEditUniversity.value).subscribe(rank => { this.cancel(); });
+      } else {
+        this.formCreateEditUniversity.value.address = this.formCreateEditAddress.value;
+        this.universityService.update(this.formCreateEditUniversity.value.id, this.formCreateEditUniversity.value).subscribe(rank => { this.cancel(); });
+      
+      }
+    }
+    else{
+      console.log("invalid form");
+    }
+  }
+
+  cancel(){
+    this.formCreateEditUniversity.get("id")?.setValue(null);
+    this.formCreateEditUniversity.reset();
+    this.location.back();
+  }
+
+  comparator(faculty1: any, faculty2: any) {
+    return faculty1 && faculty2
+      ? faculty1.id === faculty2.id
+      : faculty1 === faculty2;
+  }
+
+
+}
diff --git a/client/src/app/components/university-management/university-management.component.css b/client/src/app/components/university-management/university-management.component.css
new file mode 100644
index 0000000000000000000000000000000000000000..3627b70c953e9f91902e1213275b737e6f1e67e5
--- /dev/null
+++ b/client/src/app/components/university-management/university-management.component.css
@@ -0,0 +1,54 @@
+table {
+    width: 100%;
+  }
+  
+  .row {
+    width: 100%;
+    margin: 0 auto;
+  }
+  
+  
+  
+  tr.example-detail-row {
+    height: 0;
+  }
+  
+  tr.example-element-row:not(.example-expanded-row):hover {
+    background: whitesmoke;
+  }
+  
+  tr.example-element-row:not(.example-expanded-row):active {
+    background: #efefef;
+  }
+  
+  .example-element-row td {
+    border-bottom-width: 0;
+  }
+  
+  .example-element-detail {
+    overflow: hidden;
+    display: flex;
+  }
+  
+  .example-element-diagram {
+    min-width: 80px;
+    border: 2px solid black;
+    padding: 8px;
+    font-weight: lighter;
+    margin: 8px 0;
+    height: 104px;
+  }
+  
+  .example-element-symbol {
+    font-weight: bold;
+    font-size: 40px;
+    line-height: normal;
+  }
+  
+  .example-element-description {
+    padding: 16px;
+  }
+  
+  .example-element-description-attribution {
+    opacity: 0.5;
+  }
\ No newline at end of file
diff --git a/client/src/app/components/university-management/university-management.component.html b/client/src/app/components/university-management/university-management.component.html
new file mode 100644
index 0000000000000000000000000000000000000000..7770337517e5eede32dadb4f25c288dec6c7f00c
--- /dev/null
+++ b/client/src/app/components/university-management/university-management.component.html
@@ -0,0 +1,98 @@
+<div class="container">
+    <header class="jumbotron">
+      <div class="row">
+        <section>
+          <div class="example-button-row" class="block">
+            <button mat-raised-button color="primary" (click)="addNewUniversity()">Add University</button>
+          </div>
+  
+          <div class="block">
+            <mat-form-field appearance="standard"  (keyup)="applySearch($event)">
+              <mat-label>Search</mat-label>
+              <input matInput  placeholder="University name" #input>
+            </mat-form-field>
+          </div>
+        </section> 
+      </div> 
+      
+
+        <div class="mat-elevation-z8">
+          
+            <table mat-table [dataSource]="dataSource" matSort multiTemplateDataRows>
+          
+              <ng-container matColumnDef="id">
+                <th mat-header-cell *matHeaderCellDef mat-sort-header> ID </th>
+                <ng-container *matCellDef="let university">
+                  <td mat-cell> {{university.id}} </td>
+                </ng-container>
+              </ng-container> 
+          
+              <ng-container matColumnDef="address">
+                <th mat-header-cell *matHeaderCellDef mat-sort-header> Address </th>
+                <ng-container *matCellDef="let university">
+                  <td mat-cell> {{university.address.city}} {{university.address.country}} {{university.address.streetAndNumber}}</td>
+                </ng-container>
+              </ng-container>
+
+              <ng-container matColumnDef="establishmentDate">
+                <th mat-header-cell *matHeaderCellDef mat-sort-header> Establishment Date </th>
+                <ng-container *matCellDef="let university">
+                  <td mat-cell> {{university.establishmentDate | date:'yyyy-MM-dd' }} </td>
+                </ng-container>
+              </ng-container>
+
+              <ng-container matColumnDef="name">
+                <th mat-header-cell *matHeaderCellDef mat-sort-header> Name </th>
+                <ng-container *matCellDef="let university">
+                  <td mat-cell> {{university.name}} </td>
+                </ng-container>
+              </ng-container>
+
+              <ng-container matColumnDef="headmaster">
+                <th mat-header-cell *matHeaderCellDef mat-sort-header> Dean </th>
+                <ng-container *matCellDef="let university">
+                  <td mat-cell> {{university.headmaster.user.name}} {{university.headmaster.user.surname}} </td>
+                </ng-container>
+              </ng-container>
+      
+              <ng-container matColumnDef="actions">
+                <th mat-header-cell *matHeaderCellDef> Actions </th>
+                <ng-container *matCellDef="let university">
+                  <td mat-cell>
+                    <div class="example-button-row">
+                      <button mat-raised-button color="warn" (click)="deletePhysically(university['id'])">Delete</button>
+                      <button mat-raised-button color="primary" (click)="selectForChange(university)">Edit</button> 
+                      <button mat-icon-button aria-label="expand row" (click)="(expandedElement = expandedElement === university ? null : university); $event.stopPropagation()">
+                        <mat-icon *ngIf="expandedElement !== university">keyboard_arrow_down</mat-icon>
+                        <mat-icon *ngIf="expandedElement === university">keyboard_arrow_up</mat-icon>
+                      </button>
+                    </div>
+                </td>
+
+                </ng-container>
+              </ng-container>
+
+              <ng-container matColumnDef="expandedDetail">
+                <td mat-cell *matCellDef="let university" [attr.colspan]="columnsToDisplayWithExpand.length">
+                  <div class="example-element-detail" [@detailExpand]="university == expandedElement ? 'expanded' : 'collapsed'">
+                    <div class="example-element-description" *ngFor="let fc of university.faculty">
+                      <span class="example-element-description-attribution"> Faculty({{fc.id}}) -- </span>
+                      {{fc.name}}
+                    </div>
+                  </div>
+                </td>
+              </ng-container>
+              <tr mat-header-row *matHeaderRowDef="columnsToDisplayWithExpand"></tr>
+              <tr mat-row *matRowDef="let university; columns: columnsToDisplayWithExpand;"
+                  class="example-element-row"
+                  [class.example-expanded-row]="expandedElement === university"
+                  (click)="expandedElement = expandedElement === university ? null : university">
+              </tr>
+              <tr mat-row *matRowDef="let row; columns: ['expandedDetail']" class="example-detail-row"></tr>
+
+            </table>
+          
+            <mat-paginator [pageSizeOptions]="[5, 10, 20]" showFirstLastButtons aria-label="Select page of university"></mat-paginator>
+          </div>
+    </header>
+</div>
\ No newline at end of file
diff --git a/client/src/app/components/university-management/university-management.component.spec.ts b/client/src/app/components/university-management/university-management.component.spec.ts
new file mode 100644
index 0000000000000000000000000000000000000000..d5cc576dfb8b18c384ee487939193c9fae89329d
--- /dev/null
+++ b/client/src/app/components/university-management/university-management.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { UniversityManagementComponent } from './university-management.component';
+
+describe('UniversityManagementComponent', () => {
+  let component: UniversityManagementComponent;
+  let fixture: ComponentFixture<UniversityManagementComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ UniversityManagementComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(UniversityManagementComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/client/src/app/components/university-management/university-management.component.ts b/client/src/app/components/university-management/university-management.component.ts
new file mode 100644
index 0000000000000000000000000000000000000000..acb4378a3bc2972a793a4a72767091cb45361fff
--- /dev/null
+++ b/client/src/app/components/university-management/university-management.component.ts
@@ -0,0 +1,67 @@
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { MatPaginator } from '@angular/material/paginator';
+import { MatSort } from '@angular/material/sort';
+import { MatTableDataSource } from '@angular/material/table';
+import { Router } from '@angular/router';
+import { University } from 'src/app/model/university';
+import { UniversityService} from 'src/app/service/university/university.service';
+import {animate, state, style, transition, trigger} from '@angular/animations';
+
+@Component({
+  selector: 'app-university',
+  templateUrl: './university-management.component.html',
+  styleUrls: ['./university-management.component.css'],
+  animations: [
+    trigger('detailExpand', [
+      state('collapsed', style({height: '0px', minHeight: '0'})),
+      state('expanded', style({height: '*'})),
+      transition('expanded <=> collapsed', animate('225ms cubic-bezier(0.4, 0.0, 0.2, 1)')),
+    ]),
+  ]
+})
+export class UniversityManagementComponent implements OnInit {
+
+  @ViewChild(MatPaginator, {static: true}) paginator: MatPaginator;
+  @ViewChild(MatSort) sort: MatSort;
+
+  displayedColumns: string[] = ['id', 'address', 'establishmentDate', 'name', 'headmaster', 'actions']; //for now
+  dataSource: MatTableDataSource<University>;
+  columnsToDisplayWithExpand = [...this.displayedColumns];
+  expandedElement: University | null;
+  
+  constructor(private universityService : UniversityService, private router: Router) { }
+  ngOnInit(): void {
+    this.refreshTable();
+  }
+
+  addNewUniversity(){
+    this.router.navigate(['universitytable/createedituniversity']);
+  }
+  
+  
+  selectForChange(university: University){
+    this.router.navigate(['universitytable/createedituniversity', {universityForChange: JSON.stringify(university)}]);
+  }
+
+  deletePhysically(id: number) {
+    this.universityService.delete(id).subscribe(x => { this.refreshTable(); })
+  };
+
+  refreshTable(){
+    this.universityService.getAll().subscribe(university => {
+      this.dataSource = new MatTableDataSource(university);
+      this.dataSource.filterPredicate = (university: University, filterValue: string) => { 
+        const datasrc = university['name']
+        return datasrc.trim().toLowerCase().indexOf(filterValue) != -1;                
+      }
+      this.dataSource.paginator = this.paginator;
+      this.dataSource.sort = this.sort;
+    });
+  }
+
+  applySearch(event: Event) {
+    const filterValue = (event.target as HTMLInputElement).value;
+    this.dataSource.filter = filterValue.trim().toLowerCase();
+  }
+
+}
diff --git a/client/src/app/components/year-management/create-edit-year/create-edit-year.component.html b/client/src/app/components/year-management/create-edit-year/create-edit-year.component.html
index 862c0cbb5cb38b3a05086684b15697b699b94285..f73b8dd2bfd5da74054939ce6376242335012251 100644
--- a/client/src/app/components/year-management/create-edit-year/create-edit-year.component.html
+++ b/client/src/app/components/year-management/create-edit-year/create-edit-year.component.html
@@ -24,15 +24,20 @@
 
                     <mat-form-field appearance="outline" class="example-full-width">
                         <mat-label>Subjects</mat-label>
-                        <mat-select formControlName="subject" [compareWith]="comparator" multiple required>
-                            <mat-option *ngFor="let sp of subjects" [value]="sp">{{sp.naziv}} </mat-option>
+                        <mat-select formControlName="subjects" [compareWith]="comparator" multiple required>
+                            <mat-option *ngFor="let s of sub" [value]="s">{{s.naziv}} </mat-option>
+                        </mat-select>
+                    </mat-form-field>
+
+                    <mat-form-field appearance="outline" class="example-full-width">
+                        <mat-label>Study programme</mat-label>
+                        <mat-select formControlName="studyProgramme" [compareWith]="comparator" required>
+                            <mat-option *ngFor="let program of studyP" [value]="program">{{program.name}} </mat-option>
                         </mat-select>
                     </mat-form-field>
                 
                     </div>
 
-
-
                     <div class="form-group">
                     <button class="btn btn-primary btn-block" type="button" (click)="saveYear()" *ngIf="formCreateEditYear.value.id == null">Add new year</button>
                     <button class="btn btn-primary btn-block" type="button" (click)="saveYear()" *ngIf="formCreateEditYear.value.id != null">Edit year</button>
diff --git a/client/src/app/components/year-management/create-edit-year/create-edit-year.component.ts b/client/src/app/components/year-management/create-edit-year/create-edit-year.component.ts
index aa2c8d4689881b7fca34c9b5c5eb3083260c5d72..c06c8fc37a6db758b10e1a7468216aa8431d359f 100644
--- a/client/src/app/components/year-management/create-edit-year/create-edit-year.component.ts
+++ b/client/src/app/components/year-management/create-edit-year/create-edit-year.component.ts
@@ -17,14 +17,14 @@ import { Subject } from 'src/app/model/subject';
 export class CreateEditYearComponent implements OnInit {
 
   studyP: StudyProgramme[] = [];
-  subjects: Subject[] = [];
+  sub: Subject[] = [];
 
   formCreateEditYear : FormGroup = new FormGroup({
     "id" : new FormControl(null),
     "year" : new FormControl(null, [Validators.required]),
     "active" : new FormControl(true),
-    "subject" : new FormControl(null),
-    "studyprogramme" : new FormControl(null)
+    "subjects" : new FormControl(null),
+    "studyProgramme" : new FormControl(null)
   });
 
   constructor(private route: ActivatedRoute, private location: Location, private yearService: YearService,
@@ -36,7 +36,7 @@ export class CreateEditYearComponent implements OnInit {
       this.formCreateEditYear.patchValue(JSON.parse(this.route.snapshot.paramMap.get('yearForChange')));
     }
 
-    this.sp.getAll().subscribe((sp: Subject[]) => { this.subjects = sp; })
+    this.sp.getAll().subscribe((sp: Subject[]) => { this.sub = sp; })
     this.s.getAll().subscribe((sp: StudyProgramme[]) => { this.studyP = sp; })
   }
 
diff --git a/client/src/app/components/year-management/year-management.component.html b/client/src/app/components/year-management/year-management.component.html
index 7facf3875fc2a236a8673f77221ed6e102e8b96a..81adafc15ea59063533aad98ff7b05388171357d 100644
--- a/client/src/app/components/year-management/year-management.component.html
+++ b/client/src/app/components/year-management/year-management.component.html
@@ -25,14 +25,7 @@
                 <td mat-cell> {{year.year | date:'yyyy-MM-dd'}} </td>
               </ng-container>
             </ng-container>
-<!--
-            <ng-container matColumnDef="studyProgramme">
-              <th mat-header-cell *matHeaderCellDef mat-sort-header> Study programme </th>
-              <ng-container *matCellDef="let year">
-                <td mat-cell> {{year.studyProgramme.name}} </td>
-              </ng-container>
-            </ng-container>
-          -->
+          
             <ng-container matColumnDef="active">
               <th mat-header-cell *matHeaderCellDef mat-sort-header> Active </th>
               <ng-container *matCellDef="let year">
@@ -40,6 +33,13 @@
                 <td mat-cell *ngIf="year.active == false"> No </td>
               </ng-container>
             </ng-container>
+
+            <ng-container matColumnDef="sp">
+              <th mat-header-cell *matHeaderCellDef mat-sort-header> Study programme </th>
+              <ng-container *matCellDef="let year">
+                <td mat-cell> {{year.studyProgramme.name}} </td>
+              </ng-container>
+            </ng-container>
             
             <ng-container matColumnDef="actions">
               <th mat-header-cell *matHeaderCellDef> Actions </th>
@@ -65,13 +65,9 @@
             <ng-container matColumnDef="expandedDetail">
               <td mat-cell *matCellDef="let year" [attr.colspan]="columnsToDisplayWithExpand.length">
                 <div class="example-element-detail" [@detailExpand]="year == expandedElement ? 'expanded' : 'collapsed'">
-                  <div class="example-element-description" *ngFor="let sub of year.studentOnTheYear">
-                    <span class="example-element-description-attribution"> Student({{sub.indexNo}}) -- </span>
-                    
-                  </div>
                   <div class="example-element-description" *ngFor="let subj of year.subjects">
-                    <span class="example-element-description-attribution"> Subject({{subj.naziv}}) -- </span>
-                    
+                    <span class="example-element-description-attribution"> Subject({{subj.id}}) -- </span>
+                    {{subj.naziv}}
                   </div>
                   
                   <!-- <div class="example-element-diagram">
@@ -93,7 +89,7 @@
             <tr mat-row *matRowDef="let row; columns: ['expandedDetail']" class="example-detail-row"></tr>
           </table>
         
-          <mat-paginator [pageSizeOptions]="[5, 10, 20]" showFirstLastButtons aria-label="Select page of subject"></mat-paginator>
+          <mat-paginator [pageSizeOptions]="[5, 10, 20]" showFirstLastButtons aria-label="Select page of year"></mat-paginator>
         </div>
   </header>
 </div>
diff --git a/client/src/app/components/year-management/year-management.component.ts b/client/src/app/components/year-management/year-management.component.ts
index 87ed16d706f8225844db321e0bdbce02e0244878..f7ddf1b402029817114ca7940b93eb1afe6df7a5 100644
--- a/client/src/app/components/year-management/year-management.component.ts
+++ b/client/src/app/components/year-management/year-management.component.ts
@@ -25,7 +25,7 @@ export class YearManagementComponent implements OnInit {
   @ViewChild(MatPaginator, {static: true}) paginator: MatPaginator;
   @ViewChild(MatSort) sort: MatSort;
 
-  displayedColumns: string[] = ['id', 'year','active', 'actions'];
+  displayedColumns: string[] = ['id', 'year','active','sp', 'actions'];
   dataSource: MatTableDataSource<Year>;
   columnsToDisplayWithExpand = [...this.displayedColumns];
   expandedElement: Year | null;
diff --git a/client/src/app/model/faculty.ts b/client/src/app/model/faculty.ts
index 502b5313ea14f2c4f4fa13bbe5e51fbd8187d112..f2a8c59061ec95d93e0d75936efcff42b97edacc 100644
--- a/client/src/app/model/faculty.ts
+++ b/client/src/app/model/faculty.ts
@@ -8,7 +8,7 @@ export interface Faculty {
     address: Adress,
     name: string,
     dean: Professor,
-    studyProgrammes: Set<StudyProgramme>;
-    // university: University
+    studyProgrammes: Set<StudyProgramme>,
+    university: University;
 }
 
diff --git a/client/src/app/model/student-service.ts b/client/src/app/model/student-service.ts
index 4a2d145511ca3ad9a99983e9a677e335d60744f2..0df618dbc28e2bd205345d71038534633961f0c6 100644
--- a/client/src/app/model/student-service.ts
+++ b/client/src/app/model/student-service.ts
@@ -4,7 +4,7 @@ import { Year } from "./year";
 
 export interface StudentService {
     id: number,
-    studentOnTheYear:StudentOnTheYear,
-    studyProgramme:StudyProgramme,
-    yearofstudy:Year
+    student:StudentOnTheYear,
+    studyProgrammes:StudyProgramme,
+    year:Set<Year>
 }
diff --git a/client/src/app/model/university.ts b/client/src/app/model/university.ts
index d548601df8010ef482d87559b2ad3b9f8d9073f1..d73378c1a0ca0b1c2540aeedd6340255ee5990af 100644
--- a/client/src/app/model/university.ts
+++ b/client/src/app/model/university.ts
@@ -4,9 +4,9 @@ import { Faculty } from "./faculty";
 export interface University {
 
     id: number,
-    name: string,
-    estDate: string,
     address: Adress,
+    establishmentDate: Date,
+    name: string,
     faculty: Set<Faculty>
     headmaster: Professor,
 
diff --git a/client/src/app/model/year.ts b/client/src/app/model/year.ts
index e83aff169cd06bbb5ab9afae623454c68e5d3567..40c64c312d2a49bf2b4b2b30da9c2dc9003c092b 100644
--- a/client/src/app/model/year.ts
+++ b/client/src/app/model/year.ts
@@ -8,7 +8,7 @@ export interface Year {
     id:number,
     year:Date,
     active:boolean,
-    //studyProgramme: StudyProgramme,
+    studyProgramme: StudyProgramme,
     subjects:Set<Subject>,
     //studentOnTheYear:Set<StudentOnTheYear>
 
diff --git a/client/src/app/service/university/university.service.spec.ts b/client/src/app/service/university/university.service.spec.ts
new file mode 100644
index 0000000000000000000000000000000000000000..1ab95267f2d7c33ed814a1d97046c73947435f82
--- /dev/null
+++ b/client/src/app/service/university/university.service.spec.ts
@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { UniversityService } from './university.service';
+
+describe('UniversityService', () => {
+  let service: UniversityService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(UniversityService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+});
diff --git a/client/src/app/service/university/university.service.ts b/client/src/app/service/university/university.service.ts
new file mode 100644
index 0000000000000000000000000000000000000000..f6e56a40bb33b097e610f225dd1b5c20d3f464d3
--- /dev/null
+++ b/client/src/app/service/university/university.service.ts
@@ -0,0 +1,37 @@
+import { HttpClient } from '@angular/common/http';
+import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
+import { University } from '../../model/university';
+
+
+const SP_URL = 'http://localhost:8080/api/universities/';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class UniversityService {
+
+  constructor(private http: HttpClient) { }
+
+  getAll(): Observable<University[]> {
+    return this.http.get<University[]>(SP_URL + 'allUniversities');
+  }
+
+  create(university: University){
+    return this.http.post(SP_URL + 'createUniversity', university);
+  }
+
+  update(id : number, university : University) {
+    return this.http.put(SP_URL + id, university);
+  }
+
+  delete(id : number) {
+    return this.http.delete(SP_URL + id);
+  }
+
+  getOne(id : number) {
+    return this.http.get<University>(SP_URL + id);
+  }
+
+
+}