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 17b7d7a0da0867f5aeb29c8e8cfd2781de5b3a52..5ef513b80807bb6edda44d9def652adf0395c0a5 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 36eb4e46695a782290b0800cd865b2dac56e9d95..3e80e92eb51beb624a3a9f3acf9316140e37fcd6 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 1bdb361e399dc981076a0874f0ad5857f1529695..5e9e8226f98a7ed62f6a29f2b0c04be6cea2bbcb 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 78d37c748a78917631b653c1298649949bad365f..3cae002c0b7b5618b99689e015c6b7bf967e9bd5 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",