- {% if previous_year %}
+ {% if previous_year %}
{% if max_score_changed %}
-
-
Score comparison unavailable
-
There is no comparison between {{ plan_year }} and {{ previous_year }} data because this question's maximum score was modified in {{ plan_year }}.
-
+
It is not possible to compare performance on this question between {{ plan_year }} and {{ previous_year }} because this question’s maximum score was modified in {{ plan_year }}.
{% elif comparison_overridden %}
-
-
Score comparison unavailable
-
There is no comparison between {{ plan_year }} and {{ previous_year }} data because this question was modified in {{ plan_year }}.
-
+
It is not possible to compare performance on this question between {{ plan_year }} and {{ previous_year }} data because this question was modified in {{ plan_year }}.
{% elif no_comparison %}
-
-
Score comparison unavailable
-
This question was introduced in the {{ plan_year }} Action Scorecards and has no historical data for comparison.
-
- {% elif not question.is_negatively_marked %}
-
Performance comparison between {{ previous_year }} and {{ plan_year }}
-
{% include 'scoring/includes/scoring-group-name.html' with group=scoring_group.slug plural=1 %}
+
This question was introduced in the {{ plan_year }} Action Scorecards and has no historical data for comparison.
+ {% else %}
+
Note: “in {{ previous_year }}” counts show how the councils listed below were marked on this question in {{ previous_year }}. This list of councils may be slightly different to the list of councils originally assessed on this question in {{ previous_year }}, due to the creation and abolition of councils{% if filter_params.ruc_cluser or filter_params.population or filter_params.imdq or filter_params.control %}, or changes in your filtered properties{% endif %} between Scorecard years.
+ {% endif %}
+
+ {% if not max_score_changed and not comparison_overridden and not no_comparison and not question.is_negatively_marked %}
+
+ Rising and falling
+
+ {% include 'scoring/includes/scoring-group-name.html' with group=scoring_group.slug plural=1 %}
+
+
@@ -197,27 +183,25 @@
Performance comparison between {{ previous_year }} and
{% endif %}
-
-
-
-
-
-
Legends for difference column
-
- -- No change
-
-
- NA New question (not in previous scorecards)
-
-
-
-
-
{% endif %}
+ {% endif %}
+ {% if scoring_group and not scores %}
+
+
No councils match your filters
+
Try adjusting your filter criteria or
+
+ clear all filters.
+
{% endif %}
{% if scores %}
+
+ Scores and evidence
+
+ {% include 'scoring/includes/scoring-group-name.html' with group=scoring_group.slug plural=1 %}
+
+
{% endif %}
- {% endif %}
+
+
+
+ {% endif %}
{% endblock %}
diff --git a/scoring/tests/test_views.py b/scoring/tests/test_views.py
index e0e021554..f00f6ecc7 100644
--- a/scoring/tests/test_views.py
+++ b/scoring/tests/test_views.py
@@ -633,3 +633,84 @@ def test_answer_view(self):
},
],
)
+
+
+@override_settings(PLAN_YEAR="2023")
+class TestQuestionViewFilters(TestCase):
+ """Test filtering functionality on QuestionView"""
+
+ fixtures = ["test_answers.json"]
+
+ def setUp(self):
+ self.client = Client()
+
+ def test_question_view_without_filters(self):
+ """Test question view loads without filters applied"""
+ url = reverse("scoring:question", urlconf="scoring.urls", args=["s1_b_h_q1"])
+ response = self.client.get(url, HTTP_HOST="councilclimatescorecards.com")
+
+ self.assertEqual(response.status_code, 200)
+ # Note: test fixture doesn't have scoring groups, so no scores context
+
+ def test_question_view_with_country_filter(self):
+ """Test filtering by country parameter"""
+ url = reverse("scoring:question", urlconf="scoring.urls", args=["s1_b_h_q1"])
+ response = self.client.get(
+ url, {"country": "1"}, HTTP_HOST="councilclimatescorecards.com" # England
+ )
+
+ # Verify page loads successfully with filter parameter
+ self.assertEqual(response.status_code, 200)
+
+ def test_question_view_with_population_filter(self):
+ """Test filtering by population parameter"""
+ url = reverse("scoring:question", urlconf="scoring.urls", args=["s1_b_h_q1"])
+ response = self.client.get(
+ url, {"population": "50k-80k"}, HTTP_HOST="councilclimatescorecards.com"
+ )
+
+ # Verify page loads successfully with filter parameter
+ self.assertEqual(response.status_code, 200)
+
+ def test_question_view_with_multiple_filters(self):
+ """Test applying multiple filters simultaneously"""
+ url = reverse("scoring:question", urlconf="scoring.urls", args=["s1_b_h_q1"])
+ response = self.client.get(
+ url,
+ {"country": "1", "ruc_cluster": "urban"},
+ HTTP_HOST="councilclimatescorecards.com",
+ )
+
+ # Verify page loads successfully with multiple filter parameters
+ self.assertEqual(response.status_code, 200)
+
+ def test_question_view_filter_with_type_parameter(self):
+ """Test that filters work alongside authority type parameter"""
+ url = reverse("scoring:question", urlconf="scoring.urls", args=["s1_b_h_q1"])
+ response = self.client.get(
+ url,
+ {"type": "single", "country": "1"},
+ HTTP_HOST="councilclimatescorecards.com",
+ )
+
+ # Verify page loads successfully with type and filter parameters
+ self.assertEqual(response.status_code, 200)
+
+ def test_question_view_accepts_all_filter_parameters(self):
+ """Test that all filter parameters are accepted without errors"""
+ url = reverse("scoring:question", urlconf="scoring.urls", args=["s1_b_h_q1"])
+ response = self.client.get(
+ url,
+ {
+ "country": "1",
+ "ruc_cluster": "urban",
+ "population": "50k-80k",
+ "imdq": "1",
+ "control": "Labour",
+ "region": "London",
+ },
+ HTTP_HOST="councilclimatescorecards.com",
+ )
+
+ # Verify page loads successfully with all filter parameters
+ self.assertEqual(response.status_code, 200)
diff --git a/scoring/views.py b/scoring/views.py
index 85c0f2c8e..34aaabe86 100644
--- a/scoring/views.py
+++ b/scoring/views.py
@@ -1324,7 +1324,12 @@ def get_context_data(self, **kwargs):
@method_decorator(cache_control(**cache_settings), name="dispatch")
-class QuestionView(PrivateScorecardsAccessMixin, SearchAutocompleteMixin, DetailView):
+class QuestionView(
+ PrivateScorecardsAccessMixin,
+ SearchAutocompleteMixin,
+ AdvancedFilterMixin,
+ DetailView,
+):
model = PlanQuestion
context_object_name = "question"
template_name = "scoring/question.html"
@@ -1336,9 +1341,29 @@ def get_object(self):
section__year=self.request.year.year,
)
+ def get_filter_queryset(self, question, scoring_group):
+ """Build the base queryset for scores that will be filtered."""
+ return (
+ PlanQuestionScore.objects.filter(
+ plan_score__year=self.request.year.year,
+ plan_question=question,
+ plan_score__council__authority_type__in=scoring_group["types"],
+ )
+ .select_related("plan_score", "plan_score__council")
+ .order_by("-score", "plan_score__council__name")
+ )
+
+ def get_filterset(self, queryset):
+ """Instantiate and return the filterset for filtering scores."""
+ return QuestionScoreFilter(
+ data=self.request.GET or None, queryset=queryset, request=self.request
+ )
+
def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs)
+ context["current_page"] = "question-detail"
+
question = context["question"]
context["page_title"] = question.text
context["plan_year"] = self.request.year.year
@@ -1385,15 +1410,12 @@ def get_context_data(self, **kwargs):
if scoring_group is not None:
context["scoring_group"] = scoring_group
- context["scores"] = (
- PlanQuestionScore.objects.filter(
- plan_score__year=self.request.year.year,
- plan_question=question,
- plan_score__council__authority_type__in=scoring_group["types"],
- )
- .select_related("plan_score", "plan_score__council")
- .order_by("-score", "plan_score__council__name")
- )
+
+ # Build base queryset and apply filters
+ base_queryset = self.get_filter_queryset(question, scoring_group)
+ filterset = self.get_filterset(base_queryset)
+ context["filter"] = filterset
+ context["scores"] = filterset.qs
prev_counts = None
if self.request.year.previous_year:
@@ -1411,6 +1433,13 @@ def get_context_data(self, **kwargs):
.annotate(change=(F("score") - F("previous_score")))
)
+ # Save the queryset before we iterate (iteration evaluates it)
+ scores_for_breakdown = context["scores"]
+ filtered_ids = list(
+ scores_for_breakdown.values_list("plan_score__council_id", flat=True)
+ )
+
+ if self.request.year.previous_year:
context["increased"] = 0
context["decreased"] = 0
for score in context["scores"]:
@@ -1426,13 +1455,27 @@ def get_context_data(self, **kwargs):
previous_q_overriden = True
if previous_q:
- prev_counts = previous_q.get_scores_breakdown(
- year=self.request.year.previous_year.year,
- scoring_group=scoring_group,
+ prev_counts = list(
+ previous_q.get_score_breakdown_for_councils(
+ filtered_ids, self.request.year.previous_year.year
+ )
)
- score_counts = question.get_scores_breakdown(
- year=self.request.year.year, scoring_group=scoring_group
+ # Setup filter UI context
+ context = self.setup_filter_context(context, filterset, scoring_group)
+
+ # Show region filter only for England
+ context["show_region_filter"] = False
+ if context.get("filter_params"):
+ country = context["filter_params"].get("country")
+ if country == "1" or country == "" or country is None:
+ context["show_region_filter"] = True
+
+ # Calculate score breakdown from filtered queryset
+ score_counts = list(
+ context["question"].get_score_breakdown_for_councils(
+ filtered_ids, self.request.year.year
+ )
)
totals = {}