[Scorecards] Added year comparison question page

caps/templates/caps/icons/arrow-down.html

@@ -0,0 +1,2 @@
+<svg width="{{ width | default:'1em' }}" height="{{ height | default:'1em' }}" viewBox="0 0 30 30" class="bi {{ classes }}" {% if role %}role="{{ role }}"{% endif %} fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M29 15L15 29L1 15L9.84211 15L9.84211 1L20.1579 1L20.1579 15L29 15Z" fill="white" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>

caps/templates/caps/icons/arrow-up.html

@@ -0,0 +1,2 @@
+<svg width="{{ width | default:'1em' }}" height="{{ height | default:'1em' }}" viewBox="0 0 30 30" class="bi {{ classes }}" {% if role %}role="{{ role }}"{% endif %} fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M1 15L15 1L29 15H20.1579V29H9.84211V15H1Z" fill="currentColor" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/></svg>

caps/tests/test_views.py

@@ -1,10 +1,10 @@
-from django.test import TestCase, Client
-
 from unittest.mock import patch
 
+from django.test import Client, TestCase
 from django.urls import reverse
 
-from caps.models import Council, Promise, PlanDocument, EmergencyDeclaration
+from caps.models import Council, EmergencyDeclaration, PlanDocument, Promise
+from scoring.models import PlanYear
 
 
 class TestPageRenders(TestCase):
@@ -14,6 +14,8 @@ def setUp(self):
             name="Borsetshire", slug="borsetshire", country=Council.ENGLAND
         )
 
+        PlanYear.objects.create(year=2023, is_current=True)
+
     def test_home_page(self):
         url = reverse("home")
         response = self.client.get(url)
@@ -75,6 +77,8 @@ def setUp(self):
             combined_authority=felpersham,
         )
 
+        PlanYear.objects.create(year=2023, is_current=True)
+
     @patch("caps.mapit.session")
     def test_postcode_to_one_council_redirects_to_council(self, mapit_session):
         mapit_session.get.return_value.json.return_value = {
@@ -158,6 +162,8 @@ def setUp(self):
             target_year="2045",
         )
 
+        PlanYear.objects.create(year=2023, is_current=True)
+
     def test_council_has_promise(self):
         url = reverse("council", args=["borsetshire"])
         response = self.client.get(url)

caps/views.py

@@ -61,7 +61,7 @@
 from caps.search_funcs import condense_highlights
 from caps.utils import file_size, is_valid_postcode
 from charting import ChartCollection
-from scoring.models import PlanScore, PlanSection, PlanSectionScore
+from scoring.models import PlanScore, PlanSection, PlanSectionScore, PlanYear
 
 
 def add_context_for_plans_download_and_search(context):
@@ -181,7 +181,8 @@ def get_scorecard_context(self, council: Council) -> dict[str, Any]:
         """
         context = {}
         try:
-            plan_score = PlanScore.objects.get(council=council, year=2023)
+            plan_year = PlanYear.objects.get(is_current=True)
+            plan_score = PlanScore.objects.get(council=council, year=plan_year.year)
 
             group = council.get_scoring_group()
 
@@ -193,12 +194,12 @@ def get_scorecard_context(self, council: Council) -> dict[str, Any]:
             ).aggregate(average_score=Avg("weighted_total"))
 
             sections = PlanSectionScore.sections_for_council(
-                council=council, plan_year=settings.PLAN_YEAR
+                council=council, plan_year=plan_year.year
             )
 
             # get average section scores for authorities of the same type
             section_avgs = PlanSectionScore.get_all_section_averages(
-                council_group=group, plan_year=settings.PLAN_YEAR
+                council_group=group, plan_year=plan_year.year
             )
 
             for section in section_avgs.all():

scoring/fixtures/test_answers.json

@@ -1,4 +1,14 @@
 [
+  {
+    "model": "scoring.planyear",
+    "pk": 1,
+    "fields": {
+      "year": 2023,
+      "new_council_date": "2023-01-01",
+      "old_council_date": "2021-04-01",
+      "is_current": true
+    }
+  },
   {
     "model": "caps.council",
     "pk": 1,

scoring/fixtures/test_homepage.json

@@ -1,4 +1,14 @@
 [
+  {
+    "model": "scoring.planyear",
+    "pk": 1,
+    "fields": {
+      "year": 2023,
+      "new_council_date": "2023-01-01",
+      "old_council_date": "2021-04-01",
+      "is_current": true
+    }
+  },
   {
     "model": "caps.council",
     "pk": 1,

scoring/fixtures/test_previous_years_answers.json

@@ -1,4 +1,24 @@
 [
+  {
+    "model": "scoring.planyear",
+    "pk": 1,
+    "fields": {
+      "year": 2023,
+      "new_council_date": "2023-01-01",
+      "old_council_date": "2021-04-01",
+      "is_current": false
+    }
+  },
+  {
+    "model": "scoring.planyear",
+    "pk": 2,
+    "fields": {
+      "year": 2025,
+      "new_council_date": "2024-01-01",
+      "old_council_date": "2023-01-01",
+      "is_current": true
+    }
+  },
   {
     "model": "caps.council",
     "pk": 1,

scoring/fixtures/test_top_performers.json

@@ -1,4 +1,14 @@
 [
+  {
+    "model": "scoring.planyear",
+    "pk": 1,
+    "fields": {
+      "year": 2023,
+      "new_council_date": "2023-01-01",
+      "old_council_date": "2021-04-01",
+      "is_current": true
+    }
+  },
   {
     "model": "caps.council",
     "pk": 1,

scoring/middleware.py

@@ -1,4 +1,7 @@
 from django.conf import settings
+from django.http import Http404, HttpResponseServerError
+
+from scoring.models import PlanYear
 
 
 class AddYearMiddleware:
@@ -10,11 +13,23 @@ def __call__(self, request):
         return response
 
     def process_view(self, request, view_func, view_args, view_kwargs):
-        year = settings.PLAN_YEAR
-        if view_kwargs.get("year") is not None:
-            try:
-                year = int(view_kwargs["year"])
-            except ValueError:
-                year = settings.PLAN_YEAR
+        if request.host.name == "scoring":
+            year = None
+            if view_kwargs.get("year") is not None:
+                try:
+                    year = int(view_kwargs["year"])
+                except ValueError:
+                    year = None
+
+            if year is not None:
+                try:
+                    plan_year = PlanYear.objects.get(year=year)
+                except PlanYear.DoesNotExist:
+                    raise Http404("No such year")
+            else:
+                try:
+                    plan_year = PlanYear.objects.get(is_current=True)
+                except PlanYear.DoesNotExist:
+                    raise HttpResponseServerError("No current Plan Year found")
 
-        request.year = year
+            request.year = plan_year

scoring/static/scoring/js/main.js

@@ -546,3 +546,53 @@ document.querySelectorAll('.js-social-graphic-download').forEach(function(el) {
         });
     });
 });
+
+// Question display improved or worsened councils
+// Function to update table visibility based on checkbox states
+function updateTableVisibility() {
+    var improvedChecked = document.querySelector('.js-checkbox-improved-councils').checked;
+    var worsenedChecked = document.querySelector('.js-checkbox-worsened-councils').checked;
+
+    // If no checkboxes are checked, show all rows
+    var showAll = !improvedChecked && !worsenedChecked;
+
+    // Update visibility for rows with year-difference-status
+    forEachElement('tr[year-difference-status]', function(row) {
+        var status = row.getAttribute('year-difference-status');
+
+        // Show the row if:
+        // 1. No filters are active (show all)
+        // 2. The row's status matches the active filter
+        if (showAll || 
+            (improvedChecked && status === 'improved') || 
+            (worsenedChecked && status === 'worsened')) {
+            row.style.display = '';
+        } else {
+            row.style.display = 'none';
+        }
+    });
+}
+
+forEachElement('.js-checkbox-improved-councils', function(checkbox) {
+    checkbox.addEventListener('change', function() {
+        // If this checkbox is checked, uncheck the other one
+        if (this.checked) {
+            forEachElement('.js-checkbox-worsened-councils', function(otherCheckbox) {
+                otherCheckbox.checked = false;
+            });
+        }
+        updateTableVisibility();
+    });
+});
+
+forEachElement('.js-checkbox-worsened-councils', function(checkbox) {
+    checkbox.addEventListener('change', function() {
+        // If this checkbox is checked, uncheck the other one
+        if (this.checked) {
+            forEachElement('.js-checkbox-improved-councils', function(otherCheckbox) {
+                otherCheckbox.checked = false;
+            });
+        }
+        updateTableVisibility();
+    });
+});

scoring/static/scoring/scss/table-question-council.scss

@@ -1,8 +1,20 @@
+.question-summary-grid {
+    display: grid;
+    grid-template-columns: repeat(auto-fill, minmax(10rem, 10rem));
+    column-gap: 1rem;
+    row-gap: 1rem;
+
+    @include media-breakpoint-up(lg) {
+        grid-template-columns: repeat(auto-fill, minmax(12.5rem, 13.5rem));
+        column-gap: 2rem;
+    }
+}
+
 .table-question-council,
 .section-question-table,
 .table-council-question-performance {
     th {
-        vertical-align: top;
+        vertical-align: middle;
     }
 
     th, td  {

scoring/static/scoring/scss/variables.scss

@@ -254,6 +254,8 @@ $form-select-indicator: url("../img/bootstrap/form-select-indicator.svg");
 $form-feedback-icon-valid: url("../img/bootstrap/form-feedback-icon-valid.svg");
 $form-feedback-icon-invalid: url("../img/bootstrap/form-feedback-icon-invalid.svg");
 
+$form-check-input-border: 1px solid rgba($black, .5);
+
 // Form validation
 
 // Z-index master list