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

[Reformat] sort imports

parent 9ee4be88
No related branches found
No related tags found
No related merge requests found
Showing
with 70 additions and 67 deletions
...@@ -4,22 +4,22 @@ from django.contrib import admin ...@@ -4,22 +4,22 @@ from django.contrib import admin
from django.utils.html import format_html from django.utils.html import format_html
from .models import ( from .models import (
TimetableWidget,
Lesson,
LessonSubstitution,
SupervisionSubstitution,
LessonPeriod,
Absence, Absence,
AbsenceReason,
Break,
Event, Event,
ExtraLesson,
Holiday, Holiday,
Supervision, Lesson,
LessonPeriod,
LessonSubstitution,
Room,
Subject, Subject,
Supervision,
SupervisionArea, SupervisionArea,
Room, SupervisionSubstitution,
AbsenceReason,
Break,
TimePeriod, TimePeriod,
ExtraLesson, TimetableWidget,
) )
from .util.format import format_date_period, format_m2m from .util.format import format_date_period, format_m2m
......
from django import forms from django import forms
from django_select2.forms import ModelSelect2MultipleWidget
from django.utils.translation import gettext_lazy as _ from django.utils.translation import gettext_lazy as _
from django_select2.forms import ModelSelect2MultipleWidget
from material import Fieldset from material import Fieldset
from .models import LessonSubstitution
from aleksis.core.forms import AnnouncementForm from aleksis.core.forms import AnnouncementForm
from .models import LessonSubstitution
class LessonSubstitutionForm(forms.ModelForm): class LessonSubstitutionForm(forms.ModelForm):
"""Form to manage substitutions.""" """Form to manage substitutions."""
......
from datetime import date, timedelta, datetime from datetime import date, datetime, timedelta
from enum import Enum from enum import Enum
from typing import Union, Optional, OrderedDict from typing import Optional, OrderedDict, Union
from aleksis.apps.chronos.util.date import week_weekday_from_date
from calendarweek import CalendarWeek
from django.db import models from django.db import models
from django.db.models import F, Q, Count from django.db.models import Count, F, Q
from django.http import QueryDict from django.http import QueryDict
from aleksis.core.models import Person, Group from calendarweek import CalendarWeek
from aleksis.apps.chronos.util.date import week_weekday_from_date
from aleksis.core.models import Group, Person
from aleksis.core.util.core_helpers import get_site_preferences from aleksis.core.util.core_helpers import get_site_preferences
......
# Generated by Django 3.0.3 on 2020-03-08 20:16 # Generated by Django 3.0.3 on 2020-03-08 20:16
import colorfield.fields
import django.contrib.postgres.fields.jsonb import django.contrib.postgres.fields.jsonb
from django.db import migrations, models
import django.db.models.deletion import django.db.models.deletion
from django.db import migrations, models
import colorfield.fields
class Migration(migrations.Migration): class Migration(migrations.Migration):
......
# Generated by Django 3.0.4 on 2020-03-28 20:24 # Generated by Django 3.0.4 on 2020-03-28 20:24
from django.db import migrations, models
import django.db.models.deletion import django.db.models.deletion
from django.db import migrations, models
class Migration(migrations.Migration): class Migration(migrations.Migration):
......
# Generated by Django 3.0.5 on 2020-04-13 15:07 # Generated by Django 3.0.5 on 2020-04-13 15:07
from django.db import migrations, models
import django.db.models.deletion import django.db.models.deletion
from django.db import migrations, models
class Migration(migrations.Migration): class Migration(migrations.Migration):
......
# Generated by Django 3.0.5 on 2020-04-18 20:21 # Generated by Django 3.0.5 on 2020-04-18 20:21
import calendarweek.calendarweek
import django.contrib.postgres.fields.jsonb import django.contrib.postgres.fields.jsonb
from django.db import migrations, models
import django.db.models.deletion import django.db.models.deletion
from django.db import migrations, models
import calendarweek.calendarweek
class Migration(migrations.Migration): class Migration(migrations.Migration):
......
from typing import Optional, Union from typing import Optional, Union
from django.utils.translation import gettext_lazy as _ from django.utils.translation import gettext_lazy as _
from jsonstore import BooleanField from jsonstore import BooleanField
from aleksis.core.models import Person, Group, Announcement from aleksis.core.models import Announcement, Group, Person
from .managers import TimetableType from .managers import TimetableType
from .models import Lesson, LessonPeriod from .models import Lesson, LessonPeriod
......
from __future__ import annotations from __future__ import annotations
from datetime import date, datetime, timedelta, time from datetime import date, datetime, time, timedelta
from typing import Dict, Optional, Tuple, Union from typing import Dict, Optional, Tuple, Union
from aleksis.apps.chronos.managers import (
GroupPropertiesMixin,
TeacherPropertiesMixin,
LessonSubstitutionManager,
LessonSubstitutionQuerySet,
LessonPeriodManager,
LessonPeriodQuerySet,
AbsenceQuerySet,
HolidayQuerySet,
SupervisionQuerySet,
EventQuerySet,
ExtraLessonQuerySet,
)
from django.core.exceptions import ValidationError from django.core.exceptions import ValidationError
from django.db import models from django.db import models
from django.db.models import Max, Min, Q from django.db.models import Max, Min, Q
...@@ -27,16 +14,28 @@ from django.utils.decorators import classproperty ...@@ -27,16 +14,28 @@ from django.utils.decorators import classproperty
from django.utils.formats import date_format from django.utils.formats import date_format
from django.utils.translation import gettext_lazy as _ from django.utils.translation import gettext_lazy as _
from calendarweek.django import CalendarWeek, i18n_day_names_lazy, i18n_day_abbrs_lazy from calendarweek.django import CalendarWeek, i18n_day_abbrs_lazy, i18n_day_names_lazy
from colorfield.fields import ColorField from colorfield.fields import ColorField
from django_global_request.middleware import get_request from django_global_request.middleware import get_request
from aleksis.apps.chronos.managers import (
AbsenceQuerySet,
EventQuerySet,
ExtraLessonQuerySet,
GroupPropertiesMixin,
HolidayQuerySet,
LessonPeriodManager,
LessonPeriodQuerySet,
LessonSubstitutionManager,
LessonSubstitutionQuerySet,
SupervisionQuerySet,
TeacherPropertiesMixin,
)
from aleksis.apps.chronos.util.date import week_weekday_from_date
from aleksis.apps.chronos.util.format import format_m2m from aleksis.apps.chronos.util.format import format_m2m
from aleksis.core.mixins import ExtensibleModel from aleksis.core.mixins import ExtensibleModel
from aleksis.core.models import Group, Person, DashboardWidget from aleksis.core.models import DashboardWidget, Group, Person
from aleksis.core.util.core_helpers import get_site_preferences, has_person
from aleksis.apps.chronos.util.date import week_weekday_from_date
from aleksis.core.util.core_helpers import has_person, get_site_preferences
class TimePeriod(ExtensibleModel): class TimePeriod(ExtensibleModel):
......
...@@ -3,10 +3,7 @@ from django.utils.translation import gettext as _ ...@@ -3,10 +3,7 @@ from django.utils.translation import gettext as _
from dynamic_preferences.preferences import Section from dynamic_preferences.preferences import Section
from dynamic_preferences.types import BooleanPreference, IntegerPreference from dynamic_preferences.types import BooleanPreference, IntegerPreference
from aleksis.core.registries import ( from aleksis.core.registries import person_preferences_registry, site_preferences_registry
site_preferences_registry,
person_preferences_registry,
)
chronos = Section("chronos", verbose_name=_("Chronos")) chronos = Section("chronos", verbose_name=_("Chronos"))
......
from rules import add_perm, always_allow from rules import add_perm, always_allow
from aleksis.core.util.predicates import ( from aleksis.core.util.predicates import (
has_person,
has_global_perm,
has_any_object, has_any_object,
has_global_perm,
has_object_perm, has_object_perm,
has_person,
) )
from .models import LessonSubstitution from .models import LessonSubstitution
from .util.predicates import has_timetable_perm from .util.predicates import has_timetable_perm
......
...@@ -4,11 +4,7 @@ from typing import Optional, Union ...@@ -4,11 +4,7 @@ from typing import Optional, Union
from django import template from django import template
from django.db.models.query import QuerySet from django.db.models.query import QuerySet
from aleksis.apps.chronos.util.date import ( from aleksis.apps.chronos.util.date import CalendarWeek, week_period_to_date, week_weekday_to_date
CalendarWeek,
week_period_to_date,
week_weekday_to_date,
)
register = template.Library() register = template.Library()
......
from collections import OrderedDict from collections import OrderedDict
from datetime import date from datetime import date
from typing import Union, List, Tuple from typing import List, Tuple, Union
from calendarweek import CalendarWeek
from django.apps import apps from django.apps import apps
from django.db.models import QuerySet from django.db.models import QuerySet
from calendarweek import CalendarWeek
from aleksis.apps.chronos.managers import TimetableType from aleksis.apps.chronos.managers import TimetableType
from aleksis.core.models import Person from aleksis.core.models import Person
......
from datetime import date from datetime import date
from typing import Tuple, List, Union from typing import List, Tuple, Union
from calendarweek import CalendarWeek
from calendarweek.django import i18n_day_names
from django.utils import timezone from django.utils import timezone
from django.utils.translation import gettext_lazy as _ from django.utils.translation import gettext_lazy as _
from calendarweek import CalendarWeek
from calendarweek.django import i18n_day_names
def week_weekday_from_date(when: date) -> Tuple[CalendarWeek, int]: def week_weekday_from_date(when: date) -> Tuple[CalendarWeek, int]:
"""Return a tuple of week and weekday from a given date.""" """Return a tuple of week and weekday from a given date."""
......
from datetime import datetime, time, date from datetime import date, datetime, time
def date_unix(value: date) -> int: def date_unix(value: date) -> int:
......
...@@ -3,8 +3,8 @@ from django.db.models import Model ...@@ -3,8 +3,8 @@ from django.db.models import Model
from rules import predicate from rules import predicate
from aleksis.core.models import Group, Person
from aleksis.apps.chronos.models import Room from aleksis.apps.chronos.models import Room
from aleksis.core.models import Group, Person
@predicate @predicate
......
...@@ -9,19 +9,21 @@ from django.shortcuts import get_object_or_404, redirect, render ...@@ -9,19 +9,21 @@ from django.shortcuts import get_object_or_404, redirect, render
from django.urls import reverse from django.urls import reverse
from django.utils import timezone from django.utils import timezone
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext as _
from django_tables2 import RequestConfig from django_tables2 import RequestConfig
from rules.contrib.views import permission_required from rules.contrib.views import permission_required
from aleksis.core.models import Person, Group, Announcement from aleksis.core.models import Announcement, Group, Person
from aleksis.core.util import messages from aleksis.core.util import messages
from aleksis.core.util.core_helpers import get_site_preferences, has_person
from .forms import LessonSubstitutionForm from .forms import LessonSubstitutionForm
from .managers import TimetableType from .managers import TimetableType
from .models import LessonPeriod, LessonSubstitution, TimePeriod, Room, Holiday, Absence from .models import Absence, Holiday, LessonPeriod, LessonSubstitution, Room, TimePeriod
from .tables import LessonsTable from .tables import LessonsTable
from .util.build import build_timetable, build_substitutions_list, build_weekdays from .util.build import build_substitutions_list, build_timetable, build_weekdays
from .util.js import date_unix
from .util.date import CalendarWeek, get_weeks_for_year from .util.date import CalendarWeek, get_weeks_for_year
from aleksis.core.util.core_helpers import has_person, get_site_preferences from .util.js import date_unix
@permission_required("chronos.view_timetable_overview") @permission_required("chronos.view_timetable_overview")
......
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