Merge remote-tracking branch 'origin' into feature/BCSS-20365-compartment-5-pom-for-contact-with-patient-page

# Conflicts:
#	tests/smokescreen/test_compartment_5.py

Author: Andyg79

pages/datasets/colonoscopy_dataset_page.py

@@ -0,0 +1,79 @@
+from playwright.sync_api import Page
+from pages.base_page import BasePage
+from enum import Enum
+
+
+class ColonoscopyDatasetsPage(BasePage):
+    """
+    This class contains locators and methods to interact with the Colonoscopy Datasets page.
+    """
+
+    def __init__(self, page: Page):
+        super().__init__(page)
+        self.page = page
+
+        # Colonoscopy datasets page locators
+        self.save_dataset_button = self.page.locator(
+            "#UI_DIV_BUTTON_SAVE1"
+        ).get_by_role("button", name="Save Dataset")
+
+        self.select_asa_grade_dropdown = self.page.get_by_label("ASA Grade")
+
+        self.select_fit_for_colonoscopy_dropdown = self.page.get_by_label(
+            "Fit for Colonoscopy (SSP)"
+        )
+
+        self.dataset_complete_radio_button_yes = self.page.get_by_role(
+            "radio", name="Yes"
+        )
+
+        self.dataset_complete_radio_button_no = self.page.get_by_role(
+            "radio", name="No"
+        )
+
+    def save_dataset(self) -> None:
+        self.click(self.save_dataset_button)
+
+    def select_asa_grade_option(self, option: str) -> None:
+        """
+        This method is designed to select a specific grade option from the colonoscopy dataset page, ASA Grade dropdown menu.
+        Args:
+        option (str): The ASA grade option to be selected. This should be a string that matches one of the available options in the dropdown menu.
+            Valid options are: "FIT", "RELEVANT_DISEASE", "UNABLE_TO_ASSESS", RESTRICTIVE_DISEASE, "LIFE_THREATENING_DISEASE", "MORIBUND", "NOT_APPLICABLE", or "NOT_KNOWN".
+        Returns:
+        None
+        """
+        self.select_asa_grade_dropdown.select_option(option)
+
+    def select_fit_for_colonoscopy_option(self, option: str) -> None:
+        """
+        This method is designed to select a specific option from the colonoscopy dataset page, Fit for Colonoscopy (SSP) dropdown menu.
+        Args:
+        option (str): The option to be selected. This should be a string that matches one of the available options in the dropdown menu.
+            Valid options are: "YES", "NO", or "UNABLE_TO_ASSESS".
+        Returns:
+        None
+        """
+        self.select_fit_for_colonoscopy_dropdown.select_option(option)
+
+    def click_dataset_complete_radio_button_yes(self) -> None:
+        self.dataset_complete_radio_button_yes.check()
+
+    def click_dataset_complete_radio_button_no(self) -> None:
+        self.dataset_complete_radio_button_no.check()
+
+
+class AsaGradeOptions(Enum):
+    FIT = "17009"
+    RELEVANT_DISEASE = "17010"
+    RESTRICTIVE_DISEASE = "17011"
+    LIFE_THREATENING_DISEASE = "17012"
+    MORIBUND = "17013"
+    NOT_APPLICABLE = "17014"
+    NOT_KNOWN = "17015"
+
+
+class FitForColonoscopySspOptions(Enum):
+    YES = "17058"
+    NO = "17059"
+    UNABLE_TO_ASSESS = "17954"

pages/datasets/subject_datasets_page.py

@@ -0,0 +1,39 @@
+from playwright.sync_api import Page
+from pages.base_page import BasePage
+
+
+class SubjectDatasetsPage(BasePage):
+    """
+    This class contains locators and methods to interact with the Subject Datasets page.
+    """
+
+    def __init__(self, page: Page):
+        super().__init__(page)
+        self.page = page
+        # Subject datasets page locators
+        self.colonoscopy_show_dataset_button = (
+            self.page.locator("div")
+            # Note: The "(1 Dataset)" part of the line below may be dynamic and may change based on the actual dataset count.
+            .filter(
+                has_text="Colonoscopy Assessment (1 Dataset) Show Dataset"
+            ).get_by_role("link")
+        )
+        self.investigation_show_dataset_button = (
+            self.page.locator("div")
+            # Note: The "(1 Dataset)" part of the line below may be dynamic and may change based on the actual dataset count.
+            .filter(has_text="Investigation (1 Dataset) Show Dataset").get_by_role(
+                "link"
+            )
+        )
+
+    def click_colonoscopy_show_datasets(self) -> None:
+        """
+        This method clicks on the 'Show Dataset' button for the Colonoscopy Assessment row on the Subject Datasets Page.
+        """
+        self.click(self.colonoscopy_show_dataset_button)
+
+    def click_investigation_show_datasets(self) -> None:
+        """
+        This method clicks on the 'Show Dataset' button for the Investigation row on the Subject Datasets Page.
+        """
+        self.click(self.investigation_show_dataset_button)

pages/screening_practitioner_appointments/subject_datasets.py

@@ -1,15 +1,17 @@
 import pytest
-from playwright.sync_api import Page, expect
+from playwright.sync_api import Page
 from pages.logout.log_out_page import Logout
 from pages.base_page import BasePage
 from pages.screening_practitioner_appointments.appointment_calendar_page import AppointmentCalendar
 from pages.screening_practitioner_appointments.appointment_detail_page import AppointmentDetail
 from pages.screening_practitioner_appointments.screening_practitioner_appointments import (
     ScreeningPractitionerAppointmentsPage,
 )
-from pages.screening_practitioner_appointments.screening_practitioner_day_view import ScreeningPractitionerDayView
-from pages.screening_practitioner_appointments.subject_datasets import (
-    SubjectDatasets,
+from pages.datasets.subject_datasets_page import (
+    SubjectDatasetsPage,
+)
+from pages.datasets.colonoscopy_dataset_page import (
+    ColonoscopyDatasetsPage,
     FitForColonoscopySspOptions,
     AsaGradeOptions,
 )
@@ -71,11 +73,11 @@ def test_compartment_5(page: Page, smokescreen_properties: dict) -> None:
 
     AppointmentCalendar(page).click_view_appointments_on_this_day_button()
     ScreeningPractitionerDayView(page).click_calendar_button()
-    date_from_util = datetime(2025, 4, 29)
+    date_from_util = datetime(2025, 4, 30)
     CalendarPicker(page).v1_calender_picker(date_from_util)
 
     # Select subject from inital test data util
-    ScreeningPractitionerDayView(page).click_patient_link("STARLESS BLUSH")
+    ScreeningPractitionerDayView(page).click_patient_link("DIVIDEND MUZZLE")
 
     # Select Attendance radio button, tick Attended checkbox, set Attended Date to yesterday's (system) date and then press Save
     AppointmentDetail(page).check_attendance_radio()
@@ -88,7 +90,7 @@ def test_compartment_5(page: Page, smokescreen_properties: dict) -> None:
     # Repeat for x Abnormal  patients
 
     # Navigate to the 'Subject Screening Summary' screen for the 1st Abnormal patient
-    nhs_no = "9937265193"  # Test NHS NO for Scaliding Cod
+    nhs_no = "9852356488"  # Test NHS NO for DIVIDEND MUZZLE
     verify_subject_event_status_by_nhs_no(
         page, nhs_no, "J10 - Attended Colonoscopy Assessment Appointment"
     )
@@ -97,23 +99,23 @@ def test_compartment_5(page: Page, smokescreen_properties: dict) -> None:
     SubjectScreeningSummary(page).click_datasets_link()
 
     # Click on 'Show Dataset' next to the Colonoscopy Assessment
-    SubjectDatasets(page).click_show_datasets()
+    SubjectDatasetsPage(page).click_colonoscopy_show_datasets()
 
     # Populate Colonoscopy Assessment Details fields
 
     # ASA Grade  - I - Fit
-    SubjectDatasets(page).select_asa_grade_option(AsaGradeOptions.FIT.value)
+    ColonoscopyDatasetsPage(page).select_asa_grade_option(AsaGradeOptions.FIT.value)
 
     # Fit for Colonoscopy (SSP) - Yes
-    SubjectDatasets(page).select_fit_for_colonoscopy_option(
+    ColonoscopyDatasetsPage(page).select_fit_for_colonoscopy_option(
         FitForColonoscopySspOptions.YES.value
     )
 
     # Click 'Yes' for Dataset Complete?
-    SubjectDatasets(page).click_dataset_complete_radio_button_yes()
+    ColonoscopyDatasetsPage(page).click_dataset_complete_radio_button_yes()
 
     # Click Save Dataset button
-    SubjectDatasets(page).save_dataset()
+    ColonoscopyDatasetsPage(page).save_dataset()
 
     # Click Back
     BasePage(page).click_back_button()