From c22613a6e260e6b149c11de91371b3834d0485d8 Mon Sep 17 00:00:00 2001
From: Ruben Bimberg <ruben.bimberg@mni.thm.de>
Date: Wed, 11 Aug 2021 10:36:48 +0200
Subject: [PATCH] Remove unnecessary queries
[Ticket: #224]
---
.../topic-cloud-filter.component.html | 16 +---------------
.../topic-cloud-filter.component.ts | 17 -----------------
src/assets/i18n/home/de.json | 6 ------
src/assets/i18n/home/en.json | 6 ------
4 files changed, 1 insertion(+), 44 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 17b7d7a0d..5ef513b80 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
@@ -1,20 +1,5 @@
<mat-dialog-content>
- <h3>{{'content.tag-cloud-source-title' | translate}}</h3>
- <mat-radio-group [(ngModel)]="selectedSource">
- <mat-radio-button value="all">
- <span>{{'content.tag-cloud-source-all' | translate}}</span>
- </mat-radio-button>
- <mat-radio-button value="fromUser">
- <span *ngIf="isMobile()">{{'content.tag-cloud-source-verified-by-user-short' | translate}}</span>
- <span *ngIf="!isMobile()">{{'content.tag-cloud-source-verified-by-user' | translate}}</span>
- </mat-radio-button>
- <mat-radio-button value="fromSpacy">
- <span *ngIf="isMobile()">{{'content.tag-cloud-source-analyzed-short' | translate}}</span>
- <span *ngIf="!isMobile()">{{'content.tag-cloud-source-analyzed' | translate}}</span>
- </mat-radio-button>
- </mat-radio-group>
-
<h3>{{'content.tag-cloud-questions-title' | translate}}</h3>
<span *ngIf="isTopicRequirementActive">
@@ -116,3 +101,4 @@
[confirmButtonClickAction]="confirmButtonActionCallback()">
</app-dialog-action-buttons>
+</mat-dialog-content>
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 36eb4e466..3e80e92eb 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
@@ -43,7 +43,6 @@ export class TopicCloudFilterComponent implements OnInit {
question = '';
continueFilter = 'continueWithAll';
- selectedSource;
comments: Comment[];
tmpFilter: CommentFilter;
allComments: CommentsCount;
@@ -68,13 +67,6 @@ export class TopicCloudFilterComponent implements OnInit {
private themeService: ThemeService) {
langService.langEmitter.subscribe(lang => translationService.use(lang));
this._adminData = TopicCloudAdminService.getDefaultAdminData;
- if (this._adminData.keywordORfulltext === KeywordOrFulltext.fulltext) {
- this.selectedSource = KeywordsSource.fromSpacy;
- } else if (this._adminData.keywordORfulltext === KeywordOrFulltext.keyword) {
- this.selectedSource = KeywordsSource.fromUser;
- } else {
- this.selectedSource = KeywordsSource.all;
- }
this.isTopicRequirementActive = !TopicCloudAdminService.isTopicRequirementDisabled(this._adminData);
}
@@ -151,15 +143,6 @@ export class TopicCloudFilterComponent implements OnInit {
return;
}
- if (this.selectedSource === KeywordsSource.fromSpacy) {
- this._adminData.keywordORfulltext = KeywordOrFulltext.fulltext;
- } else if (this.selectedSource === KeywordsSource.fromUser) {
- this._adminData.keywordORfulltext = KeywordOrFulltext.keyword;
- } else {
- this._adminData.keywordORfulltext = KeywordOrFulltext.both;
- }
- this.topicCloudAdminService.updateLocalAdminData(this._adminData);
-
const params = CloudParameters.currentParameters;
params.question = this.question;
CloudParameters.currentParameters = params;
diff --git a/src/assets/i18n/home/de.json b/src/assets/i18n/home/de.json
index 1bdb361e3..5e9e8226f 100644
--- a/src/assets/i18n/home/de.json
+++ b/src/assets/i18n/home/de.json
@@ -51,12 +51,6 @@
"reset": "Zurücksetzen",
"brainstorming-question": "Ãœberschrift der Wortwolke",
"tag-cloud-info": "Je größer die Schrift, desto häufiger wurde das Wort in den Fragen verwendet oder als Stichwort vergeben. Auch die Bewertungen der Fragen beeinflussen die Schriftgröße.",
- "tag-cloud-source-title": "Welche Stichwörter sollen angezeigt werden?",
- "tag-cloud-source-verified-by-user": "Stichwörter der Fragensteller*innen",
- "tag-cloud-source-verified-by-user-short": "Vergebene Stichwörter",
- "tag-cloud-source-analyzed": "Stichwörter aus der Grammatik-Analyse",
- "tag-cloud-source-analyzed-short": "Analysierte Stichwörter",
- "tag-cloud-source-all": "Alle",
"tag-cloud-questions-title": "Welche Fragen sollen berücksichtigt werden?",
"tag-cloud-questions-all": "Alle",
"tag-cloud-questions-all-short": "Alle",
diff --git a/src/assets/i18n/home/en.json b/src/assets/i18n/home/en.json
index 78d37c748..3cae002c0 100644
--- a/src/assets/i18n/home/en.json
+++ b/src/assets/i18n/home/en.json
@@ -145,12 +145,6 @@
"reset": "Reset",
"brainstorming-question": "Word cloud heading",
"tag-cloud-info": "The word cloud in »frag.jetzt« serves as a semantic filter: the larger the font, the more often the word was used grammatically in the questions or assigned as a keyword. The ratings of the questions also influence the font size.",
- "tag-cloud-source-title": "Which keywords should be displayed?",
- "tag-cloud-source-verified-by-user": "Keywords from the questioners",
- "tag-cloud-source-verified-by-user-short": "Assigned keywords",
- "tag-cloud-source-analyzed": "Keywords from grammar analysis",
- "tag-cloud-source-analyzed-short": "Keywords analysed",
- "tag-cloud-source-all": "All keywords",
"tag-cloud-questions-title": "Which questions should be included?",
"tag-cloud-questions-all": "All questions",
"tag-cloud-questions-all-short": "All questions",
--
GitLab