From d158eb289418430742139082189abcb8cda37550 Mon Sep 17 00:00:00 2001 From: Martin Tielemans Date: Wed, 1 May 2024 15:24:33 +0200 Subject: [PATCH 1/2] I addded the next year button to the yearly report page. Next year will be hidden while the displayed year is the current year or more. --- stregreport/views.py | 2 ++ stregsystem/templates/admin/stregsystem/report/ranks.html | 1 + 2 files changed, 3 insertions(+) diff --git a/stregreport/views.py b/stregreport/views.py index 9e646ce4..4a72af36 100644 --- a/stregreport/views.py +++ b/stregreport/views.py @@ -344,6 +344,7 @@ def ranks_for_year(request, year): FORMAT = '%d/%m/%Y kl. %H:%M' last_year = year - 1 + next_year = year + 1 from_time = fjule_party(year - 1) to_time = fjule_party(year) kr_stat_list = sale_money_rank(from_time, to_time) @@ -355,6 +356,7 @@ def ranks_for_year(request, year): from_time_string = from_time.strftime(FORMAT) to_time_string = to_time.strftime(FORMAT) current_date = timezone.now() + show_next_year = year < current_date.year is_ongoing = current_date > from_time and current_date <= to_time return render(request, 'admin/stregsystem/report/ranks.html', locals()) diff --git a/stregsystem/templates/admin/stregsystem/report/ranks.html b/stregsystem/templates/admin/stregsystem/report/ranks.html index 0aa98db0..5b4cd81a 100644 --- a/stregsystem/templates/admin/stregsystem/report/ranks.html +++ b/stregsystem/templates/admin/stregsystem/report/ranks.html @@ -134,5 +134,6 @@

Rangeringer for {{year}}

 
Forrige år +{% if show_next_year %}Næste år {% endif %} {% endblock %} From 17fb29793b91d450559a742a188d22faa0e7605b Mon Sep 17 00:00:00 2001 From: Martin Tielemans <43238378+Zeps2369@users.noreply.github.com> Date: Wed, 1 May 2024 18:00:36 +0200 Subject: [PATCH 2/2] Update stregsystem/templates/admin/stregsystem/report/ranks.html Co-authored-by: Kresten Laust --- stregsystem/templates/admin/stregsystem/report/ranks.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stregsystem/templates/admin/stregsystem/report/ranks.html b/stregsystem/templates/admin/stregsystem/report/ranks.html index 5b4cd81a..610ba10e 100644 --- a/stregsystem/templates/admin/stregsystem/report/ranks.html +++ b/stregsystem/templates/admin/stregsystem/report/ranks.html @@ -134,6 +134,6 @@

Rangeringer for {{year}}

 
Forrige år -{% if show_next_year %}Næste år {% endif %} +{% if show_next_year %}Næste år{% endif %} {% endblock %}