Skip to content
Snippets Groups Projects
Commit 03696fee authored by Hangzhi Yu's avatar Hangzhi Yu
Browse files

Reformat

parent e5a19a94
No related branches found
No related tags found
2 merge requests!352Draft: Resolve "Add dialog with each lesson's students",!350Resolve "Add simple course book list"
Pipeline #179685 failed
......@@ -26,7 +26,13 @@ import PersonChip from "aleksis.core/components/person/PersonChip.vue";
>
{{ documentation.course?.name }}
</span>
<div :class="{ 'd-flex align-center flex-wrap gap': true, 'justify-center': largeGrid, 'justify-start': !largeGrid }">
<div
:class="{
'd-flex align-center flex-wrap gap': true,
'justify-center': largeGrid,
'justify-start': !largeGrid,
}"
>
<subject-chip
v-if="documentation.subject"
:subject="documentation.subject"
......@@ -36,7 +42,8 @@ import PersonChip from "aleksis.core/components/person/PersonChip.vue";
<subject-chip
v-if="
documentation?.lessonEvent?.amends?.subject &&
documentation.lessonEvent.amends.subject.id !== documentation.subject.id
documentation.lessonEvent.amends.subject.id !==
documentation.subject.id
"
:subject="documentation.lessonEvent.amends.subject"
v-bind="compact ? dialogActivator.attrs : {}"
......@@ -45,7 +52,12 @@ import PersonChip from "aleksis.core/components/person/PersonChip.vue";
disabled
/>
</div>
<div :class="{ 'd-flex align-center flex-wrap gap': true, 'justify-end': !largeGrid }">
<div
:class="{
'd-flex align-center flex-wrap gap': true,
'justify-end': !largeGrid,
}"
>
<person-chip
v-for="teacher in documentation.teachers"
:key="documentation.id + '-teacher-' + teacher.id"
......@@ -56,6 +68,7 @@ import PersonChip from "aleksis.core/components/person/PersonChip.vue";
/>
<person-chip
v-for="teacher in amendedTeachers"
:key="documentation.id + '-amendedTeacher-' + teacher.id"
:person="teacher"
no-link
v-bind="compact ? dialogActivator.attrs : {}"
......
......@@ -54,16 +54,20 @@
:loading="loading"
>
<template #append>
<v-tooltip bottom>
<template v-slot:activator="{ on, attrs }">
<v-scroll-x-transition>
<v-icon v-if="appendIcon" :color="appendIconColor" v-on="on" v-bind="attrs">{{
appendIcon
}}</v-icon>
</v-scroll-x-transition>
</template>
<span>{{ appendIconTooltip }}</span>
</v-tooltip>
<v-tooltip bottom>
<template v-slot:activator="{ on, attrs }">
<v-scroll-x-transition>
<v-icon
v-if="appendIcon"
:color="appendIconColor"
v-on="on"
v-bind="attrs"
>{{ appendIcon }}</v-icon
>
</v-scroll-x-transition>
</template>
<span>{{ appendIconTooltip }}</span>
</v-tooltip>
</template>
</v-text-field>
<div
......@@ -255,7 +259,12 @@ export default {
},
appendIconTooltip() {
return (
{ $success: this.$t("alsijil.coursebook.summary.topic.status.success"), $error: this.$t("alsijil.coursebook.summary.topic.status.error", { error: this.topicError }) }[this.appendIcon] || ""
{
$success: this.$t("alsijil.coursebook.summary.topic.status.success"),
$error: this.$t("alsijil.coursebook.summary.topic.status.error", {
error: this.topicError,
}),
}[this.appendIcon] || ""
);
},
},
......
......@@ -12,8 +12,8 @@ from aleksis.core.util.predicates import (
from .util.predicates import (
can_edit_documentation,
can_view_documentation,
can_view_any_documentation,
can_view_documentation,
has_lesson_group_object_perm,
has_person_group_object_perm,
has_personal_note_group_perm,
......
from typing import Any, Union
from django.contrib.auth.models import User
from django.db.models import Prefetch, Q
from django.db.models import Q
from django.utils.timezone import localdate, localtime
from rules import predicate
......
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