As per PR 42 comments, Pushing the changes.

Author: vidhya-chandra1

pages/screening_subject_search/contact_with_patient_page.py

@@ -1,48 +1,46 @@
-from playwright.sync_api import Page, expect
+from playwright.sync_api import Page, expect, Locator
 from pages.base_page import BasePage
+from enum import Enum
+from utils.calendar_picker import CalendarPicker
 
 
-class PractitionerAvailabilityPage(BasePage):
+class ContactWithPatientPage(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
         self.page = page
-        # Practitioner Availability - page locators
-        self.site_id_dropdown = page.locator("#UI_SITE_ID")
-        self.screening_practitioner_dropdown = page.locator("#UI_PRACTITIONER_ID")
+
+        # Contact With Patient - Page Locators
+        self.contact_direction_dropdown = page.locator("#UI_DIRECTION")
+        self.contact_made_between_Patient_and_dropdown = page.locator("#UI_CALLER_ID")
         self.calendar_button = page.get_by_role("button", name="Calendar")
-        self.show_button = page.get_by_role("button", name="Show")
-        self.time_from_text_field = page.get_by_role("textbox", name="From:")
-        self.time_to_text_field = page.get_by_role("textbox", name="To:")
-        self.calculate_slots_button = page.get_by_role("button", name="Calculate Slots")
-        self.number_of_weeks_text_field = page.locator("#FOR_WEEKS")
+        self.time_from_text_field = page.get_by_role("textbox", name="Start Time")
+        self.time_to_text_field = page.get_by_role("textbox", name="End Time")
+        self.discussion_record_text_field = page.get_by_role("textbox", name="Discussion Record")
+        self.outcome_dropdown = page.locator("##UI_OUTCOME")
         self.save_button = page.get_by_role("button", name="Save")
 
-    def select_site_dropdown_option(self, site_to_use: str) -> None:
-        self.site_id_dropdown.select_option(label=site_to_use)
+    def select_direction_dropdown_option(self, direction: str) -> None:
+        self.contact_direction_dropdown.select_option(label=direction)
 
-    def select_practitioner_dropdown_option(self, practitioner: str) -> None:
-        self.screening_practitioner_dropdown.select_option(label=practitioner)
+    def select_callerid_dropdown_option(self, callerid: str) -> None:
+        self.contact_made_between_Patient_and_dropdown.select_option(label=callerid)
 
     def click_calendar_button(self) -> None:
         self.click(self.calendar_button)
 
-    def click_show_button(self) -> None:
-        self.click(self.show_button)
-
     def enter_start_time(self, start_time: str) -> None:
         self.time_from_text_field.fill(start_time)
 
     def enter_end_time(self, end_time: str) -> None:
         self.time_to_text_field.fill(end_time)
 
-    def click_calculate_slots_button(self) -> None:
-        self.click(self.calculate_slots_button)
+    def enter_discussion_record_text(self, value: str) -> None:
+        self.discussion_record_text_field.fill(value)
 
-    def enter_number_of_weeks(self, weeks: str) -> None:
-        self.number_of_weeks_text_field.fill(weeks)
+    def select_outcome_dropdown_option(self, outcome: str) -> None:
+        self.outcome_dropdown.select_option(label=outcome)
 
     def click_save_button(self) -> None:
         self.click(self.save_button)
 
-    def slots_updated_message_is_displayed(self, message: str) -> None:
-        expect(self.page.get_by_text(message)).to_be_visible()
+

tests/smokescreen/test_compartment_5.py

@@ -156,46 +156,25 @@ def test_compartment_5(page: Page, smokescreen_properties: dict) -> None:
     # Select 'Record other post-investigation contact' button
     page.get_by_role("button", name="Record other post-").click()
 
-    # Complete 'Contact Direction',   To patient
-    # 'Contact made between patient and',  Selects the top option in the dropdown
+    # Complete 'Contact Direction', To patient
+    # 'Contact made between patient and', Selects the top option in the dropdown
     # 'Date of Patient Contact',  Today
     # 'Duration',  01:00
     # 'Start Time',  11:00
     # 'End Time',  12:00
     # 'Discussion Record'   TEST AUTOMATION
     # select 'Outcome' - 'Post-investigation Appointment Not Required' and click 'Save'
 
-    ContactWithPatientPage(page).select_direction_dropdown_option(
-        smokescreen_properties["c5_eng_direction1","c5_eng_direction2"]
-    )
-    ContactWithPatientPage(page).select_callerid_dropdown_option(
-        smokescreen_properties["c5_eng_callerid"]
-    )
+    ContactWithPatientPage(page).select_direction_dropdown_option("To patient")
+    ContactWithPatientPage(page).select_callerid_dropdown_option(index=0)
     ContactWithPatientPage(page).click_calendar_button()
     CalendarPicker(page).select_day(datetime.today())
     ContactWithPatientPage(page).enter_start_time("11:00")
     ContactWithPatientPage(page).enter_end_time("12:00")
     ContactWithPatientPage(page).enter_discussion_record_text("Test Automation")
-    ContactWithPatientPage(page).select_outcome_dropdown_option(
-        smokescreen_properties["c5_eng_outcome1","c5_eng_outcome2"]
-    )
+    ContactWithPatientPage(page).select_outcome_dropdown_option("Post-investigation Appointment Not Required")
     ContactWithPatientPage(page).click_save_button()
 
-    #page.locator("#UI_DIRECTION").select_option(label="To patient")
-    #page.locator("#UI_CALLER_ID").select_option(index=0)
-    #page.get_by_role("button", name="Calendar").click()
-    #CalendarPicker(page).v1_calender_picker(datetime.today())
-    #page.locator("#UI_START_TIME").click()
-    #page.locator("#UI_START_TIME").fill("11:00")
-    #page.locator("#UI_END_TIME").click()
-    #page.locator("#UI_END_TIME").fill("12:00")
-    #page.locator("#UI_COMMENT_ID").click()
-    #page.locator("#UI_COMMENT_ID").fill("Test Automation")
-    #page.locator("#UI_OUTCOME").select_option(
-        #label="Post-investigation Appointment Not Required"
-    #)
-    #page.get_by_role("button", name="Save").click()
-
     verify_subject_event_status_by_nhs_no(
         page, nhs_no, "A361 - Other Post-investigation Contact Required"
     )