From 89bbd515ab41d16a2673280e4186411905c63722 Mon Sep 17 00:00:00 2001 From: Tom Teichler <tom.teichler@teckids.org> Date: Wed, 4 Sep 2019 21:47:36 +0200 Subject: [PATCH] Add prev and next button for week view. Closes #19. --- .../apps/alsijil/templates/alsijil/group_week.html | 14 ++++++++++---- biscuit/apps/alsijil/views.py | 2 ++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/biscuit/apps/alsijil/templates/alsijil/group_week.html b/biscuit/apps/alsijil/templates/alsijil/group_week.html index 420613d63..45b61c785 100644 --- a/biscuit/apps/alsijil/templates/alsijil/group_week.html +++ b/biscuit/apps/alsijil/templates/alsijil/group_week.html @@ -6,7 +6,7 @@ {% block bootstrap4_title %}{% blocktrans%}Current week{% endblocktrans %} — {{ block.super }}{% endblock %} {% block page_title %} - {% blocktrans %}Current week{% endblocktrans %} + {% blocktrans %}Week{% endblocktrans %} {{ week }} ({{ week|week_start }} - {{ week|week_end }}), {{ group.name }} {% endblock %} {% block content %} @@ -22,9 +22,15 @@ <div class="col-md-7"> <div class="card"> <div class="card-header bg-light text-dark"> - {% blocktrans %}Week{% endblocktrans %} - {{ week }} ({{ week|week_start }} - {{ week|week_end }}), - {{ group.name }} + {% blocktrans %}Lessons{% endblocktrans %} + <div class="btn-group" role="group" aria-label="Week actions"> + <a href="{% url 'group_week_by_week' week_prev %}" class="btn btn-secondary"> + {% fa 'arrow-left' %} + </a> + <a href="{% url 'group_week_by_week' week_next %}" class="btn btn-secondary"> + {% fa 'arrow-right' %} + </a> + </div> </div> <div class="card-body"> {% regroup lesson_periods by period.get_weekday_display as periods_by_day %} diff --git a/biscuit/apps/alsijil/views.py b/biscuit/apps/alsijil/views.py index fd03d1a64..ee3e8d5b9 100644 --- a/biscuit/apps/alsijil/views.py +++ b/biscuit/apps/alsijil/views.py @@ -147,6 +147,8 @@ def group_week(request: HttpRequest, week: Optional[int] = None) -> HttpResponse select_form = SelectForm(request.GET or None) context['week'] = wanted_week + context['week_next'] = wanted_week + 1 + context['week_prev'] = wanted_week - 1 context['group'] = group context['lesson_periods'] = lesson_periods context['persons'] = persons -- GitLab