Merge branch 'main' of https://github.com/NHSDigital/bcss-playwright into feature/BCSS-20478-c6-pom-handover-into-symptomatic-care-page

Author: vidhya-chandra1

docs/utility-guides/BatchProcessing.md

@@ -43,8 +43,8 @@ This will call the other two functions in order to successfully process a batch.
   - Type: `str`
   - This is the description of the batch. For example: **Pre-invitation (FIT)** or **Post-investigation Appointment NOT Required**
 - `latest_event_status`:
-  - Type: `str`
-  - This is the status the subject will get updated to after the batch has been processed. It is used to check that the subject has been updated to the correct status after a batch has been printed
+  - Type: `str | None`
+  - This is the status the subject will get updated to after the batch has been processed. It is used to check that the subject has been updated to the correct status after a batch has been printed. If there are multiple different status in the same batch, provide them all in a list.
 
 #### Optional Arguments
 

pages/datasets/investigation_dataset_page.py

@@ -0,0 +1,29 @@
+from playwright.sync_api import Page
+from pages.base_page import BasePage
+from datetime import datetime
+from utils.calendar_picker import CalendarPicker
+
+
+class RecordDiagnosisDatePage(BasePage):
+    """Record Diagnosis Date Page locators, and methods for interacting with the page."""
+
+    def __init__(self, page: Page):
+        super().__init__(page)
+        self.page = page
+        # Record Diagnosis Date - page locators
+        self.diagnosis_date_field = self.page.locator("#diagnosisDate")
+        self.save_button = self.page.get_by_role("button", name="Save")
+
+    def enter_date_in_diagnosis_date_field(self, date: datetime) -> None:
+        """
+        Enters a date in the diagnosis date field.
+        Args:
+            date (datetime): The date to enter in the field.
+        """
+        self.click(self.diagnosis_date_field)
+        CalendarPicker(self.page).v2_calendar_picker(date)
+        self.diagnosis_date_field.press("Enter")
+
+    def click_save_button(self) -> None:
+        """Clicks the save button."""
+        self.click(self.save_button)

pages/screening_subject_search/record_diagnosis_date_page.py

@@ -56,6 +56,10 @@ def __init__(self, page: Page):
             "button", name="Advance FOBT Screening Episode"
         )
 
+    def wait_for_page_title(self) -> None:
+        """Waits for the page to be the Subject Screening Summary"""
+        self.subject_screening_summary.wait_for()
+
     def verify_result_contains_text(self, text) -> None:
         """Verify that the result contains the given text."""
         expect(self.display_rs).to_contain_text(text)
@@ -84,17 +88,37 @@ def verify_latest_event_status_header(self) -> None:
         """Verify that the latest event status header is visible."""
         expect(self.latest_event_status).to_be_visible()
 
-    def verify_latest_event_status_value(self, latest_event_status: str) -> None:
+    def verify_latest_event_status_value(self, latest_event_status: str | list) -> None:
         """Verify that the latest event status value is visible."""
-        logging.info(f"Verifying subject has the status: {latest_event_status}")
-        latest_event_status_cell = self.get_latest_event_status_cell(
+        self.wait_for_page_title()
+        latest_event_status_locator = self.get_visible_status_from_list(
             latest_event_status
         )
+        status = latest_event_status_locator.inner_text()
+        logging.info(f"Verifying subject has the status: {status}")
         try:
-            expect(latest_event_status_cell).to_be_visible()
-            logging.info(f"Subject has the status: {latest_event_status}")
+            expect(latest_event_status_locator).to_be_visible()
+            logging.info(f"Subject has the status: {status}")
         except Exception:
-            pytest.fail(f"Subject does not have the status: {latest_event_status}")
+            pytest.fail(f"Subject does not have the status: {status}")
+
+    def get_visible_status_from_list(self, latest_event_status) -> Locator:
+        """
+        Get the first visible status from the latest event status string or list.
+
+        Args:
+            latest_event_status (str | list): The latest event status to check.
+
+        Returns:
+            Locator: The locator for the first visible status.
+        """
+        if isinstance(latest_event_status, str):
+            latest_event_status = [latest_event_status]
+        for status in latest_event_status:
+            locator = self.page.get_by_role("cell", name=status, exact=True)
+            if locator.is_visible():
+                return locator
+        logging.error("Unable to find any of the listed statuses")
 
     def click_subjects_events_notes(self) -> None:
         """Click on the 'Subject Events & Notes' link."""