diff --git a/src/app/components/fragments/content-choice-creator/content-choice-creator.component.html b/src/app/components/fragments/content-choice-creator/content-choice-creator.component.html index dad4dbedb7a52b85196ba7b829c414ac13944433..d2866b0b0d4bcb606e1e05ad89dca5e8b06d0ccb 100644 --- a/src/app/components/fragments/content-choice-creator/content-choice-creator.component.html +++ b/src/app/components/fragments/content-choice-creator/content-choice-creator.component.html @@ -22,9 +22,21 @@ <mat-header-cell *matHeaderCellDef>Answer</mat-header-cell> <mat-cell *matCellDef="let answer"> <!-- ToDo: Check ngModel --> - <mat-checkbox color="primary" (click)="switchValue(answer.answerOption.label)" [(ngModel)]="answer.correct" [checked]="answer.correct" + <mat-checkbox color="primary" (click)="switchValue(answer.answerOption.label)" [(ngModel)]="answer.correct" + [checked]="answer.correct" name="{{ answer.answerOption.label }}">{{ answer.answerOption.label }} </mat-checkbox> + </mat-cell> + </ng-container> + + <ng-container matColumnDef="points"> + <mat-header-cell *matHeaderCellDef>Points</mat-header-cell> + <mat-cell *matCellDef="let answer">{{ answer.answerOption.points }}</mat-cell> + </ng-container> + + <ng-container matColumnDef="actions"> + <mat-header-cell *matHeaderCellDef>Actions</mat-header-cell> + <mat-cell *matCellDef="let answer"> <button mat-icon-button (click)="openAnswerModificationDialog(answer.answerOption.label, answer.answerOption.points, answer.correct)" color="primary"> @@ -36,11 +48,6 @@ </mat-cell> </ng-container> - <ng-container matColumnDef="points"> - <mat-header-cell *matHeaderCellDef>Points</mat-header-cell> - <mat-cell *matCellDef="let answer">{{ answer.answerOption.points }}</mat-cell> - </ng-container> - <mat-header-row *matHeaderRowDef="displayedColumns"></mat-header-row> <mat-row *matRowDef="let row; columns: displayedColumns;"></mat-row> </mat-table> diff --git a/src/app/components/fragments/content-choice-creator/content-choice-creator.component.ts b/src/app/components/fragments/content-choice-creator/content-choice-creator.component.ts index a0891e3589bbb670bebf52238bc6c51ab4edc155..680c67a74a5e1c1b158283ff658394724e7ec3a4 100644 --- a/src/app/components/fragments/content-choice-creator/content-choice-creator.component.ts +++ b/src/app/components/fragments/content-choice-creator/content-choice-creator.component.ts @@ -34,7 +34,7 @@ export class ContentChoiceCreatorComponent implements OnInit { [], true); - displayedColumns = ['label', 'points']; + displayedColumns = ['label', 'points', 'actions']; displayAnswers: DisplayAnswer[] = []; lastDeletedDisplayAnswer: DisplayAnswer;