From c4b44e76873cbec1452791db36ecbc728a12293e Mon Sep 17 00:00:00 2001 From: Lauryn Lorna Monthe Djomeni <lauryn.lorna.monthe.djomeni@mni.thm.de> Date: Fri, 21 May 2021 19:38:33 +0200 Subject: [PATCH] Add block button on session administration --- .../_dialogs/room-edit/room-edit.component.html | 10 ++++++++++ .../creator/_dialogs/room-edit/room-edit.component.ts | 2 ++ .../dialog-action-buttons.component.html | 1 + src/app/components/shared/header/header.component.html | 2 +- src/assets/i18n/creator/de.json | 1 + src/assets/i18n/creator/en.json | 1 + 6 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/app/components/creator/_dialogs/room-edit/room-edit.component.html b/src/app/components/creator/_dialogs/room-edit/room-edit.component.html index cbcd9da2b..b842acd24 100644 --- a/src/app/components/creator/_dialogs/room-edit/room-edit.component.html +++ b/src/app/components/creator/_dialogs/room-edit/room-edit.component.html @@ -55,12 +55,21 @@ </mat-tab> </mat-tab-group> <div fxLayoutAlign="center center"> + <button mat-flat-button + type="button" + style="background-color: teal;" + (click)="blockQuestions()" + aria-labelledby="block"> + <mat-icon>block</mat-icon> + {{ 'room-page.block' | translate }}</button> + <button mat-raised-button class="delete" (click)="openDeleteRoomDialog()" aria-labelledby="delete-room"> <mat-icon>delete</mat-icon> {{ 'room-page.delete-room' | translate }}</button> + </div> </div> </div> @@ -68,6 +77,7 @@ <app-dialog-action-buttons buttonsLabelSection="room-page" confirmButtonLabel="update" + [cancelButtonClickAction]="buildCloseDialogActionCallback()" [confirmButtonClickAction]="buildSaveActionCallback()" ></app-dialog-action-buttons> diff --git a/src/app/components/creator/_dialogs/room-edit/room-edit.component.ts b/src/app/components/creator/_dialogs/room-edit/room-edit.component.ts index cd26cf219..3941fe6b0 100644 --- a/src/app/components/creator/_dialogs/room-edit/room-edit.component.ts +++ b/src/app/components/creator/_dialogs/room-edit/room-edit.component.ts @@ -11,6 +11,7 @@ import { RoomCreatorPageComponent } from '../../room-creator-page/room-creator-p import { EventService } from '../../../../services/util/event.service'; import { RoomDeleted } from '../../../../models/events/room-deleted'; + @Component({ selector: 'app-room-edit', templateUrl: './room-edit.component.html', @@ -90,4 +91,5 @@ export class RoomEditComponent implements OnInit { buildSaveActionCallback(): () => void { return () => this.save(); } + } diff --git a/src/app/components/shared/dialog/dialog-action-buttons/dialog-action-buttons.component.html b/src/app/components/shared/dialog/dialog-action-buttons/dialog-action-buttons.component.html index fe6843e70..06bf0d6f8 100644 --- a/src/app/components/shared/dialog/dialog-action-buttons/dialog-action-buttons.component.html +++ b/src/app/components/shared/dialog/dialog-action-buttons/dialog-action-buttons.component.html @@ -21,6 +21,7 @@ attr.aria-labelledby="{{ ariaPrefix + 'cancel' | translate }}" (click)="performCancelButtonClickAction()" >{{ buttonsLabelSection + '.cancel' | translate}}</button> + </div> </div> <!--Hidden Div's for a11y-Descriptions--> diff --git a/src/app/components/shared/header/header.component.html b/src/app/components/shared/header/header.component.html index 11f0ef435..2615f73ee 100644 --- a/src/app/components/shared/header/header.component.html +++ b/src/app/components/shared/header/header.component.html @@ -348,7 +348,7 @@ <span>{{'header.delete-account' | translate}}</span> </button> - <ng-container *ngIf="shortId && user && user.role > 0 && !router.url.includes('/participant')"> + <ng-container *ngIf="router.url.includes('/creator') || router.url.includes('/moderator')"> <button mat-menu-item (click)="blockQuestions()" [ngClass]="{'color-warn': room.closed}" diff --git a/src/assets/i18n/creator/de.json b/src/assets/i18n/creator/de.json index 348dfe6fb..965f5389c 100644 --- a/src/assets/i18n/creator/de.json +++ b/src/assets/i18n/creator/de.json @@ -308,6 +308,7 @@ "threshold": "Schwellenwert für die Anzeige? ", "threshold-description": "Lege den Schwellenwert fest, ab dem eine negativ bewertete Frage angezeigt werden soll.", "update": "Speichern", + "block" : "Fragen sperren", "update-description": "Speichert die Änderungen", "question": "Frage", "favorite": "Favorit", diff --git a/src/assets/i18n/creator/en.json b/src/assets/i18n/creator/en.json index 1e642e176..e2707f9ff 100644 --- a/src/assets/i18n/creator/en.json +++ b/src/assets/i18n/creator/en.json @@ -309,6 +309,7 @@ "threshold": "Threshold value for display? ", "threshold-description": "Set the threshold value above which a negatively rated question should be displayed.", "update": "Save", + "block" : "Block questions", "update-description": "Save changes", "question": "Question", "favorite": "Favorite", -- GitLab