From f27458c0534588b268dbab5c68b1a698a5037e9b Mon Sep 17 00:00:00 2001
From: Ruben Bimberg <ruben.bimberg@mni.thm.de>
Date: Tue, 29 Jun 2021 13:29:59 +0200
Subject: [PATCH] Fix filter bug
Filtering did not show all tags.
---
.../topic-cloud-filter/topic-cloud-filter.component.ts | 6 ++++--
src/app/services/util/tag-cloud-data.service.ts | 6 ------
2 files changed, 4 insertions(+), 8 deletions(-)
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 f9c8931bc..33f3ed805 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
@@ -6,7 +6,7 @@ import { RoomCreatorPageComponent } from '../../../creator/room-creator-page/roo
import { LanguageService } from '../../../../services/util/language.service';
import { EventService } from '../../../../services/util/event.service';
import { Router } from '@angular/router';
-import { CommentFilter } from '../../../../utils/filter-options';
+import { CommentFilter, Period } from '../../../../utils/filter-options';
import { RoomService } from '../../../../services/http/room.service';
import { Comment } from '../../../../models/comment';
import { CommentListData } from '../../comment-list/comment-list.component';
@@ -91,7 +91,9 @@ export class TopicCloudFilterComponent implements OnInit {
switch (this.continueFilter) {
case 'continueWithAll':
- filter = new CommentFilter(); // all questions allowed
+ // all questions allowed
+ filter = new CommentFilter();
+ filter.periodSet = Period.all;
break;
case 'continueWithAllFromNow':
diff --git a/src/app/services/util/tag-cloud-data.service.ts b/src/app/services/util/tag-cloud-data.service.ts
index 97d22b273..8d48d73ab 100644
--- a/src/app/services/util/tag-cloud-data.service.ts
+++ b/src/app/services/util/tag-cloud-data.service.ts
@@ -300,13 +300,11 @@ export class TagCloudDataService {
}
private fetchData(): void {
- console.log('Try to get room data');
this._roomDataService.getRoomData(this._roomId).subscribe((comments: Comment[]) => {
if (comments === null) {
return;
}
this._lastFetchedComments = comments;
- console.log('Room data get', comments);
this.rebuildTagData();
});
}
@@ -327,13 +325,9 @@ export class TagCloudDataService {
return;
}
const currentMeta = this._isDemoActive ? this._lastMetaData : this._currentMetaData;
- console.log('Start filtering', this._currentFilter);
const filteredComments = this._lastFetchedComments.filter(comment => this._currentFilter.checkComment(comment));
- console.log('End filtering', filteredComments);
currentMeta.commentCount = filteredComments.length;
- console.log('start building structure', this._adminData);
const [data, users] = TagCloudDataService.buildDataFromComments(this._adminData, filteredComments);
- console.log('end building structure', data);
let minWeight = null;
let maxWeight = null;
for (const value of data.values()) {
--
GitLab