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

Reformat and fix lint

parent c58464f9
No related branches found
No related tags found
1 merge request!329Introduce substitution to do list
Pipeline #194386 failed
......@@ -328,7 +328,9 @@ export default {
...(this.comment !== null &&
this.comment !== "" && { comment: this.comment }),
...(this.cancelled !== null && { cancelled: this.cancelled }),
...((this.teachers.length || this.rooms.length) && { cancelled: false }),
...((this.teachers.length || this.rooms.length) && {
cancelled: false,
}),
},
]);
this.teachers = [];
......@@ -379,7 +381,9 @@ export default {
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.filter((r) => !oldIds.includes(r.id))),
this.substitution.amends.rooms.concat(
this.substitution.rooms.filter((r) => !oldIds.includes(r.id)),
),
);
let roomsWithStatus = Array.from(allRooms).map((room) => {
let status = "regular";
......
<script setup>
import PersonChip from "aleksis.core/components/person/PersonChip.vue";
import SubstitutionStatus from "./SubstitutionStatus.vue";
import { DateTime } from "luxon";
......
......@@ -2,7 +2,6 @@
import SubstitutionCard from "./SubstitutionCard.vue";
import SubstitutionLoader from "./SubstitutionLoader.vue";
import InfiniteScrollingDateSortedCRUDIterator from "aleksis.core/components/generic/InfiniteScrollingDateSortedCRUDIterator.vue";
import SubjectChip from "aleksis.apps.cursus/components/SubjectChip.vue";
import {
amendedLessonsFromAbsences,
......@@ -31,7 +30,7 @@ import { DateTime } from "luxon";
:enable-edit="true"
:elevated="false"
:force-model-item-update="true"
:dayIncrement="3"
:day-increment="3"
empty-icon="mdi-account-multiple-check-outline"
ref="iterator"
>
......
......@@ -14,8 +14,6 @@
</template>
<script>
import { DateTime } from "luxon";
export default {
name: "SubstitutionStatus",
data() {
......
from datetime import datetime
from enum import Enum
from typing import Optional, Union
......@@ -191,24 +190,6 @@ class LessonEventQuerySet(RecurrencePolymorphicQuerySet):
)
return Q(pk__in=amended)
def affected_by_absences(self, datetime_start: datetime, datetime_end: datetime):
return self.filter(
(
(
Q(teachers__kolego_absences__datetime_start__gte=datetime_start)
& Q(teachers__kolego_absences__datetime_start__lte=datetime_end)
)
| (
Q(teachers__kolego_absences__datetime_end__gte=datetime_start)
& Q(teachers__kolego_absences__datetime_end__lte=datetime_end)
)
)
& Q(teachers__kolego_absences__datetime_start__lte=F("datetime_end"))
& Q(teachers__kolego_absences__datetime_end__gte=F("datetime_start"))
& Q(amends__isnull=True)
& Q(amended_by__isnull=True)
)
def related_to_person(self, person: Union[int, Person]) -> "LessonEventQuerySet":
"""Get all lesson events a certain person is allowed to see.
......
......@@ -438,7 +438,6 @@ class LessonEvent(CalendarEvent):
amending = params.get("amending", False)
current_changes = params.get("current_changes", False)
own = params.get("own", False)
return_all = params.get("all", False)
if not_amended:
q = q & LessonEventQuerySet.not_amended_q()
......@@ -508,11 +507,11 @@ class LessonEvent(CalendarEvent):
elif request:
q = q & LessonEventQuerySet.for_person_q(request.user.person)
prefetch_fields = ["groups", "teachers", "rooms", "groups__members"]
if prefetch_absences:
prefetch_fields.append("teachers__kolego_absences")
objs = super().get_objects(
request,
params,
......
from rules import add_perm
from aleksis.core.util.predicates import (
has_any_object,
has_global_perm,
has_object_perm,
has_person,
......@@ -69,9 +68,7 @@ delete_substitution_predicate = has_person & (
add_perm("chronos.delete_substitution_rule", delete_substitution_predicate)
# View substitutions
view_substitutions_predicate = has_person & (
has_global_perm("chronos.manage_substitutions")
)
view_substitutions_predicate = has_person & (has_global_perm("chronos.manage_substitutions"))
add_perm("chronos.view_substitutions_rule", view_substitutions_predicate)
# View parent menu entry
......
......@@ -23,13 +23,6 @@ from aleksis.core.util.core_helpers import (
get_site_preferences,
has_person,
)
from aleksis.core.schema.group import GroupType
from aleksis.core.schema.person import PersonType
from aleksis.core.schema.room import RoomType
from aleksis.core.util.core_helpers import (
get_site_preferences,
has_person,
)
from ..models import LessonEvent
from ..util.build import build_substitutions_list
......
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