Merge remote-tracking branch 'origin' into feature/BCSS-21311-fobt-regression-scenario-8

# Conflicts:
#	utils/appointments.py
#	utils/oracle/subject_selection_query_builder.py

Author: Andyg79

pages/datasets/investigation_dataset_page.py

@@ -338,7 +338,7 @@ def expect_text_to_be_visible(self, text: str) -> None:
         Args:
             text (str): The text to check for visibility.
         """
-        expect(self.page.get_by_text(text)).to_contain_text(text)
+        expect(self.page.get_by_text(text)).to_contain_text(text, timeout=10000)
 
     def select_polyp1_pathology_provider_option_index(self, option: int) -> None:
         """

pages/screening_practitioner_appointments/book_appointment_page.py

@@ -1,6 +1,8 @@
 from playwright.sync_api import Page, expect
 from pages.base_page import BasePage
 from utils.table_util import TableUtils
+from datetime import datetime
+from utils.calendar_picker import CalendarPicker
 
 
 class BookAppointmentPage(BasePage):
@@ -18,10 +20,17 @@ def __init__(self, page: Page):
         self.save_button = self.page.get_by_role("button", name="Save")
         self.appointments_table = TableUtils(self.page, "#displayRS")
         self.current_month_displayed = self.page.locator("#MONTH_AND_YEAR")
+        self.screening_practitioner_dropdown = self.page.locator("#UI_NEW_PRACTITIONER")
 
         self.appointment_cell_locators = self.page.locator("input.twoColumnCalendar")
-        self.available_background_colour = "rgb(102, 255, 153)"
-        self.some_available_background_colour = "rgb(255, 220, 144)"
+        self.appointment_fully_available_colour = "rgb(102, 255, 153)"  # Mint Green
+        self.appointment_partially_available_colour = (
+            "rgb(255, 220, 144)"  # Peach Orange
+        )
+        self.appointment_date_input = self.page.locator("#UI_NEW_APPT_DATE")
+        self.appointment_time_start_time_input = self.page.locator(
+            "#UI_NEW_APPT_TIME_FROM"
+        )
 
     def select_screening_centre_dropdown_option(self, screening_centre: str) -> None:
         """Selects the screening centre from the dropdown."""
@@ -38,15 +47,39 @@ def choose_appointment_time(self) -> None:
 
     def click_save_button(self) -> None:
         """Clicks the save button."""
-        self.click(self.save_button)
+        self.safe_accept_dialog(self.save_button)
 
     def appointment_booked_confirmation_is_displayed(self, message: str) -> None:
         """Checks if the appointment booked confirmation message is displayed."""
-        expect(self.page.get_by_text(message)).to_be_visible()
+        expect(self.page.get_by_text(message)).to_be_visible(timeout=10000)
 
     def get_current_month_displayed(self) -> str:
         """Returns the current month displayed in the calendar."""
         current_month_displayed_content = self.current_month_displayed.text_content()
         if current_month_displayed_content is None:
             raise ValueError("Current month displayed is 'None'")
         return current_month_displayed_content
+
+    def select_screening_practitioner_dropdown_option(self, index: int) -> None:
+        """Selects the screening practitioner from the dropdown by index."""
+        self.screening_practitioner_dropdown.select_option(index=index)
+
+    def enter_appointment_date(self, date: datetime) -> None:
+        """
+        Enters the appointment date in the date input field and clicks 'Enter'.
+        Args:
+            date (datetime): The date to enter.
+        """
+        CalendarPicker(self.page).calendar_picker_ddmmyyyy(
+            date, self.appointment_date_input
+        )
+        self.appointment_date_input.press("Enter")
+
+    def enter_appointment_start_time(self, time: str) -> None:
+        """
+        Enters the appointment start time in the time input field and clicks 'Enter'.
+        Args:
+            time (str): The time to enter in the format 'HH:MM'.
+        """
+        self.appointment_time_start_time_input.fill(time)
+        self.appointment_time_start_time_input.press("Enter")

pages/screening_subject_search/advance_fobt_screening_episode_page.py

@@ -16,9 +16,8 @@ def __init__(self, page: Page):
             "button", name="Suitable for Endoscopic Test"
         )
         self.calendar_button = self.page.get_by_role("button", name="Calendar")
-        self.test_type_dropdown = self.page.locator("#UI_EXT_TEST_TYPE_2233")
-        self.test_type_dropdown_2 = self.page.locator("#UI_EXT_TEST_TYPE_4325")
-        self.advance_checkbox = self.page.get_by_label(
+        self.test_type_dropdown = self.page.locator("[id^='UI_EXT_TEST_TYPE_']")
+        self.advance_checkbox_label = self.page.get_by_label(
             "There are some events available which should only be used in exceptional circumstances. If you wish to see them, check this box"
         )
         self.invite_for_diagnostic_test_button = self.page.get_by_role(
@@ -48,7 +47,7 @@ def __init__(self, page: Page):
         self.amend_diagnosis_date_button = self.page.get_by_role(
             "button", name="Amend Diagnosis Date"
         )
-        self.advance_checkbox_v2 = self.page.get_by_role("checkbox")
+        self.advance_checkbox_label_v2 = self.page.get_by_role("checkbox")
         self.subsequent_assessment_appointment_required_dropdown = (
             self.page.get_by_role("combobox")
         )
@@ -74,6 +73,9 @@ def __init__(self, page: Page):
         self.cancel_diagnostic_test_button = self.page.get_by_role(
             "button", name="Cancel Diagnostic Test"
         )
+        self.post_investigation_appointment_required_button = self.page.get_by_role(
+            "button", name="Post-investigation Appointment Required"
+        )
 
     def click_suitable_for_endoscopic_test_button(self) -> None:
         """Click the 'Suitable for Endoscopic Test' button."""
@@ -87,10 +89,6 @@ def select_test_type_dropdown_option(self, text: str) -> None:
         """Select the test type from the dropdown."""
         self.test_type_dropdown.select_option(label=text)
 
-    def select_test_type_dropdown_option_2(self, text: str) -> None:
-        """Select the test type from the dropdown."""
-        self.test_type_dropdown_2.select_option(label=text)
-
     def click_invite_for_diagnostic_test_button(self) -> None:
         """Click the 'Invite for Diagnostic Test' button."""
         self.safe_accept_dialog(self.invite_for_diagnostic_test_button)
@@ -147,11 +145,11 @@ def click_record_contact_with_patient_button(self) -> None:
 
     def check_advance_checkbox(self) -> None:
         """Selects the 'Advance FOBT' checkbox"""
-        self.advance_checkbox.check()
+        self.advance_checkbox_label.check()
 
     def click_amend_diagnosis_date_button(self) -> None:
         """Checks the 'Advance FOBT' checkbox and clicks the 'Amend Diagnosis Date' button."""
-        self.advance_checkbox_v2.check()
+        self.advance_checkbox_label_v2.check()
         self.click(self.amend_diagnosis_date_button)
 
     def click_and_select_subsequent_assessment_appointment_required(
@@ -273,3 +271,7 @@ def click_not_suitable_for_diagnostic_tests_button(self) -> None:
     def click_cancel_diagnostic_test_button(self) -> None:
         """Click the 'Cancel Diagnostic Test' button."""
         self.safe_accept_dialog(self.cancel_diagnostic_test_button)
+
+    def click_post_investigation_appointment_required_button(self) -> None:
+        """Click the 'Post-investigation Appointment Required' button."""
+        self.safe_accept_dialog(self.post_investigation_appointment_required_button)

pages/screening_subject_search/contact_with_patient_page.py

@@ -1,4 +1,4 @@
-from playwright.sync_api import Page
+from playwright.sync_api import Page, expect
 from pages.base_page import BasePage
 from utils.calendar_picker import CalendarPicker
 from datetime import datetime
@@ -142,3 +142,25 @@ def record_contact(self, outcome: str, patient_contacted: str = "Yes") -> None:
         self.select_patient_contacted_dropdown_option(patient_contacted)
         self.select_outcome_dropdown_option(outcome)
         self.click_save_button()
+
+    def verify_contact_with_patient_page_is_displayed(self) -> None:
+        """Verify that the 'Contact With Patient' page is displayed."""
+        expect(self.bowel_cancer_screening_ntsh_page_title).to_have_text(
+            "Contact with Patient", timeout=10000
+        )
+
+    def verify_outcome_select_options(self, options: list) -> None:
+        """
+        Verifies that the 'Outcome' dropdown contains the expected options.
+        Args:
+            options (list): A list containing all of the expected options in the dropdown.
+        Raises:
+            AssertionError: If any of the expected options are missing.
+        """
+        actual_options = self.outcome_dropdown.locator("option").all_text_contents()
+        missing = [val for val in options if val not in actual_options]
+
+        assert not missing, (
+            f"Missing expected dropdown values in the outcome options: {missing}."
+            f"Actual options: {actual_options}"
+        )

pages/screening_subject_search/record_diagnosis_date_page.py

@@ -15,6 +15,7 @@ def __init__(self, page: Page):
         self.diagnosis_date_field = self.page.locator("#diagnosisDate")
         self.reason_dropdown = self.page.locator("#reason")
         self.save_button = self.page.get_by_role("button", name="Save")
+        self.confirm_button = self.page.get_by_role("button", name="Confirm")
 
     def enter_date_in_diagnosis_date_field(self, date: datetime) -> None:
         """
@@ -29,6 +30,8 @@ def enter_date_in_diagnosis_date_field(self, date: datetime) -> None:
     def click_save_button(self) -> None:
         """Clicks the save button."""
         self.click(self.save_button)
+        if self.confirm_button.is_visible():
+            self.click(self.confirm_button)
 
     def get_alert_message(self) -> str:
         """

pages/screening_subject_search/reopen_fobt_screening_episode_page.py

@@ -21,6 +21,11 @@ def __init__(self, page: Page):
         self.reopen_following_non_response_button = self.page.get_by_role(
             "button", name="Reopen following Non-Response"
         )
+        self.reopen_to_confirm_diagnostic_test_result_and_outcome_button = (
+            self.page.get_by_role(
+                "button", name="Reopen to Confirm Diagnostic Test Result and Outcome"
+            )
+        )
 
     def click_reopen_to_book_an_assessment_button(self) -> None:
         """Click the 'Reopen to book an assessment' button."""
@@ -37,3 +42,9 @@ def click_reopen_due_to_subject_or_patient_decision(self) -> None:
     def click_reopen_following_non_response_button(self) -> None:
         """Click the 'Reopen following Non-Response' button."""
         self.safe_accept_dialog(self.reopen_following_non_response_button)
+
+    def click_reopen_to_confirm_diagnostic_test_result_and_outcome_button(self) -> None:
+        """Click the 'Reopen to Confirm Diagnostic Test Result and Outcome' button."""
+        self.safe_accept_dialog(
+            self.reopen_to_confirm_diagnostic_test_result_and_outcome_button
+        )