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

Fix view logic.

parent e0865aec
No related branches found
No related tags found
1 merge request!16Turn group week view into general week view.
...@@ -136,8 +136,11 @@ def week_view(request: HttpRequest, year: Optional[int] = None, week: Optional[i ...@@ -136,8 +136,11 @@ def week_view(request: HttpRequest, year: Optional[int] = None, week: Optional[i
elif hasattr(request, 'user') and hasattr(request.user, 'person'): elif hasattr(request, 'user') and hasattr(request.user, 'person'):
group = request.user.person.owner_of.first() group = request.user.person.owner_of.first()
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=group) | Q(lesson__groups__parent_groups=group))
else:
lesson_periods = None
if lesson_periods:
# 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(
is_active=True is_active=True
...@@ -163,14 +166,11 @@ def week_view(request: HttpRequest, year: Optional[int] = None, week: Optional[i ...@@ -163,14 +166,11 @@ def week_view(request: HttpRequest, year: Optional[int] = None, week: Optional[i
)) ))
) )
else: else:
lesson_periods = None
persons = None persons = None
# Add a form to filter the view # Add a form to filter the view
select_form = SelectForm(request.GET or None) select_form = SelectForm(request.GET or None)
context['current_head'] = str(wanted_week) context['current_head'] = str(wanted_week)
context['week'] = wanted_week context['week'] = wanted_week
context['group'] = group context['group'] = group
...@@ -185,7 +185,6 @@ def week_view(request: HttpRequest, year: Optional[int] = None, week: Optional[i ...@@ -185,7 +185,6 @@ def week_view(request: HttpRequest, year: Optional[int] = None, week: Optional[i
context['url_prev'] = '%s?%s' % (reverse('week_view_by_week', args=[week_prev.year, week_prev.week]), request.GET.urlencode()) context['url_prev'] = '%s?%s' % (reverse('week_view_by_week', args=[week_prev.year, week_prev.week]), request.GET.urlencode())
context['url_next'] = '%s?%s' % (reverse('week_view_by_week', args=[week_next.year, week_next.week]), request.GET.urlencode()) context['url_next'] = '%s?%s' % (reverse('week_view_by_week', args=[week_next.year, week_next.week]), request.GET.urlencode())
return render(request, 'alsijil/week_view.html', context) return render(request, 'alsijil/week_view.html', context)
......
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