Merge pull request #230 from NHSDigital/ssr-hide-year-checkboxes

Change year group checkbox visibility based on programme selected

Author: mikejamesthompson

mavis/reporting/api_client/client.py

@@ -1,6 +1,13 @@
 from mavis.reporting.helpers import mavis_helper
 from mavis.reporting.helpers.mavis_helper import MavisApiError, parse_json_response
 
+PROGRAMME_YEAR_GROUPS = {
+    "flu": ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13"],
+    "hpv": ["8", "9", "10", "11"],
+    "menacwy": ["9", "10", "11"],
+    "td_ipv": ["9", "10", "11"],
+}
+
 
 class MavisApiClient:
     def __init__(self, app=None, session=None):
@@ -102,8 +109,15 @@ def get_year_groups(self) -> list[dict]:
             {"value": "9", "text": "Year 9"},
             {"value": "10", "text": "Year 10"},
             {"value": "11", "text": "Year 11"},
+            {"value": "12", "text": "Year 12"},
+            {"value": "13", "text": "Year 13"},
         ]
 
+    def get_year_groups_for_programme(self, programme: str) -> list[dict]:
+        all_year_groups = self.get_year_groups()
+        eligible_values = PROGRAMME_YEAR_GROUPS.get(programme, [])
+        return [yg for yg in all_year_groups if yg["value"] in eligible_values]
+
     # https://www.datadictionary.nhs.uk/attributes/person_gender_code.html
     def get_genders(self) -> list[dict]:
         return [

mavis/reporting/templates/components/filters.jinja

@@ -6,15 +6,16 @@
 {% from "button/macro.jinja" import button %}
 
 {% macro filters(params) %}
-<form method="get"
+<form id="filters-form"
+      method="get"
       action="{{ params.form_action }}"
       hx-get="{{ params.form_action }}"
       hx-trigger="change from:input"
       hx-target="#dashboard"
       hx-select="#dashboard"
+      hx-select-oob="#filters-form:outerHTML"
       hx-swap="outerHTML"
-      hx-replace-url="true"
-      hx-sync="this:replace">
+      hx-replace-url="true">
   {% call fieldset({
     "legend": {
       "text": "Filter data",

mavis/reporting/views.py

@@ -149,13 +149,18 @@ def vaccinations(workgroup):
     filters = {}
 
     filters["team_workgroup"] = team.workgroup
-    filters["programme"] = request.args.get("programme") or "hpv"
+    filters["programme"] = request.args.get("programme") or "flu"
 
     gender_values = request.args.getlist("gender")
     if gender_values:
         filters["gender"] = gender_values
 
-    year_group_values = request.args.getlist("year-group")
+    year_groups = g.api_client.get_year_groups_for_programme(filters["programme"])
+    valid_year_group_values = {yg["value"] for yg in year_groups}
+
+    year_group_values = [
+        v for v in request.args.getlist("year-group") if v in valid_year_group_values
+    ]
     if year_group_values:
         filters["year_group"] = year_group_values
 
@@ -165,7 +170,7 @@ def vaccinations(workgroup):
         "vaccinations.jinja",
         team=team,
         programmes=g.api_client.get_programmes(),
-        year_groups=g.api_client.get_year_groups(),
+        year_groups=year_groups,
         genders=g.api_client.get_genders(),
         academic_year=get_current_academic_year_range(),
         data=data,

tests/api_client/test_client.py

@@ -45,3 +45,44 @@ def test_valid_vaccination_data(api_client, mock_mavis_get_request):
 
     assert result["cohort"] == expected_cohort
     assert "vaccinated_percentage" in result
+
+
+class TestGetYearGroupsForProgramme:
+    def test_flu_returns_all_year_groups(self, api_client):
+        result = api_client.get_year_groups_for_programme("flu")
+        values = [yg["value"] for yg in result]
+        assert values == [
+            "0",
+            "1",
+            "2",
+            "3",
+            "4",
+            "5",
+            "6",
+            "7",
+            "8",
+            "9",
+            "10",
+            "11",
+            "12",
+            "13",
+        ]
+
+    def test_hpv_returns_years_8_to_11(self, api_client):
+        result = api_client.get_year_groups_for_programme("hpv")
+        values = [yg["value"] for yg in result]
+        assert values == ["8", "9", "10", "11"]
+
+    def test_menacwy_returns_years_9_to_11(self, api_client):
+        result = api_client.get_year_groups_for_programme("menacwy")
+        values = [yg["value"] for yg in result]
+        assert values == ["9", "10", "11"]
+
+    def test_td_ipv_returns_years_9_to_11(self, api_client):
+        result = api_client.get_year_groups_for_programme("td_ipv")
+        values = [yg["value"] for yg in result]
+        assert values == ["9", "10", "11"]
+
+    def test_unknown_programme_returns_empty_list(self, api_client):
+        result = api_client.get_year_groups_for_programme("unknown")
+        assert result == []