Skip to content
Snippets Groups Projects
Verified Commit 94b39831 authored by Jonathan Weth's avatar Jonathan Weth :keyboard:
Browse files

Make substitutions table more compact

parent 6fba91e4
No related branches found
No related tags found
1 merge request!389Resolve "Make substitutions table more compact"
Pipeline #193823 passed
...@@ -17,17 +17,23 @@ import DateSelectFooter from "aleksis.core/components/generic/DateSelectFooter.v ...@@ -17,17 +17,23 @@ import DateSelectFooter from "aleksis.core/components/generic/DateSelectFooter.v
:show-select="false" :show-select="false"
:enable-create="false" :enable-create="false"
:enable-edit="false" :enable-edit="false"
:dense="true"
:items-per-page="-1"
:mobile-breakpoint="0"
> >
<template #title> <template #title>
<v-row class="d-flex align-center pt-2 pa-2"> <v-card-title class="full-width flex-nowrap pb-0">
<v-card-title class="text-h4"> {{
{{ $d(new Date(date), "dateWithWeekday") }} $d(
</v-card-title> new Date(date),
$vuetify.breakpoint.xs ? "shortWithWeekday" : "dateWithWeekday",
)
}}
<v-spacer /> <v-spacer />
<primary-action-button <primary-action-button
class="mr-4"
i18n-key="chronos.substitutions.print" i18n-key="chronos.substitutions.print"
icon-text="$print" icon-text="$print"
:icon="$vuetify.breakpoint.xs"
:to="{ :to="{
name: 'chronos.printSubstitutionsForDate', name: 'chronos.printSubstitutionsForDate',
params: { params: {
...@@ -35,39 +41,58 @@ import DateSelectFooter from "aleksis.core/components/generic/DateSelectFooter.v ...@@ -35,39 +41,58 @@ import DateSelectFooter from "aleksis.core/components/generic/DateSelectFooter.v
}, },
}" }"
/> />
</v-row> </v-card-title>
<v-card-text>
<div v-if="affectedTeachers.length > 0"> <v-card-text
<strong> v-if="affectedTeachers.length > 0 || affectedGroups.length > 0"
{{ $t("chronos.substitutions.affected_teachers") }}: class="pb-0"
</strong> >
<person-chip <v-expansion-panels accordion multiple flat>
v-for="teacher in affectedTeachers" <v-expansion-panel v-if="affectedTeachers.length > 0">
:key="teacher.id" <v-expansion-panel-header class="px-0">
class="ma-1" <strong>{{
:person="teacher" $t("chronos.substitutions.affected_teachers")
:to="{ }}</strong>
name: 'chronos.timetableWithId', </v-expansion-panel-header>
params: { <v-expansion-panel-content>
type: 'person', <person-chip
id: teacher.id, v-for="teacher in affectedTeachers"
}, :key="teacher.id"
}" class="ma-1"
/> :person="teacher"
</div> small
<div v-if="affectedGroups.length > 0"> :to="{
<strong> {{ $t("chronos.substitutions.affected_groups") }}: </strong> name: 'chronos.timetableWithId',
<!-- TODO: Link to group-timetable as well --> params: {
<!-- as soon as it becomes possible to resolve a --> type: 'person',
<!-- group-timetable from the lesson-event group too. --> id: teacher.id,
<group-chip },
v-for="group in affectedGroups" }"
class="ma-1" />
:key="group.id" </v-expansion-panel-content>
:group="group" </v-expansion-panel>
format="short"
/> <v-expansion-panel v-if="affectedGroups.length > 0">
</div> <v-expansion-panel-header class="px-0">
<strong>
{{ $t("chronos.substitutions.affected_groups") }}</strong
>
</v-expansion-panel-header>
<!-- 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-expansion-panel-content class="px-0">
<group-chip
v-for="group in affectedGroups"
class="ma-1"
:key="group.id"
:group="group"
format="short"
small
/>
</v-expansion-panel-content>
</v-expansion-panel>
</v-expansion-panels>
</v-card-text> </v-card-text>
</template> </template>
<!-- TODO: Extract strike -> bold || normal pattern into own --> <!-- TODO: Extract strike -> bold || normal pattern into own -->
...@@ -140,7 +165,7 @@ import DateSelectFooter from "aleksis.core/components/generic/DateSelectFooter.v ...@@ -140,7 +165,7 @@ import DateSelectFooter from "aleksis.core/components/generic/DateSelectFooter.v
}}</span> }}</span>
</template> </template>
<template #notes="{ item: { cancelled, notes } }"> <template #notes="{ item: { cancelled, notes } }">
<v-chip v-if="cancelled" color="green" text-color="white"> <v-chip v-if="cancelled" color="green" text-color="white" small>
{{ $t("chronos.substitutions.cancelled") }} {{ $t("chronos.substitutions.cancelled") }}
</v-chip> </v-chip>
{{ notes }} {{ notes }}
...@@ -233,4 +258,8 @@ export default { ...@@ -233,4 +258,8 @@ export default {
.strike-through { .strike-through {
text-decoration: line-through; text-decoration: line-through;
} }
.v-expansion-panel-content__wrap {
padding: 0;
padding-bottom: 4px;
}
</style> </style>
...@@ -26,13 +26,13 @@ ...@@ -26,13 +26,13 @@
"print": "Drucken", "print": "Drucken",
"groups": "Gruppen", "groups": "Gruppen",
"time": "Zeit", "time": "Zeit",
"teachers": "Lehrer", "teachers": "Lehrkräfte",
"subject": "Fach", "subject": "Fach",
"rooms": "Räume", "rooms": "Räume",
"notes": "Notizen", "notes": "Notizen",
"supervision": "Aufsicht", "supervision": "Aufsicht",
"cancelled": "Entfällt", "cancelled": "Entfällt",
"affected_teachers": "Betroffene Lehrer", "affected_teachers": "Betroffene Lehrkräfte",
"affected_groups": "Betroffene Gruppen", "affected_groups": "Betroffene Gruppen",
"all_day": "Ganztägig", "all_day": "Ganztägig",
"no_substitutions": "Keine Vertretungen" "no_substitutions": "Keine Vertretungen"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment