Skip to content
Snippets Groups Projects

Turn group week view into general week view.

Merged Tom Teichler requested to merge 34-turn-group-week-view-into-general-week-view into master
1 file
+ 5
5
Compare changes
  • Side-by-side
  • Inline
@@ -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(
Loading