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

Improve layout of absence creation summary

parent 9a463c8b
No related branches found
No related tags found
1 merge request!356Add dialog for creation of long-term absences
...@@ -23,32 +23,39 @@ ...@@ -23,32 +23,39 @@
</div> </div>
<v-spacer /> <v-spacer />
<div> <div>
{{ person.lessons.length }} {{
{{ $t("alsijil.coursebook.absences.lessons") }} $tc(
"alsijil.coursebook.absences.lessons",
person.lessons.length,
{ count: person.lessons.length },
)
}}
</div> </div>
</v-expansion-panel-header> </v-expansion-panel-header>
<v-expansion-panel-content> <v-expansion-panel-content>
<v-divider /> <v-list-item
<v-list-item v-for="lesson in person.lessons" class="px-0"> v-for="lesson in person.lessons"
class="px-0"
:key="lesson.id"
>
<!-- TODO: We should extract this display & share it --> <!-- TODO: We should extract this display & share it -->
<time <time :datetime="lesson.datetimeStart" class="text-no-wrap">
:datetime="lesson.datetimeStart" {{
class="pr-2 text-no-wrap" $d($parseISODate(lesson.datetimeStart), "shortWithWeekday")
> }}&nbsp;
{{ $d(toDateTime(lesson.datetimeStart), "shortWithWeekday") }}
</time> </time>
<span>(</span> <span>(</span>
<time :datetime="lesson.datetimeStart" class="text-no-wrap"> <time :datetime="lesson.datetimeStart" class="text-no-wrap">
{{ $d(toDateTime(lesson.datetimeStart), "shortTime") }} {{ $d($parseISODate(lesson.datetimeStart), "shortTime") }}
</time> </time>
<span>-</span> <span>-</span>
<time :datetime="lesson.datetimeEnd" class="text-no-wrap"> <time :datetime="lesson.datetimeEnd" class="text-no-wrap">
{{ $d(toDateTime(lesson.datetimeEnd), "shortTime") }} {{ $d($parseISODate(lesson.datetimeEnd), "shortTime") }}
</time> </time>
<span>)</span> <span>)</span>
<v-spacer /> <v-spacer />
<div class="pr-2"> <div class="pr-2">
{{ lesson.course.name }} {{ lesson.course?.name }}
</div> </div>
<subject-chip :subject="lesson.subject" /> <subject-chip :subject="lesson.subject" />
</v-list-item> </v-list-item>
...@@ -57,9 +64,9 @@ ...@@ -57,9 +64,9 @@
</v-expansion-panels> </v-expansion-panels>
</template> </template>
</c-r-u-d-iterator> </c-r-u-d-iterator>
<div class="pt-5 text-subtitle-2"> <message-box dense type="warning" class="mt-5">
{{ $t("alsijil.coursebook.absences.warning") }} {{ $t("alsijil.coursebook.absences.warning") }}
</div> </message-box>
</div> </div>
</template> </template>
...@@ -67,7 +74,6 @@ ...@@ -67,7 +74,6 @@
import CRUDIterator from "aleksis.core/components/generic/CRUDIterator.vue"; import CRUDIterator from "aleksis.core/components/generic/CRUDIterator.vue";
import SubjectChip from "aleksis.apps.cursus/components/SubjectChip.vue"; import SubjectChip from "aleksis.apps.cursus/components/SubjectChip.vue";
import { lessonsForPersons } from "./absenceCreation.graphql"; import { lessonsForPersons } from "./absenceCreation.graphql";
import { DateTime } from "luxon";
import loadingMixin from "aleksis.core/mixins/loadingMixin.js"; import loadingMixin from "aleksis.core/mixins/loadingMixin.js";
export default { export default {
...@@ -105,10 +111,5 @@ export default { ...@@ -105,10 +111,5 @@ export default {
}; };
}, },
}, },
methods: {
toDateTime(dateString) {
return DateTime.fromISO(dateString);
},
},
}; };
</script> </script>
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
"absences": { "absences": {
"title": "Abwesenheiten erfassen", "title": "Abwesenheiten erfassen",
"summary": "Zusammenfassung", "summary": "Zusammenfassung",
"lessons": "Stunden", "lessons": "Keine Stunden | 1 Stunde | {count} Stunden",
"success": "Die Abwesenheiten wurden erfolgreich erstellt.", "success": "Die Abwesenheiten wurden erfolgreich erstellt.",
"warning": "Die Abwesenheiten können mit diesem Menü nicht mehr geändert werden, wenn sie einmal bestätigt wurden." "warning": "Die Abwesenheiten können mit diesem Menü nicht mehr geändert werden, wenn sie einmal bestätigt wurden."
} }
......
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
"absences": { "absences": {
"title": "Capture absences", "title": "Capture absences",
"summary": "Summary", "summary": "Summary",
"lessons": "lessons", "lessons": "No lessons | 1 lesson | {count} lessons",
"success": "The absences were created successfully.", "success": "The absences were created successfully.",
"warning": "Changes are permanent and can not be altered again from this menu once confirmed." "warning": "Changes are permanent and can not be altered again from this menu once confirmed."
} }
......
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