Merge branch 'main' of github.com:NHSDigital/bcss-playwright into feature/BCSS-21315-fobtregressiontests-scenario-11

Author: adrianoaru-nhs

classes/episode/latest_episode_latest_investigation_dataset.py

@@ -52,6 +52,6 @@ def from_description(cls, description: str) -> str:
             ValueError: If the description is not recognized.
         """
         key = description.strip().lower()
-        if key not in cls._valid_values:
+        if key not in (value.lower() for value in cls._valid_values):
             raise ValueError(f"Unknown investigation dataset filter: '{description}'")
         return key

pages/base_page.py

@@ -237,14 +237,22 @@ def _accept_dialog(self, dialog: Dialog) -> None:
 
     def safe_accept_dialog(self, locator: Locator) -> None:
         """
-        Safely accepts a dialog triggered by a click, avoiding the error:
-        playwright._impl._errors.Error: Dialog.accept: Cannot accept dialog which is already handled!
+        Safely accepts a dialog triggered by a click, logging its contents.
+        Avoids the error: Dialog.accept: Cannot accept dialog which is already handled!
         If no dialog appears, continues without error.
         Args:
             locator (Locator): The locator that triggers the dialog when clicked.
-            example: If clicking a save button opens a dialog, pass that save button's locator.
         """
-        self.page.once("dialog", self._accept_dialog)
+
+        def handle_dialog(dialog: Dialog):
+            try:
+                logging.info(f"[DIALOG APPEARED WITH MESSAGE]: {dialog.message}")
+                dialog.accept()
+            except Exception:
+                logging.warning("Dialog already accepted or handled")
+
+        self.page.once("dialog", handle_dialog)
+
         try:
             self.click(locator)
         except Exception as e:
@@ -271,8 +279,8 @@ def handle_dialog(dialog: Dialog, accept: bool = False):
             actual_text = dialog.message
             try:
                 assert (
-                    actual_text == expected_text
-                ), f"Expected '{expected_text}', but got '{actual_text}'"
+                    expected_text in actual_text
+                ), f"Expected dialog to contain '{expected_text}', but got '{actual_text}'"
             except AssertionError as e:
                 self._dialog_assertion_error = e
             if accept:

pages/datasets/cancer_audit_datasets_page.py

@@ -175,7 +175,7 @@ def select_first_definitive_teatment_information_option(self, option: str) -> No
 NOT_REPORTED_CODE = "202140~~202188"
 
 
-class ASAGradeOptions(StrEnum):
+class CancerASAGradeOptions(StrEnum):
     """Enum for ASA Grade options."""
 
     FIT = "17009"
@@ -186,22 +186,38 @@ class ASAGradeOptions(StrEnum):
     NOT_KNOWN = "17015"
 
 
-class YesNoOptions(StrEnum):
+class CancerYesNoOptions(StrEnum):
     """Enum for YesNo options."""
 
     YES = "17058"
     NO = "17059"
 
 
-class MetastasesPresentOptions(StrEnum):
+class CancerRadiologyYesNoOptions(StrEnum):
+    """Enum for Yes/No options specific to Radiology fields"""
+
+    YES = "17058~~204365"
+    NO = "17059~~204366"
+    NOT_REPORTED = "202140"
+
+
+class CancerTaggingAgentDrugAdministeredOptions(StrEnum):
+    """Enum for Tagging Agent Given Drugs Administered"""
+
+    YES = "17058~~204368"
+    NO = "17059"
+    NOT_REPORTED = "202140"
+
+
+class CancerMetastasesPresentOptions(StrEnum):
     """Enum for Metastases Present options."""
 
     CERTAIN = "17131~~202199"
     NONE = "17130"
     NOT_REPORTED = NOT_REPORTED_CODE
 
 
-class FinalPreTreatmentTCategoryOptions(StrEnum):
+class CancerFinalPreTreatmentTCategoryOptions(StrEnum):
     """Enum for Final Pre-Treatment T Category options."""
 
     CTX = "17356"
@@ -213,7 +229,7 @@ class FinalPreTreatmentTCategoryOptions(StrEnum):
     NOT_REPORTED = NOT_REPORTED_CODE
 
 
-class FinalPreTreatmentNCategoryOptions(StrEnum):
+class CancerFinalPreTreatmentNCategoryOptions(StrEnum):
     """Enum for Final Pre-Treatment N Category options."""
 
     CNX = "202201"
@@ -223,7 +239,7 @@ class FinalPreTreatmentNCategoryOptions(StrEnum):
     NOT_REPORTED = NOT_REPORTED_CODE
 
 
-class ReasonNoTreatmentRecievedOptions(StrEnum):
+class CancerReasonNoTreatmentReceivedOptions(StrEnum):
     """Enum for Reason No Treatment Received options."""
 
     ADVANCED_DISEASE = "99016"
@@ -234,7 +250,7 @@ class ReasonNoTreatmentRecievedOptions(StrEnum):
     UNKNOWN = "99018"
 
 
-class PreviouslyExcisedTumorOptions(StrEnum):
+class CancerPreviouslyExcisedTumorOptions(StrEnum):
     """Enum for Previously Excised Tumor options."""
 
     YES = "17058~~305403"
@@ -243,14 +259,14 @@ class PreviouslyExcisedTumorOptions(StrEnum):
     NOT_REPORTED = "202140"
 
 
-class TreatmentTypeOptions(StrEnum):
+class CancerTreatmentTypeOptions(StrEnum):
     """Enum for Treatment Type options."""
 
     SURGICAL = "202143"
     NON_SURGICAL = "202144"
 
 
-class TreatmentGivenOptions(StrEnum):
+class CancerTreatmentGivenOptions(StrEnum):
     """Enum for Treatment Given options."""
 
     CHEMOTHERAPY = "202160~~202184,202217,202218,202219,202220,202221,202222,202223,202224,202225,202226,202227,202228,202287,305395,305397"
@@ -269,14 +285,14 @@ class CancerTreatmentIntentOptions(StrEnum):
     NOT_KNOWN = "17373"
 
 
-class NHSOrPrivateOptions(StrEnum):
+class CancerNHSOrPrivateOptions(StrEnum):
     """Enum for NHS or Private options."""
 
     NHS = "202153~~202177,202178"
     PRIVATE = "202154~~202179"
 
 
-class TreatmentProviderLookupOptions(StrEnum):
+class CancerTreatmentProviderLookupOptions(StrEnum):
     """Enum for Treatment Provider lookup options."""
 
     ADVANCE_NURSE_PRACTITIONER_1 = "51905"
@@ -305,7 +321,7 @@ class TreatmentProviderLookupOptions(StrEnum):
     BUSHBURY_HEALTH_CENTRE = "51801"
 
 
-class ConsultantLookupOptions(StrEnum):
+class CancerConsultantLookupOptions(StrEnum):
     """Enum for Consultant lookup options."""
 
     B_FRAME = "201"