From 8f94c01559f8f7da47db3a19cfa4fd8de90ed9f2 Mon Sep 17 00:00:00 2001 From: Struan Donald Date: Tue, 7 May 2024 13:24:34 +0100 Subject: [PATCH] [scorecards] allow different default plan and methodology years There are points when we want to display the next year's scorecards methodology as the default rather than the cuurent years to add a METHODLOGY_YEAR setting and use that in place of the PLAN_YEAR if we're not viewing a specific year. --- proj/settings.py | 1 + scoring/templates/scoring/methodology.html | 2 +- scoring/views.py | 11 ++++++++--- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/proj/settings.py b/proj/settings.py index 3ca35f35..8e5fdb41 100755 --- a/proj/settings.py +++ b/proj/settings.py @@ -154,6 +154,7 @@ RELATED_SEARCH_THRESHOLD_LOOSE = 0.5 PLAN_YEAR = 2023 +METHODOLOGY_YEAR = 2025 PLAN_SCORECARD_DATASET_DETAILS = { "org": "mysociety", diff --git a/scoring/templates/scoring/methodology.html b/scoring/templates/scoring/methodology.html index 22bec91c..b1fc07b6 100644 --- a/scoring/templates/scoring/methodology.html +++ b/scoring/templates/scoring/methodology.html @@ -5,7 +5,7 @@
- 2023 + {{ methodology_year }} Action Scorecards
diff --git a/scoring/views.py b/scoring/views.py index cd0278fd..879c2c96 100644 --- a/scoring/views.py +++ b/scoring/views.py @@ -914,15 +914,20 @@ def get_context_data(self, **kwargs): context["page_title"] = "Methodology" context["current_page"] = "methodology-page" + methodology_year = self.request.year + if kwargs.get("year") is None: + methodology_year = settings.METHODOLOGY_YEAR + + context["methodology_year"] = methodology_year context[ "intro_template" - ] = f"scoring/methodology/{self.request.year}/_intro.html" + ] = f"scoring/methodology/{methodology_year}/_intro.html" context[ "details_template" - ] = f"scoring/methodology/{self.request.year}/_details.html" + ] = f"scoring/methodology/{methodology_year}/_details.html" questions = ( - PlanQuestion.objects.filter(section__year=self.request.year) + PlanQuestion.objects.filter(section__year=methodology_year) .select_related("section") .order_by("section__code", "code") )