Skip to content
Snippets Groups Projects
Commit 33eba090 authored by Jonathan Weth's avatar Jonathan Weth :keyboard:
Browse files

Merge branch...

Merge branch '301-wording-no-homework-isn-t-optimal-as-students-might-think-that-there-are-no-homework-although' into 'master'

Resolve "Wording "No homework" isn't optimal as students might think that there are no homework although they are entered later"

Closes #301

See merge request !402
parents 54329c85 db7587f1
No related branches found
No related tags found
1 merge request!402Resolve "Wording "No homework" isn't optimal as students might think that there are no homework although they are entered later"
Pipeline #192361 failed
<template>
<v-card outlined dense rounded="lg" v-bind="$attrs" v-on="$listeners">
<div class="font-weight-medium mr-2">
{{ $t("alsijil.coursebook.summary.topic.label") }}:
</div>
<div class="text-truncate">{{ documentation.topic || "" }}</div>
<template v-if="documentation.topic">
<div class="font-weight-medium mr-2">
{{ $t("alsijil.coursebook.summary.topic.label") }}:
</div>
<div class="text-truncate">{{ documentation.topic }}</div>
</template>
<div class="font-weight-medium mr-2">
{{ $t("alsijil.coursebook.summary.homework.label") }}:
</div>
<div class="text-truncate">{{ documentation.homework || "" }}</div>
<template v-if="documentation.homework">
<div class="font-weight-medium mr-2">
{{ $t("alsijil.coursebook.summary.homework.label") }}:
</div>
<div class="text-truncate">{{ documentation.homework }}</div>
</template>
<div class="font-weight-medium mr-2">
{{ $t("alsijil.coursebook.summary.group_note.label") }}:
</div>
<div class="text-truncate">{{ documentation.groupNote || "" }}</div>
<template v-if="documentation.groupNote">
<div class="font-weight-medium mr-2">
{{ $t("alsijil.coursebook.summary.group_note.label") }}:
</div>
<div class="text-truncate">{{ documentation.groupNote }}</div>
</template>
</v-card>
</template>
......
......@@ -10,13 +10,23 @@
<v-card-title class="text-subtitle-2 pb-1 font-weight-medium">
{{ $t("alsijil.coursebook.summary.homework.label") }}
</v-card-title>
<v-card-text>{{ documentation.homework || "" }}</v-card-text>
<v-card-text>
{{
documentation.homework ||
$t("alsijil.coursebook.summary.homework.empty_yet")
}}
</v-card-text>
</v-card>
<v-card outlined dense rounded="lg">
<v-card-title class="text-subtitle-2 pb-1 font-weight-medium">
{{ $t("alsijil.coursebook.summary.group_note.label") }}
</v-card-title>
<v-card-text>{{ documentation.groupNote || "" }}</v-card-text>
<v-card-text>
{{
documentation.groupNote ||
$t("alsijil.coursebook.summary.group_note.empty")
}}
</v-card-text>
</v-card>
</div>
</template>
......
......@@ -66,7 +66,8 @@
"homework": {
"label": "Homework",
"value": "HW: {homework}",
"empty": "No homework"
"empty": "No homework",
"empty_yet": "No homework defined yet."
},
"group_note": {
"label": "Group note",
......
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