From e79a9abcba9b2b56306ad6ef7d21d874c76c2075 Mon Sep 17 00:00:00 2001
From: Lauryn Lorna Monthe Djomeni <lauryn.lorna.monthe.djomeni@mni.thm.de>
Date: Sun, 27 Jun 2021 18:16:21 +0200
Subject: [PATCH] Review change Block questions to Unlock questions
---
.../_dialogs/room-edit/room-edit.component.html | 10 ++--------
src/app/components/shared/header/header.component.html | 4 ++--
src/app/components/shared/header/header.component.ts | 2 --
3 files changed, 4 insertions(+), 12 deletions(-)
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 9ee31f0d5..479407610 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
@@ -58,16 +58,10 @@
<div fxLayoutAlign="center center">
<mat-slide-toggle [(ngModel)]= "check">{{ 'room-page.block' | translate }}</mat-slide-toggle>
</div>
- <div fxLayoutAlign="center center" fxLayout="column">
- <mat-slide-toggle (change)="showMessage('words-will-be-overwritten', $event.checked)" [(ngModel)]= "profanityCheck">
+ <div fxLayoutAlign="center center">
+ <mat-slide-toggle (change)="showMessage('words-will-be-overwritten')" [(ngModel)]= "profanityCheck">
{{ 'room-page.profanity-filter' | translate }}
</mat-slide-toggle>
- <mat-slide-toggle *ngIf="profanityCheck" (change)="showMessage('only-specific-language-will-be-filtered', $event.checked)" [(ngModel)]= "censorLanguageSpecificCheck">
- {{ 'room-page.language-specific-filter' | translate }}
- </mat-slide-toggle>
- <mat-slide-toggle *ngIf="profanityCheck" (change)="showMessage('partial-words-will-be-filtered', $event.checked)" [(ngModel)]= "censorPartialWordsCheck">
- {{ 'room-page.partial-words-filter' | translate }}
- </mat-slide-toggle>
</div>
<div fxLayoutAlign="center center">
<!-- <input type="checkbox" id= "myCheck" [(ngModel)]= "check" > -->
diff --git a/src/app/components/shared/header/header.component.html b/src/app/components/shared/header/header.component.html
index 4c59c2f5e..1ce1a2e7d 100644
--- a/src/app/components/shared/header/header.component.html
+++ b/src/app/components/shared/header/header.component.html
@@ -366,8 +366,8 @@
[ngClass]="{'color-warn': room && room.questionsBlocked}"
tabindex="0">
<mat-icon class="color-warn">block</mat-icon>
- <span *ngIf="name">{{'header.block' | translate}}</span>
- <span *ngIf="!name">{{'header.unlock' | translate}}</span>
+ <span *ngIf="!room.questionsBlocked">{{'header.block' | translate}}</span>
+ <span *ngIf="room.questionsBlocked">{{'header.unlock' | translate}}</span>
</button>
</ng-container>
diff --git a/src/app/components/shared/header/header.component.ts b/src/app/components/shared/header/header.component.ts
index 54175a487..67ce2e12f 100644
--- a/src/app/components/shared/header/header.component.ts
+++ b/src/app/components/shared/header/header.component.ts
@@ -32,7 +32,6 @@ import { WorkerDialogComponent } from '../_dialogs/worker-dialog/worker-dialog.c
styleUrls: ['./header.component.scss']
})
export class HeaderComponent implements OnInit {
- name = true;
user: User;
cTime: string;
shortId: string;
@@ -321,7 +320,6 @@ export class HeaderComponent implements OnInit {
// flip state if clicked
this.room.questionsBlocked = !this.room.questionsBlocked;
this.roomService.updateRoom(this.room).subscribe(r => this.room = r);
- this.name = false;
}
public startWorkerDialog() {
--
GitLab