From e52c1bd4c06aab6acd264be81d2c36fc7a6815f1 Mon Sep 17 00:00:00 2001
From: Franck Brondon Mezatio Felefack
<franck.brondon.mezatio.felefack@mni.thm.de>
Date: Mon, 24 May 2021 19:49:59 +0200
Subject: [PATCH] Added count of questions
---
.../topic-cloud-filter.component.html | 6 ++----
.../topic-cloud-filter.component.ts | 19 +++++++++++++++++++
2 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/src/app/components/shared/_dialogs/topic-cloud-filter/topic-cloud-filter.component.html b/src/app/components/shared/_dialogs/topic-cloud-filter/topic-cloud-filter.component.html
index fdf95e7f1..cd595afd4 100644
--- a/src/app/components/shared/_dialogs/topic-cloud-filter/topic-cloud-filter.component.html
+++ b/src/app/components/shared/_dialogs/topic-cloud-filter/topic-cloud-filter.component.html
@@ -4,13 +4,11 @@
<mat-divider></mat-divider>
<mat-radio-group [(ngModel)]="continueFilter" aria-label="Select an option">
- <mat-radio-button value="continueWithAll">{{'content.continue-with-all-questions' | translate}}</mat-radio-button>
+ <mat-radio-button value="continueWithAll">{{allCommentCount}} {{'content.continue-with-all-questions' | translate}}</mat-radio-button>
<mat-radio-button checked="true" value="continueWithCurr">{{'content.continue-with-current-questions' | translate}}</mat-radio-button>
<mat-radio-button value="continueWithAllFromNow">{{'content.continue-with-all-questions-from-now' | translate}}</mat-radio-button>
</mat-radio-group>
-
-
-<app-dialog-action-buttons
+ <app-dialog-action-buttons
buttonsLabelSection="content"
confirmButtonLabel="continue"
buttonIcon="cloud"
diff --git a/src/app/components/shared/_dialogs/topic-cloud-filter/topic-cloud-filter.component.ts b/src/app/components/shared/_dialogs/topic-cloud-filter/topic-cloud-filter.component.ts
index 5e909224e..ec8543b58 100644
--- a/src/app/components/shared/_dialogs/topic-cloud-filter/topic-cloud-filter.component.ts
+++ b/src/app/components/shared/_dialogs/topic-cloud-filter/topic-cloud-filter.component.ts
@@ -7,6 +7,9 @@ import { LanguageService } from '../../../../services/util/language.service';
import { EventService } from '../../../../services/util/event.service';
import { ActivatedRoute, Router } from '@angular/router';
import { CommentFilterOptions } from '../../../../utils/filter-options';
+import { CommentService } from '../../../../services/http/comment.service';
+import { RoomService } from '../../../../services/http/room.service';
+import { Comment } from '../../../../models/comment';
@Component({
selector: 'app-topic-cloud-filter',
@@ -21,7 +24,11 @@ export class TopicCloudFilterComponent implements OnInit {
continueFilter = 'continueWithCurr';
tmpFilter : CommentFilterOptions;
+ allCommentCount:number;
+ comments: Comment[] = [];
+ roomId: string;
+
constructor(public dialogRef: MatDialogRef<RoomCreatorPageComponent>,
public dialog: MatDialog,
public notificationService: NotificationService,
@@ -29,6 +36,8 @@ export class TopicCloudFilterComponent implements OnInit {
protected langService: LanguageService,
private route: ActivatedRoute,
private router: Router,
+ protected roomService: RoomService,
+ private commentService: CommentService,
@Inject(MAT_DIALOG_DATA) public data: any,
public eventService: EventService) {
langService.langEmitter.subscribe(lang => translationService.use(lang));
@@ -38,6 +47,16 @@ export class TopicCloudFilterComponent implements OnInit {
this.translationService.use(localStorage.getItem('currentLang'));
this.tmpFilter = CommentFilterOptions.readFilter();
localStorage.setItem("filtertmp", JSON.stringify(this.tmpFilter));
+ this.roomService.getRoomByShortId(this.shortId).subscribe(room => {
+ this.roomId = room.id;
+ });
+
+
+ this.commentService.getAckComments(this.roomId)
+ .subscribe(comments => {
+ this.comments = comments;
+ });
+ this.allCommentCount =this.comments.length;
}
closeDialog(): void {
--
GitLab