Merge branch 'main' into feature/BCSS-21996--survellianceregressiontests-scenario-1

# Conflicts:
#	pages/screening_subject_search/advance_episode_page.py
#	pages/screening_subject_search/discharge_from_surveillance_page.py
#	tests/regression/regression_tests/surveillance_regression_tests/test_surveillance_scenario_2.py
#	utils/appointments.py
#	utils/generate_health_check_forms_util.py
#	utils/oracle/subject_selection_query_builder.py

Author: mepr1

pages/screening_subject_search/advance_episode_page.py

@@ -114,7 +114,7 @@ def __init__(self, page: Page):
             "button",
             name="Refer Another Diagnostic Test after return from Symptomatic Referral",
         )
-        self.refer_to_survelliance_after_symptomatic_referral_button = (
+        self.refer_to_surveillance_after_symptomatic_referral_button = (
             self.page.get_by_role(
                 "button", name="Refer to Surveillance after Symptomatic Referral"
             )
@@ -463,12 +463,12 @@ def click_lnpcp_result_from_symptomatic_procedure_button(self) -> None:
         """Click the 'LNPCP Result from Symptomatic Procedure' button."""
         self.safe_accept_dialog(self.lnpcp_result_from_symptomatic_procedure_button)
 
-    def click_refer_to_survelliance_after_symptomatic_referral_button(
+    def click_refer_to_surveillance_after_symptomatic_referral_button(
         self,
     ) -> None:
         """Click the 'Refer to Surveillance after Symptomatic Referral' button."""
         self.safe_accept_dialog(
-            self.refer_to_survelliance_after_symptomatic_referral_button
+            self.refer_to_surveillance_after_symptomatic_referral_button
         )
 
     def click_redirect_to_rerecord_the_outcome_of_symptomatic_referral_button(

pages/screening_subject_search/discharge_from_surveillance_page.py

@@ -1,4 +1,4 @@
-from playwright.sync_api import Page, expect
+from playwright.sync_api import Page
 from pages.base_page import BasePage
 from datetime import datetime
 from utils.calendar_picker import CalendarPicker
@@ -22,7 +22,7 @@ def __init__(self, page: Page):
         self.notes_field = self.page.locator("#UI_NOTES")
         self.save_button = self.page.get_by_role("button", name="Save")
 
-    def enter_date_decition_made(self, date: datetime) -> None:
+    def enter_date_decision_made(self, date: datetime) -> None:
         """
         Enter a date into the 'Date Decision Made' field
         Args:
@@ -73,9 +73,9 @@ def complete_discharge_from_surveillance_form(
         """
         Completes the discharge from surveillance form.
         Args:
-            include_screening_consultant (bool): Wether or not to include a screening consultant in the form
+            include_screening_consultant (bool): Whether or not to include a screening consultant in the form
         """
-        self.enter_date_decition_made(datetime.today())
+        self.enter_date_decision_made(datetime.today())
         if include_screening_consultant:
             self.select_screening_consultant_from_index(-1)
         self.select_screening_pracitioner_from_index(1)