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

Fix view.

parent ab7345ad
No related branches found
No related tags found
1 merge request!16Turn group week view into general week view.
...@@ -125,11 +125,6 @@ def week_view(request: HttpRequest, year: Optional[int] = None, week: Optional[i ...@@ -125,11 +125,6 @@ def week_view(request: HttpRequest, year: Optional[int] = None, week: Optional[i
group = Group.objects.get(pk=request.GET['group']) group = Group.objects.get(pk=request.GET['group'])
lesson_periods = lesson_periods.filter( lesson_periods = lesson_periods.filter(
Q(lesson__groups__pk=int(request.GET['group'])) | Q(lesson__groups__parent_groups__pk=int(request.GET['group']))) Q(lesson__groups__pk=int(request.GET['group'])) | Q(lesson__groups__parent_groups__pk=int(request.GET['group'])))
elif hasattr(request, 'user') and hasattr(request.user, 'person'):
# Try to select group from owned groups of user
group = request.user.person.owner_of.first()
lesson_periods = lesson_periods.filter(
Q(lesson__groups__pk=int(request.GET['group'])) | Q(lesson__groups__parent_groups__pk=int(request.GET['group'])))
if 'teacher' in request.GET and request.GET['teacher']: if 'teacher' in request.GET and request.GET['teacher']:
teacher = Person.objects.get(pk=request.GET['teacher']) teacher = Person.objects.get(pk=request.GET['teacher'])
lesson_periods = lesson_periods.filter( lesson_periods = lesson_periods.filter(
...@@ -138,6 +133,11 @@ def week_view(request: HttpRequest, year: Optional[int] = None, week: Optional[i ...@@ -138,6 +133,11 @@ def week_view(request: HttpRequest, year: Optional[int] = None, week: Optional[i
room = Room.objects.get(pk=request.GET['room']) room = Room.objects.get(pk=request.GET['room'])
lesson_periods = lesson_periods.filter( lesson_periods = lesson_periods.filter(
room__pk=int(request.GET['room'])) room__pk=int(request.GET['room']))
elif:
if hasattr(request, 'user') and hasattr(request.user, 'person'):
group = request.user.person.owner_of.first()
lesson_periods = lesson_periods.filter(
Q(lesson__groups__pk=int(request.GET['group'])) | Q(lesson__groups__parent_groups__pk=int(request.GET['group'])))
# Aggregate all personal notes for this group and week # Aggregate all personal notes for this group and week
persons = Person.objects.filter( persons = Person.objects.filter(
......
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