From 24a7b80a6bfc8377c8e652cd65c996bfc5e655d3 Mon Sep 17 00:00:00 2001 From: Hangzhi Yu <hangzhi@protonmail.com> Date: Sun, 18 Feb 2024 16:27:13 +0100 Subject: [PATCH] Add placeholder text for group/course filter --- aleksis/apps/alsijil/frontend/components/Coursebook.vue | 5 +++++ aleksis/apps/alsijil/frontend/messages/de.json | 3 ++- aleksis/apps/alsijil/frontend/messages/en.json | 3 ++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/aleksis/apps/alsijil/frontend/components/Coursebook.vue b/aleksis/apps/alsijil/frontend/components/Coursebook.vue index 2300a00b9..e8495f952 100644 --- a/aleksis/apps/alsijil/frontend/components/Coursebook.vue +++ b/aleksis/apps/alsijil/frontend/components/Coursebook.vue @@ -17,7 +17,9 @@ filled dense hide-details + :placeholder="$t('alsijil.coursebook.filter.filter_for_obj')" :loading="selectLoading" + :value="currentObj" @input="changeSelection" @click:clear="changeSelection" /> @@ -167,6 +169,9 @@ export default { ...this.courses.map((course) => ({ type: "course", ...course })), ]; }, + currentObj() { + return this.selectable.find((o) => o.type === this.objType && o.id === this.objId); + }, selectLoading() { return this.$apollo.queries.groups.loading || this.$apollo.queries.courses.loading; } diff --git a/aleksis/apps/alsijil/frontend/messages/de.json b/aleksis/apps/alsijil/frontend/messages/de.json index fea84f3d4..2a689c6de 100644 --- a/aleksis/apps/alsijil/frontend/messages/de.json +++ b/aleksis/apps/alsijil/frontend/messages/de.json @@ -51,7 +51,8 @@ "filter": { "own": "Nur eigene Stunden anzeigen", "groups": "Klassen", - "courses": "Kurse" + "courses": "Kurse", + "filter_for_obj": "Nach Klasse und Kurs filtern" } } } diff --git a/aleksis/apps/alsijil/frontend/messages/en.json b/aleksis/apps/alsijil/frontend/messages/en.json index 8a98be2db..c9a267ef4 100644 --- a/aleksis/apps/alsijil/frontend/messages/en.json +++ b/aleksis/apps/alsijil/frontend/messages/en.json @@ -51,7 +51,8 @@ "filter": { "own": "Only show own lessons", "groups": "School classes", - "courses": "Courses" + "courses": "Courses", + "filter_for_obj": "Filter for school class and course" } } } -- GitLab