wip

Author: Andyg79

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,38 +186,38 @@ class ASAGradeOptions(StrEnum):
     NOT_KNOWN = "17015"
 
 
-class YesNoOptions(StrEnum):
+class CancerYesNoOptions(StrEnum):
     """Enum for YesNo options."""
 
     YES = "17058"
     NO = "17059"
 
 
-class RadiologyYesNoOptions(StrEnum):
+class CancerRadiologyYesNoOptions(StrEnum):
     """Enum for Yes/No options specific to Radiology fields"""
 
     YES = "17058~~204365"
     NO = "17059~~204366"
     NOT_REPORTED = "202140"
 
 
-class TaggingAgentDrugAdministeredOptions(StrEnum):
+class CancerTaggingAgentDrugAdministeredOptions(StrEnum):
     """Enum for Tagging Agent Given Drugs Administered"""
 
     YES = "17058~~204368"
     NO = "17059"
     NOT_REPORTED = "202140"
 
 
-class MetastasesPresentOptions(StrEnum):
+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"
@@ -229,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"
@@ -239,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"
@@ -250,7 +250,7 @@ class ReasonNoTreatmentRecievedOptions(StrEnum):
     UNKNOWN = "99018"
 
 
-class PreviouslyExcisedTumorOptions(StrEnum):
+class CancerPreviouslyExcisedTumorOptions(StrEnum):
     """Enum for Previously Excised Tumor options."""
 
     YES = "17058~~305403"
@@ -259,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"
@@ -285,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"
@@ -321,7 +321,7 @@ class TreatmentProviderLookupOptions(StrEnum):
     BUSHBURY_HEALTH_CENTRE = "51801"
 
 
-class ConsultantLookupOptions(StrEnum):
+class CancerConsultantLookupOptions(StrEnum):
     """Enum for Consultant lookup options."""
 
     B_FRAME = "201"

pages/datasets/investigation_dataset_page.py

@@ -1577,6 +1577,12 @@ class ExtracolonicSummaryCodeOptions(StrEnum):
     NOT_REPORTED = "202140"
 
 
+class TaggingAgentDrugAdministeredOptions(StrEnum):
+    YES = "17058~~204368"
+    NO = "17059"
+    NOT_REPORTED = "202140"
+
+
 # Registry of all known Enums to search when matching string values
 ALL_ENUMS: List[type[Enum]] = [
     obj

tests/regression/regression_tests/fobt_regression_tests/test_scenario_8.py

@@ -1,9 +1,10 @@
 import pytest
 import logging
-from datetime import datetime
 from playwright.sync_api import Page
 from pages.datasets.cancer_audit_datasets_page import (
-    RadiologyYesNoOptions,
+    CancerRadiologyYesNoOptions,
+)
+from pages.datasets.investigation_dataset_page import (
     TaggingAgentDrugAdministeredOptions,
     YesNoOptions,
 )
@@ -18,53 +19,22 @@
     SegmentalInadequacyOptions,
 )
 from pages.datasets.subject_datasets_page import SubjectDatasetsPage
-from pages.screening_practitioner_appointments.appointment_detail_page import (
-    AppointmentDetailPage,
-)
-from utils.calendar_picker import CalendarPicker
-from utils.datasets.investigation_datasets import (
-    get_default_endoscopy_information,
-    get_default_general_information,
-)
-from utils.oracle.subject_creation_util import CreateSubjectSteps
 from utils.user_tools import UserTools
 from utils.subject_assertion import subject_assertion
-from utils.call_and_recall_utils import CallAndRecallUtils
 from utils import screening_subject_page_searcher
-from utils.batch_processing import batch_processing
-from utils.fit_kit import FitKitLogged, FitKitGeneration
 from pages.screening_subject_search.subject_screening_summary_page import (
     SubjectScreeningSummaryPage,
 )
-from utils.appointments import book_appointments
 from pages.logout.log_out_page import LogoutPage
 from pages.base_page import BasePage
 from pages.screening_subject_search.advance_fobt_screening_episode_page import (
     AdvanceFOBTScreeningEpisodePage,
 )
-from pages.screening_subject_search.record_diagnosis_date_page import (
-    RecordDiagnosisDatePage,
-)
 from utils.appointments import AppointmentAttendance
 from pages.datasets.colonoscopy_dataset_page import (
     ColonoscopyDatasetsPage,
     FitForColonoscopySspOptions,
 )
-from utils.sspi_change_steps import SSPIChangeSteps
-from pages.screening_subject_search.reopen_fobt_screening_episode_page import (
-    ReopenFOBTScreeningEpisodePage,
-)
-from utils.oracle.oracle import OracleDB
-from utils.oracle.subject_selector import SubjectSelector
-from classes.subject_selection_query_builder.subject_selection_criteria_key import (
-    SubjectSelectionCriteriaKey as Key,
-)
-from pages.screening_subject_search.contact_with_patient_page import (
-    ContactWithPatientPage,
-)
-from pages.screening_subject_search.attend_diagnostic_test_page import (
-    AttendDiagnosticTestPage,
-)
 from utils.investigation_dataset import InvestigationDatasetCompletion
 from pages.screening_subject_search.diagnostic_test_outcome_page import (
     DiagnosticTestOutcomePage,
@@ -533,11 +503,11 @@ def test_scenario_8(page: Page) -> None:
     # And I set the following fields and values within the Contrast, Tagging & Drug Information:
     # And I add the following Additional Bowel Preparation drugs and values within the Investigation Dataset for this subject:
     contrast_tagging_and_drug = {
-        "iv buscopan administered": RadiologyYesNoOptions.NO,
+        "iv buscopan administered": CancerRadiologyYesNoOptions.NO,
         "contraindicated": YesNoOptions.NO,
-        "iv contrast administered": RadiologyYesNoOptions.NO,
+        "iv contrast administered": CancerRadiologyYesNoOptions.NO,
         "tagging agent given": TaggingAgentDrugAdministeredOptions.YES,
-        "additional bowel preparation administered": RadiologyYesNoOptions.YES,
+        "additional bowel preparation administered": CancerRadiologyYesNoOptions.YES,
         "drug_type1": DrugTypeOptions.PICOLAX,
         "drug_dose1": "1",
     }

utils/investigation_dataset.py

@@ -1,3 +1,5 @@
+from altair import value
+from pandas import options
 from playwright.sync_api import Page
 from enum import StrEnum
 from datetime import datetime
@@ -481,43 +483,52 @@ def fill_out_general_information(self, general_information: dict) -> None:
     def fill_out_contrast_tagging_and_drug_information(
         self, contrast_tagging_and_drug: dict
     ) -> None:
-        # Contrast Tagging & Drug Information
+        logging.info("🧪 Filling out Contrast, Tagging & Drug Information")
         self.investigation_datasets_pom.click_show_contrast_tagging_and_drug_information()
 
-        # Use for loop and match-case for contrast tagging and drug fields
+        field_map = {
+            "iv buscopan administered": "#UI_BUSCOPAN_ADMINISTERED",
+            "iv contrast administered": "#UI_CONTRAST_ADMINISTERED",
+            "tagging agent given": "#UI_TAGGING_AGENT_GIVEN_DRUGS_ADMINISTERED",
+            "additional bowel preparation administered": "#UI_ADDITIONAL_BOWEL_PREPARATION_ADMINISTERED",
+            "contraindicated": "#UI_BUSCOPAN_CONTRAINDICATED",
+        }
+        normalized_map = {k.strip().lower(): v for k, v in field_map.items()}
+
         for key, value in contrast_tagging_and_drug.items():
-            match key:
-                case "iv buscopan administered":
-                    DatasetFieldUtil(self.page).populate_select_locator_for_field(
-                        "IV Buscopan Administered", value
-                    )
-                case "iv contrast administered":
-                    DatasetFieldUtil(self.page).populate_select_locator_for_field(
-                        "IV Contrast Administered", value
-                    )
-                case "tagging agent given":
-                    DatasetFieldUtil(self.page).populate_select_locator_for_field(
-                        "Tagging Agent Given", value
+            normalized_key = key.strip().lower()
+
+            if normalized_key in normalized_map:
+                selector = normalized_map[normalized_key]
+
+                if normalized_key == "tagging agent given":
+                    logging.info(
+                        "🔍 Waiting for 'Tagging Agent Given' dropdown to become visible..."
                     )
-                case "additional bowel preparation administered":
-                    DatasetFieldUtil(self.page).populate_select_locator_for_field(
-                        "Additional Bowel Preparation Administered", value
+                    self.page.locator(selector).wait_for(state="visible")
+                    options = self.page.locator(selector + " option").all_inner_texts()
+                    logging.info(
+                        f"🧾 Options available in 'Tagging Agent Given': {options}"
                     )
-                case "contraindicated":
-                    DatasetFieldUtil(
-                        self.page
-                    ).populate_select_locator_for_field_inside_div(
-                        "Contraindicated", "UI_BUSCOPAN_CONTRAINDICATED_ROW", value
+                    logging.info(
+                        f"✅ Dropdown visible. Selecting value: {to_enum_name_or_value(value)}"
                     )
-                case k if k.startswith(("drug_type", "drug_dose")):
-                    # Extract all drug-related keys/values from the main dict
-                    drug_info = {
-                        dk: dv
-                        for dk, dv in contrast_tagging_and_drug.items()
-                        if dk.startswith(("drug_type", "drug_dose"))
-                    }
-                    # Call the existing drug filling method once
-                    self.fill_out_drug_information(drug_info)
+                else:
+                    logging.info(f"Setting {key}: {to_enum_name_or_value(value)}")
+
+                self.page.select_option(selector, value)
+
+            elif normalized_key.startswith(("drug_type", "drug_dose")):
+                drug_info = {
+                    dk: dv
+                    for dk, dv in contrast_tagging_and_drug.items()
+                    if dk.strip().lower().startswith(("drug_type", "drug_dose"))
+                }
+                self.fill_out_drug_information(drug_info)
+                break
+
+            else:
+                logging.warning(f"⚠️ Unknown contrast field: {key}")
 
     def fill_out_drug_information(self, drug_information: dict) -> None:
         """