From ab16fbf19b5f8d34d47aaaad478a6e809aef18c0 Mon Sep 17 00:00:00 2001
From: Michael Bauer <michael-bauer@posteo.de>
Date: Thu, 17 Oct 2024 10:20:58 +0200
Subject: [PATCH] Use generic chips for groups and persons
---
.../frontend/components/Substitutions.vue | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/aleksis/apps/chronos/frontend/components/Substitutions.vue b/aleksis/apps/chronos/frontend/components/Substitutions.vue
index 6e4b8a0b..a516072e 100644
--- a/aleksis/apps/chronos/frontend/components/Substitutions.vue
+++ b/aleksis/apps/chronos/frontend/components/Substitutions.vue
@@ -1,6 +1,8 @@
<script setup>
import CRUDList from "aleksis.core/components/generic/CRUDList.vue";
import PrimaryActionButton from "aleksis.core/components/generic/buttons/PrimaryActionButton.vue";
+import PersonChip from "aleksis.core/components/person/PersonChip.vue";
+import GroupChip from "aleksis.core/components/group/GroupChip.vue";
import DateSelectFooter from "aleksis.core/components/generic/DateSelectFooter.vue";
</script>
@@ -32,9 +34,10 @@ import DateSelectFooter from "aleksis.core/components/generic/DateSelectFooter.v
</v-row>
<v-card-text v-if="affectedTeachers.length>0">
<span> {{ $t("chronos.substitutions.affected_teachers") }} </span>
- <v-chip
+ <person-chip
v-for="(teacher, i) in affectedTeachers"
class="ma-1"
+ :person="teacher"
:to="{
name: 'chronos.timetableWithId',
params: {
@@ -42,21 +45,19 @@ import DateSelectFooter from "aleksis.core/components/generic/DateSelectFooter.v
id: teacher.id,
},
}"
- >
- {{ teacher.shortName || teacher.fullName }}
- </v-chip>
+ />
</v-card-text>
<v-card-text v-if="affectedGroups.length>0">
<span> {{ $t("chronos.substitutions.affected_groups") }} </span>
<!-- TODO: Link to group-timetable as well -->
<!-- as soon as it becomes possible to resolve a -->
<!-- group-timetable from the lesson-event group too. -->
- <v-chip
+ <group-chip
v-for="group in affectedGroups"
class="ma-1"
- >
- {{ group.shortName }}
- </v-chip>
+ :group="group"
+ format="short"
+ />
</v-card-text>
</template>
<!-- TODO: Extract strike -> bold || normal pattern into own -->
--
GitLab