From 8289380ae02dfa7626cbdd5603103d0f65c8297a Mon Sep 17 00:00:00 2001 From: Tim Cremer Date: Sun, 13 Oct 2024 14:49:47 +0200 Subject: [PATCH 1/3] Added default strings for empty FAQ page --- .../app/overview/course-faq/course-faq.component.html | 6 ++++++ .../webapp/app/overview/course-faq/course-faq.component.ts | 3 ++- src/main/webapp/i18n/de/faq.json | 4 +++- src/main/webapp/i18n/en/faq.json | 4 +++- 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/main/webapp/app/overview/course-faq/course-faq.component.html b/src/main/webapp/app/overview/course-faq/course-faq.component.html index 115efb80cc1c..57e8599419e6 100644 --- a/src/main/webapp/app/overview/course-faq/course-faq.component.html +++ b/src/main/webapp/app/overview/course-faq/course-faq.component.html @@ -27,9 +27,15 @@
+ @if (faqs.length === 0) { +

+ }
@for (faq of this.filteredFaqs; track faq) { }
+ @if (filteredFaqs.length === 0 && faqs.length > 0) { +

+ } diff --git a/src/main/webapp/app/overview/course-faq/course-faq.component.ts b/src/main/webapp/app/overview/course-faq/course-faq.component.ts index 03fd207fda21..db5a91e2c3d7 100644 --- a/src/main/webapp/app/overview/course-faq/course-faq.component.ts +++ b/src/main/webapp/app/overview/course-faq/course-faq.component.ts @@ -16,6 +16,7 @@ import { loadCourseFaqCategories } from 'app/faq/faq.utils'; import { CustomExerciseCategoryBadgeComponent } from 'app/shared/exercise-categories/custom-exercise-category-badge/custom-exercise-category-badge.component'; import { onError } from 'app/shared/util/global.utils'; import { SearchFilterComponent } from 'app/shared/search-filter/search-filter.component'; +import { ArtemisMarkdownModule } from 'app/shared/markdown.module'; @Component({ selector: 'jhi-course-faq', @@ -23,7 +24,7 @@ import { SearchFilterComponent } from 'app/shared/search-filter/search-filter.co styleUrls: ['../course-overview.scss', 'course-faq.component.scss'], encapsulation: ViewEncapsulation.None, standalone: true, - imports: [ArtemisSharedComponentModule, ArtemisSharedModule, CourseFaqAccordionComponent, CustomExerciseCategoryBadgeComponent, SearchFilterComponent], + imports: [ArtemisSharedComponentModule, ArtemisSharedModule, CourseFaqAccordionComponent, CustomExerciseCategoryBadgeComponent, SearchFilterComponent, ArtemisMarkdownModule], }) export class CourseFaqComponent implements OnInit, OnDestroy { private ngUnsubscribe = new Subject(); diff --git a/src/main/webapp/i18n/de/faq.json b/src/main/webapp/i18n/de/faq.json index 0cb07d298310..987b093de2c7 100644 --- a/src/main/webapp/i18n/de/faq.json +++ b/src/main/webapp/i18n/de/faq.json @@ -20,7 +20,9 @@ "questionAnswer": "Antwort auf die Frage", "categories": "Kategorien" }, - "course": "Kurs" + "course": "Kurs", + "noExisting": "Momentan existiert für diesen Kurs noch kein FAQ.", + "noMatching": "Es gibt kein FAQ, das die Kombination aus Filter- und Suchkriterien erfüllt." } } } diff --git a/src/main/webapp/i18n/en/faq.json b/src/main/webapp/i18n/en/faq.json index 1a158eb52c40..3fd403409d2b 100644 --- a/src/main/webapp/i18n/en/faq.json +++ b/src/main/webapp/i18n/en/faq.json @@ -20,7 +20,9 @@ "questionAnswer": "Question answer", "categories": "Categories" }, - "course": "Course" + "course": "Course", + "noExisting": "Currently, there is no FAQ available for this course.", + "noMatching": "There is no FAQ that matches the combination of filter and search criteria." } } } From 79821884332b9e58bf2f5ed9fa251da5640d4b25 Mon Sep 17 00:00:00 2001 From: Tim Cremer Date: Sun, 13 Oct 2024 14:53:56 +0200 Subject: [PATCH 2/3] Added default strings for empty FAQ page --- .../webapp/app/overview/course-faq/course-faq.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/app/overview/course-faq/course-faq.component.html b/src/main/webapp/app/overview/course-faq/course-faq.component.html index 57e8599419e6..3802e3618f38 100644 --- a/src/main/webapp/app/overview/course-faq/course-faq.component.html +++ b/src/main/webapp/app/overview/course-faq/course-faq.component.html @@ -35,7 +35,7 @@

} - @if (filteredFaqs.length === 0 && faqs.length > 0) { + @if (filteredFaqs.length === 0 && faqs.length != 0) {

} From 70cda66fdad3886fa26c57a3456aab811fe36ae1 Mon Sep 17 00:00:00 2001 From: Tim Cremer Date: Sun, 13 Oct 2024 15:01:24 +0200 Subject: [PATCH 3/3] Added default strings for empty FAQ page --- .../webapp/app/overview/course-faq/course-faq.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/app/overview/course-faq/course-faq.component.html b/src/main/webapp/app/overview/course-faq/course-faq.component.html index 3802e3618f38..57e8599419e6 100644 --- a/src/main/webapp/app/overview/course-faq/course-faq.component.html +++ b/src/main/webapp/app/overview/course-faq/course-faq.component.html @@ -35,7 +35,7 @@

} - @if (filteredFaqs.length === 0 && faqs.length != 0) { + @if (filteredFaqs.length === 0 && faqs.length > 0) {

}