Merge pull request #1016 from NHSDigital/offline-import-clinic-sessions

Support offline recording for clinic sessions that don't yet exist

Author: thomasleese

mavis/test/data/vaccs/o_systmone_hist_negative.txt

@@ -1,9 +1,9 @@
 Row 2 Date of birth: Enter a date of birth.
 Row 4 NHS number: should be a valid NHS number with 10 characters
 Row 5 NHS number: should be a valid NHS number with 10 characters
-Row 6 Vaccination type: This programme is not available in this session. Vaccination type: This vaccine is not valid.
+Row 6 Vaccination type: This programme is not recognised. Vaccination type: This vaccine is not valid.
 Row 7 Vaccination type: must be less than or equal to 3
-Row 8 Vaccination type: This programme is not available in this session. Vaccination type: This vaccine is not valid.
+Row 8 Vaccination type: This programme is not recognised. Vaccination type: This vaccine is not valid.
 Row 9 First name: Enter a first name.
 Row 10 Postcode: Enter a valid postcode, such as SW1A 1AA.
 Row 11 Postcode: Enter a valid postcode, such as SW1A 1AA.

mavis/test/data/vaccs/o_systmone_negative.txt

@@ -1,9 +1,9 @@
 Row 2 Date of birth: Enter a date of birth.
 Row 4 NHS number: should be a valid NHS number with 10 characters
 Row 5 NHS number: should be a valid NHS number with 10 characters
-Row 6 Vaccination type: This programme is not available in this session. Vaccination type: This vaccine is not valid.
+Row 6 Vaccination type: This programme is not recognised. Vaccination type: This vaccine is not valid.
 Row 7 Vaccination type: must be less than or equal to 3
-Row 8 Vaccination type: This programme is not available in this session. Vaccination type: This vaccine is not valid.
+Row 8 Vaccination type: This programme is not recognised. Vaccination type: This vaccine is not valid.
 Row 9 First name: Enter a first name.
 Row 10 Postcode: Enter a valid postcode, such as SW1A 1AA.
 Row 11 Postcode: Enter a valid postcode, such as SW1A 1AA.

mavis/test/pages/sessions/sessions_overview_page.py

@@ -38,7 +38,9 @@ def __init__(self, page: Page) -> None:
             "link",
             name="Import class lists",
         )
-        self.record_offline_link = self.page.get_by_role("link", name="Record offline")
+        self.download_offline_spreadsheet_button = self.page.get_by_role(
+            "link", name="Download offline spreadsheet"
+        )
         self.review_no_consent_response_link = self.page.get_by_role(
             "link",
             name="with no response",
@@ -139,12 +141,12 @@ def get_session_id_from_offline_excel(self) -> str:
         file_path = self.download_offline_recording_excel()
         return get_session_id(file_path)
 
-    @step("Click on Record offline")
+    @step("Click on Download offline spreadsheet")
     def download_offline_recording_excel(self) -> Path:
         _file_path = Path(f"working/excel_{get_current_datetime_compact()}.xlsx")
 
         with self.page.expect_download() as download_info:
-            self.record_offline_link.click()
+            self.download_offline_spreadsheet_button.click()
         download = download_info.value
         download.save_as(_file_path)
 

tests/test_e2e_doubles.py

@@ -1,3 +1,5 @@
+import time
+
 import pytest
 
 from mavis.test.constants import Programme, Vaccine
@@ -109,12 +111,18 @@ def test_recording_doubles_vaccination_e2e(
     SessionsChildrenPage(page).header.click_mavis()
     DashboardPage(page).click_sessions()
     SessionsSearchPage(page).click_session_for_programme_group(schools[0], "doubles")
+
     SessionsOverviewPage(page).verify_offline_sheet_vaccination_row(
         menacwy_vaccination_record,
         Vaccine.MENQUADFI,
         point_of_care_nurse,
         schools[0],
     )
+
+    # The button to download the offline spreadsheet prevents double clicks.
+    # We need to wait here to avoid the second click being ignored.
+    time.sleep(1)
+
     SessionsOverviewPage(page).verify_offline_sheet_vaccination_row(
         td_ipv_vaccination_record,
         Vaccine.REVAXIS,

tests/test_import_issues.py

@@ -116,7 +116,9 @@ def setup_vaccination_import(
     ImportRecordsWizardPage(page, point_of_care_file_generator).import_class_list(
         ClassFileMapping.RANDOM_CHILD, year_group
     )
-    schedule_school_session_if_needed(page, school, [Programme.HPV], [year_group])
+    schedule_school_session_if_needed(
+        page, school, [Programme.FLU, Programme.HPV], [year_group]
+    )
     session_id = SessionsOverviewPage(page).get_session_id_from_offline_excel()
     SessionsOverviewPage(page).header.click_mavis()
     return session_id

tests/test_import_offline_vaccinations.py

@@ -32,16 +32,27 @@ def setup_vaccs(
     point_of_care_file_generator,
     year_groups,
 ):
-    school = schools[Programme.HPV][0]
-    year_group = year_groups[Programme.HPV]
+    school = schools["doubles"][0]
+    year_group = year_groups["doubles"]
 
     DashboardPage(page).click_schools()
     SchoolsSearchPage(page).click_school(school)
     SchoolChildrenPage(page).click_import_class_lists()
     ImportRecordsWizardPage(page, point_of_care_file_generator).import_class_list(
-        ClassFileMapping.RANDOM_CHILD, year_group
+        ClassFileMapping.RANDOM_CHILD, year_group, programme_group="doubles"
+    )
+    schedule_school_session_if_needed(
+        page,
+        school,
+        [
+            Programme.FLU,
+            Programme.HPV,
+            Programme.MENACWY,
+            Programme.MMR,
+            Programme.TD_IPV,
+        ],
+        [year_group],
     )
-    schedule_school_session_if_needed(page, school, [Programme.HPV], [year_group])
     session_id = SessionsOverviewPage(page).get_session_id_from_offline_excel()
     SessionsOverviewPage(page).header.click_mavis()
     DashboardPage(page).click_imports()