Skip to content
Snippets Groups Projects
Commit b2b39def authored by Nik | Klampfradler's avatar Nik | Klampfradler
Browse files

Merge branch...

Merge branch '59-importerror-cannot-import-name-calendarweek-from-aleksis-apps-chronos-util-unknown-location' into 'master'

Resolve "ImportError: cannot import name 'CalendarWeek' from 'aleksis.apps.chronos.util' (unknown location)"

Closes #59

See merge request AlekSIS/AlekSIS-App-Alsijil!38
parents dfba5000 b32599e8
No related branches found
No related tags found
1 merge request!38Resolve "ImportError: cannot import name 'CalendarWeek' from 'aleksis.apps.chronos.util' (unknown location)"
from datetime import date from datetime import date
from calendarweek import CalendarWeek
from django.db.models import Exists, F, OuterRef from django.db.models import Exists, F, OuterRef
from aleksis.apps.chronos.models import LessonPeriod from aleksis.apps.chronos.models import LessonPeriod
from aleksis.apps.chronos.util import CalendarWeek
from aleksis.core.models import Group, Person from aleksis.core.models import Group, Person
from .models import PersonalNote from .models import PersonalNote
......
from calendarweek import CalendarWeek
from datetime import date, datetime, timedelta from datetime import date, datetime, timedelta
from typing import Optional from typing import Optional
...@@ -12,7 +13,6 @@ from django.utils.translation import ugettext as _ ...@@ -12,7 +13,6 @@ from django.utils.translation import ugettext as _
from django_tables2 import RequestConfig from django_tables2 import RequestConfig
from aleksis.apps.chronos.models import LessonPeriod from aleksis.apps.chronos.models import LessonPeriod
from aleksis.apps.chronos.util import CalendarWeek
from aleksis.core.decorators import admin_required from aleksis.core.decorators import admin_required
from aleksis.core.models import Group, Person, School from aleksis.core.models import Group, Person, School
from aleksis.core.util import messages from aleksis.core.util import messages
......
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