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

Reformat

parent 7652c383
No related branches found
No related tags found
1 merge request!49Resolve "Add rules and permissions"
Pipeline #3246 passed
...@@ -126,6 +126,7 @@ Person.add_permission( ...@@ -126,6 +126,7 @@ Person.add_permission(
"register_absence_person", _("Can register an absence for a person") "register_absence_person", _("Can register an absence for a person")
) )
@LessonPeriod.method @LessonPeriod.method
def get_lesson_documentation( def get_lesson_documentation(
self, week: Optional[CalendarWeek] = None self, week: Optional[CalendarWeek] = None
......
from typing import Optional from typing import Optional
from calendarweek import CalendarWeek
from django.http import HttpRequest from django.http import HttpRequest
from calendarweek import CalendarWeek
from aleksis.apps.chronos.models import LessonPeriod from aleksis.apps.chronos.models import LessonPeriod
from aleksis.apps.chronos.util.chronos_helpers import get_el_by_pk from aleksis.apps.chronos.util.chronos_helpers import get_el_by_pk
...@@ -16,7 +17,9 @@ def get_lesson_period_by_pk( ...@@ -16,7 +17,9 @@ def get_lesson_period_by_pk(
"""Get LessonPeriod object either by given object_id or by time and current person.""" """Get LessonPeriod object either by given object_id or by time and current person."""
wanted_week = CalendarWeek(year=year, week=week) wanted_week = CalendarWeek(year=year, week=week)
if period_id: if period_id:
lesson_period = LessonPeriod.objects.annotate_week(wanted_week).get(pk=period_id) lesson_period = LessonPeriod.objects.annotate_week(wanted_week).get(
pk=period_id
)
elif hasattr(request, "user") and hasattr(request.user, "person"): elif hasattr(request, "user") and hasattr(request.user, "person"):
if request.user.person.lessons_as_teacher.exists(): if request.user.person.lessons_as_teacher.exists():
lesson_period = ( lesson_period = (
......
...@@ -17,7 +17,10 @@ def is_lesson_teacher(user: User, obj: LessonPeriod) -> bool: ...@@ -17,7 +17,10 @@ def is_lesson_teacher(user: User, obj: LessonPeriod) -> bool:
in the lesson or the substitution linked to the given LessonPeriod. in the lesson or the substitution linked to the given LessonPeriod.
""" """
if hasattr(obj, "lesson"): if hasattr(obj, "lesson"):
return user.person in obj.lesson.teachers.all() or user.person in obj.substitutions.teachers.all() return (
user.person in obj.lesson.teachers.all()
or user.person in obj.substitutions.teachers.all()
)
return True return True
......
...@@ -10,9 +10,8 @@ from django.utils.translation import ugettext as _ ...@@ -10,9 +10,8 @@ from django.utils.translation import ugettext as _
from calendarweek import CalendarWeek from calendarweek import CalendarWeek
from django_tables2 import RequestConfig, SingleTableView from django_tables2 import RequestConfig, SingleTableView
from rules.contrib.views import permission_required
from reversion.views import RevisionMixin from reversion.views import RevisionMixin
from rules.contrib.views import PermissionRequiredMixin from rules.contrib.views import PermissionRequiredMixin, permission_required
from aleksis.apps.chronos.managers import TimetableType from aleksis.apps.chronos.managers import TimetableType
from aleksis.apps.chronos.models import LessonPeriod, LessonSubstitution from aleksis.apps.chronos.models import LessonPeriod, LessonSubstitution
...@@ -21,8 +20,7 @@ from aleksis.apps.chronos.util.date import week_weekday_to_date ...@@ -21,8 +20,7 @@ from aleksis.apps.chronos.util.date import week_weekday_to_date
from aleksis.core.mixins import AdvancedCreateView, AdvancedDeleteView, AdvancedEditView from aleksis.core.mixins import AdvancedCreateView, AdvancedDeleteView, AdvancedEditView
from aleksis.core.models import Group, Person, SchoolTerm from aleksis.core.models import Group, Person, SchoolTerm
from aleksis.core.util import messages from aleksis.core.util import messages
from aleksis.core.util.core_helpers import get_site_preferences from aleksis.core.util.core_helpers import get_site_preferences, objectgetter_optional
from aleksis.core.util.core_helpers import objectgetter_optional
from .forms import ( from .forms import (
ExcuseTypeForm, ExcuseTypeForm,
...@@ -34,8 +32,6 @@ from .forms import ( ...@@ -34,8 +32,6 @@ from .forms import (
) )
from .models import ExcuseType, ExtraMark, LessonDocumentation from .models import ExcuseType, ExtraMark, LessonDocumentation
from .tables import ExcuseTypeTable, ExtraMarkTable from .tables import ExcuseTypeTable, ExtraMarkTable
from .models import ExcuseType, LessonDocumentation
from .tables import ExcuseTypeTable
from .util.alsijil_helpers import get_instance_by_pk, get_lesson_period_by_pk from .util.alsijil_helpers import get_instance_by_pk, get_lesson_period_by_pk
......
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