diff --git a/AngularApp/src/app/card-assignment/card-assignment.component.html b/AngularApp/src/app/card-assignment/card-assignment.component.html
index 418f0b8ce4a8e47ae97dcb1afd810492a7f8081e..262a09a7f3aefc9c7087dd2772df34da0207e80e 100644
--- a/AngularApp/src/app/card-assignment/card-assignment.component.html
+++ b/AngularApp/src/app/card-assignment/card-assignment.component.html
@@ -3,11 +3,11 @@
         <div class="card-icon">
             <i class="material-icons">content_paste</i>
         </div>
-        <p class="card-category">{{desc}}</p>
-        <h3 class="card-title">{{titleCard}}</h3>
+        <p class="card-category">{{assgn.description}}</p>
+        <h3 class="card-title">{{assgn.title}}</h3>
         <a mat-raised-button type="submit" class="btn btn-outline-info pull-right">Create</a>
     </div>
     <div class="card-footer">
-        <p>{{lang}}</p>
+        <p>{{assgn.language}}</p>
     </div>
 </div>
\ No newline at end of file
diff --git a/AngularApp/src/app/card-assignment/card-assignment.component.ts b/AngularApp/src/app/card-assignment/card-assignment.component.ts
index 5e0893eaa84ca46c81bb12d086ff9b24c6667a33..81d0de00558c0e3d83e3f02adbbcc7df705af636 100644
--- a/AngularApp/src/app/card-assignment/card-assignment.component.ts
+++ b/AngularApp/src/app/card-assignment/card-assignment.component.ts
@@ -1,5 +1,6 @@
 import { Component, OnInit, Input } from '@angular/core';
 import { CommonModule } from '@angular/common';
+import { Assignment } from 'app/model/assignment';
 
 @Component({
   selector: 'app-card-assignment',
@@ -7,9 +8,7 @@ import { CommonModule } from '@angular/common';
   styleUrls: ['./card-assignment.component.scss'],
 })
 export class CardAssignmentComponent implements OnInit {
- @Input() titleCard : string;
- @Input() desc : string;
- @Input() lang : string;
+ @Input() assgn : Assignment;
   constructor() { }
 
   ngOnInit(): void {
diff --git a/AngularApp/src/app/exercise-student/exercise-student.component.html b/AngularApp/src/app/exercise-student/exercise-student.component.html
index 1db6599eec85c7c40d83941aa4c73a30bacf6ff2..67973a7778d75f7835dd1d8eb1ce27dd70de860d 100644
--- a/AngularApp/src/app/exercise-student/exercise-student.component.html
+++ b/AngularApp/src/app/exercise-student/exercise-student.component.html
@@ -52,7 +52,7 @@
 
                 <!-- <table class="table"> -->
                     <div *ngFor="let col of assignmentFilter">
-                        <app-card-assignment [titleCard]="col['title']" [desc]="col['description']" [lang]="col['language']"></app-card-assignment>
+                        <app-card-assignment [assgn]="col"></app-card-assignment>
                     </div>
                 <!-- </table> -->
             </div>