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
Compare and Show latest version
1 file
+ 12
8
Compare changes
  • Side-by-side
  • Inline
@@ -98,14 +98,18 @@ def group_week(request: HttpRequest, year: Optional[int] = None, week: Optional[
else:
wanted_week = CalendarWeek()
if request.GET.get('group', None):
# Use requested group
group = Group.objects.get(pk=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()
else:
group = None
if request.GET.get('group', None) or request.GET.get('teacher', None) or request.GET.get('room', None):
if 'group' in request.GET and request.GET['group']:
# Use requested group
group = Group.objects.get(pk=request.GET['group'])
if 'teacher' in request.GET and request.GET['teacher']:
teacher = Person.objects.get(pk=request.GET['teacher'])
if 'room' in request.GET and request.GET['room']:
room = Room.objects.get(pk=request.GET['room'])
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()
if group:
# Get all lesson periods for the selected group
Loading