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

Reformat

parent 659a8dbb
No related branches found
No related tags found
1 merge request!329Introduce substitution to do list
Pipeline #186363 failed
......@@ -49,9 +49,7 @@ import createOrPatchMixin from "aleksis.core/mixins/createOrPatchMixin.js";
>
<template #prepend-inner>
<v-chip
v-if="roomsWithStatus.filter(
(t) => t.status === 'regular',
).length"
v-if="roomsWithStatus.filter((t) => t.status === 'regular').length"
v-for="room in roomsWithStatus.filter(
(t) => t.status === 'regular',
)"
......@@ -61,9 +59,7 @@ import createOrPatchMixin from "aleksis.core/mixins/createOrPatchMixin.js";
{{ room.shortName }}
</v-chip>
<v-chip
v-if="roomsWithStatus.filter(
(t) => t.status === 'removed',
).length"
v-if="roomsWithStatus.filter((t) => t.status === 'removed').length"
v-for="room in roomsWithStatus.filter(
(t) => t.status === 'removed',
)"
......@@ -90,9 +86,7 @@ import createOrPatchMixin from "aleksis.core/mixins/createOrPatchMixin.js";
color="success"
@click:close="removeRoom(data.item)"
>
<v-icon left>
mdi-plus-circle-outline
</v-icon>
<v-icon left> mdi-plus-circle-outline </v-icon>
{{ data.item.shortName ? data.item.shortName : data.item.name }}
</v-chip>
</template>
......@@ -246,11 +240,11 @@ export default {
this.teachers = teachers;
this.save();
},
roomsInput(rooms){
roomsInput(rooms) {
this.rooms = rooms;
this.save();
},
cancelledInput(cancelled){
cancelledInput(cancelled) {
this.cancelled = cancelled;
this.save();
},
......@@ -307,9 +301,7 @@ export default {
return teachersWithStatus;
},
roomsWithStatus() {
const oldIds = this.substitution.amends.rooms.map(
(room) => room.id,
);
const oldIds = this.substitution.amends.rooms.map((room) => room.id);
const newIds = this.substitution.rooms.map((room) => room.id);
const allRooms = new Set(
this.substitution.amends.rooms.concat(this.substitution.rooms),
......
......@@ -9,7 +9,7 @@ import { DateTime } from "luxon";
<template>
<div class="full-width grid">
<div class="d-flex">
<substitution-status :substitution="substitution"/>
<substitution-status :substitution="substitution" />
<div class="text-right d-flex flex-column fit-content">
<time :datetime="substitution.datetimeStart" class="text-no-wrap">
{{ $d(toDateTime(substitution.datetimeStart), "shortTime") }}
......
......@@ -14,7 +14,6 @@
</template>
<script>
import { DateTime } from "luxon";
export default {
......
......@@ -878,21 +878,17 @@ class LessonEventQuerySet(PolymorphicQuerySet):
def for_participant(self, person: Union[int, Person]) -> "LessonEventQuerySet":
"""Get all lesson events the person participates in (including amends)."""
amended = self.filter(
Q(amended_by__isnull=False) | Q(groups__members=person)
).values_list("amended_by__pk", flat=True)
return self.filter(
Q(groups__members=person) | Q(pk__in=amended)
).distinct()
amended = self.filter(Q(amended_by__isnull=False) | Q(groups__members=person)).values_list(
"amended_by__pk", flat=True
)
return self.filter(Q(groups__members=person) | Q(pk__in=amended)).distinct()
def for_owner(self, person: Union[int, Person]) -> "LessonEventQuerySet":
"""Get all lesson events the person owns any group of (including amends)."""
amended = self.filter(
Q(amended_by__isnull=False) | Q(groups__owners=person)
).values_list("amended_by__pk", flat=True)
return self.filter(
Q(groups__owners=person) | Q(pk__in=amended)
).distinct()
amended = self.filter(Q(amended_by__isnull=False) | Q(groups__owners=person)).values_list(
"amended_by__pk", flat=True
)
return self.filter(Q(groups__owners=person) | Q(pk__in=amended)).distinct()
def for_group(self, group: Union[int, Group]) -> "LessonEventQuerySet":
"""Get all lesson events for a certain group (including amends/as parent group)."""
......
......@@ -83,10 +83,9 @@ def has_any_group_substitution_perm(user: User) -> bool:
Predicate which checks whether the user is allowed
to create/edit any substitutions of any group.
"""
return (
user.person.owner_of.exists()
or has_any_object("core.manage_group_substitutions", Group)(user)
)
return user.person.owner_of.exists() or has_any_object(
"core.manage_group_substitutions", Group
)(user)
@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