Skip to content
Snippets Groups Projects
Commit febc825e authored by Tom Teichler's avatar Tom Teichler :beers:
Browse files

Reformat and sort imports

parent 9943056c
No related branches found
No related tags found
1 merge request!284Resolve "[3.0] Drop Room from model"
...@@ -5,6 +5,8 @@ from django.utils.html import format_html ...@@ -5,6 +5,8 @@ from django.utils.html import format_html
from guardian.admin import GuardedModelAdmin from guardian.admin import GuardedModelAdmin
from aleksis.core.models import Room
from .models import ( from .models import (
Absence, Absence,
AbsenceReason, AbsenceReason,
...@@ -26,7 +28,6 @@ from .models import ( ...@@ -26,7 +28,6 @@ from .models import (
) )
from .util.format import format_date_period, format_m2m from .util.format import format_date_period, format_m2m
from aleksis.core.models import Room
def colour_badge(fg: str, bg: str, val: str): def colour_badge(fg: str, bg: str, val: str):
html = """ html = """
......
...@@ -8,7 +8,7 @@ from django_filters import BooleanFilter, FilterSet, ModelMultipleChoiceFilter ...@@ -8,7 +8,7 @@ from django_filters import BooleanFilter, FilterSet, ModelMultipleChoiceFilter
from django_select2.forms import ModelSelect2MultipleWidget from django_select2.forms import ModelSelect2MultipleWidget
from material import Layout, Row from material import Layout, Row
from aleksis.core.models import Group, Person, SchoolTerm, Room from aleksis.core.models import Group, Person, Room, SchoolTerm
from .models import Break, Subject, SupervisionArea, TimePeriod from .models import Break, Subject, SupervisionArea, TimePeriod
......
...@@ -67,7 +67,7 @@ from aleksis.core.mixins import ( ...@@ -67,7 +67,7 @@ from aleksis.core.mixins import (
GlobalPermissionModel, GlobalPermissionModel,
SchoolTermRelatedExtensibleModel, SchoolTermRelatedExtensibleModel,
) )
from aleksis.core.models import DashboardWidget, Group, SchoolTerm, Room from aleksis.core.models import DashboardWidget, Group, Room, SchoolTerm
from aleksis.core.util.core_helpers import has_person from aleksis.core.util.core_helpers import has_person
from aleksis.core.util.pdf import generate_pdf_from_template from aleksis.core.util.pdf import generate_pdf_from_template
...@@ -441,7 +441,9 @@ class LessonSubstitution(ExtensibleModel, TeacherPropertiesMixin, WeekRelatedMix ...@@ -441,7 +441,9 @@ class LessonSubstitution(ExtensibleModel, TeacherPropertiesMixin, WeekRelatedMix
blank=True, blank=True,
verbose_name=_("Teachers"), verbose_name=_("Teachers"),
) )
room = models.ForeignKey("core.Room", models.CASCADE, null=True, blank=True, verbose_name=_("Room")) room = models.ForeignKey(
"core.Room", models.CASCADE, null=True, blank=True, verbose_name=_("Room")
)
cancelled = models.BooleanField(default=False, verbose_name=_("Cancelled?")) cancelled = models.BooleanField(default=False, verbose_name=_("Cancelled?"))
cancelled_for_teachers = models.BooleanField( cancelled_for_teachers = models.BooleanField(
......
from aleksis.core.util.search import Indexable, SearchIndex
from aleksis.core.models import Room from aleksis.core.models import Room
from aleksis.core.util.search import Indexable, SearchIndex
class RoomIndex(SearchIndex, Indexable): class RoomIndex(SearchIndex, Indexable):
......
...@@ -6,18 +6,12 @@ from django.utils import timezone ...@@ -6,18 +6,12 @@ from django.utils import timezone
import pytest import pytest
from aleksis.apps.chronos.util.chronos_helpers import get_rooms, get_teachers from aleksis.apps.chronos.util.chronos_helpers import get_rooms, get_teachers
from aleksis.core.models import Group, Person, SchoolTerm, Room from aleksis.core.models import Group, Person, Room, SchoolTerm
pytestmark = pytest.mark.django_db pytestmark = pytest.mark.django_db
from aleksis.apps.chronos.models import ( from aleksis.apps.chronos.models import Lesson, LessonPeriod, Subject, TimePeriod, ValidityRange
Lesson,
LessonPeriod,
Subject,
TimePeriod,
ValidityRange,
)
def test_rooms_teachers_only_from_current_school_term(): def test_rooms_teachers_only_from_current_school_term():
......
...@@ -17,7 +17,7 @@ from aleksis.apps.chronos.models import ( ...@@ -17,7 +17,7 @@ from aleksis.apps.chronos.models import (
TimePeriod, TimePeriod,
) )
from aleksis.apps.chronos.util.change_tracker import TimetableDataChangeTracker from aleksis.apps.chronos.util.change_tracker import TimetableDataChangeTracker
from aleksis.core.models import Group, Person, SchoolTerm, Room from aleksis.core.models import Group, Person, Room, SchoolTerm
pytestmark = pytest.mark.django_db pytestmark = pytest.mark.django_db
......
...@@ -9,7 +9,7 @@ from django.utils import timezone ...@@ -9,7 +9,7 @@ from django.utils import timezone
from guardian.core import ObjectPermissionChecker from guardian.core import ObjectPermissionChecker
from aleksis.core.models import Announcement, Group, Person, SchoolTerm, Room from aleksis.core.models import Announcement, Group, Person, Room, SchoolTerm
from aleksis.core.util.core_helpers import get_site_preferences from aleksis.core.util.core_helpers import get_site_preferences
from aleksis.core.util.predicates import check_global_permission from aleksis.core.util.predicates import check_global_permission
......
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