Changes to compartment 5 and the calendar picker util

Author: adrianoaru-nhs

pages/communication_production/batch_list_page.py

@@ -26,6 +26,9 @@ def __init__(self, page: Page):
         self.deadline_date_filter = self.page.get_by_role("cell", name="").get_by_role(
             "textbox"
         )
+        self.deadline_date_filter_with_input = self.page.locator(
+            "input.form-control.filter.filtering"
+        )
         self.deadline_date_clear_button = self.page.get_by_role("cell", name="Clear")
 
     def verify_batch_list_page_title(self, text) -> None:
@@ -74,6 +77,9 @@ def clear_deadline_filter_date(self) -> None:
         self.click(self.deadline_calendar_picker)
         self.click(self.deadline_date_clear_button)
 
+    def verify_deadline_date_filter_input(self, expected_text: str) -> None:
+        expect(self.deadline_date_filter_with_input).to_have_value(expected_text)
+
 
 class ActiveBatchList(BatchList):
     def __init__(self, page):

pages/screening_subject_search/subject_screening_search_page.py

@@ -1,4 +1,4 @@
-from playwright.sync_api import Page
+from playwright.sync_api import Page, expect
 from pages.base_page import BasePage
 from enum import Enum
 from utils.calendar_picker import CalendarPicker
@@ -123,6 +123,9 @@ def select_dob_using_calendar_picker(self, date) -> None:
         self.click(self.dob_calendar_picker)
         CalendarPicker(self.page).v1_calender_picker(date)
 
+    def verify_date_of_birth_filter_input(self, expected_text: str) -> None:
+        expect(self.date_of_birth_filter).to_have_value(expected_text)
+
 
 class ScreeningStatusSearchOptions(Enum):
     CALL_STATUS = "4001"

tests/smokescreen/bcss_smokescreen_tests.properties

@@ -85,12 +85,12 @@
 # ----------------------------------
 #   compartment 5
 # ----------------------------------
-    c5_eng_number_of_screening_appts_to_attend=2
+    c5_eng_number_of_screening_appts_to_attend=5
 
 # ----------------------------------
 #   compartment 6
 # ----------------------------------
-#    c6_eng_number_of_normal_results_to_record=2
+#    c6_eng_number_of_normal_results_to_record=1
 #    c6_eng_number_of_lnpcp_results_to_record=1
 #    c6_eng_number_of_high_risk_findings_results_to_record=1
 #    c6_eng_number_of_lnpcp_results_over_74_to_record=1

tests/test_calendar_picker_methods.py

@@ -10,42 +10,56 @@
 from pages.base_page import BasePage
 from utils.user_tools import UserTools
 from datetime import datetime
+from sys import platform
 
 
 @pytest.mark.smoke
 def test_calender_picker_v1(page: Page) -> None:
     """
     This test is used to verify that the v1 calendar picker in utils/calendar_picker.py works as intended
     This uses the subject screening search page in order to do so
-    NOTE: currently there is no validation that it has selected the correct date.
-        This should be implemented after each date is selected however the locators on BCSS make this task difficult
     """
     UserTools.user_login(page, "Hub Manager State Registered at BCS01")
     BasePage(page).go_to_screening_subject_search_page()
     SubjectScreeningPage(page).select_dob_using_calendar_picker(datetime(2021, 12, 1))
+    SubjectScreeningPage(page).verify_date_of_birth_filter_input("01/12/2021")
     SubjectScreeningPage(page).click_clear_filters_button()
     SubjectScreeningPage(page).select_dob_using_calendar_picker(datetime(2020, 3, 30))
+    SubjectScreeningPage(page).verify_date_of_birth_filter_input("30/03/2020")
     SubjectScreeningPage(page).click_clear_filters_button()
     SubjectScreeningPage(page).select_dob_using_calendar_picker(datetime(2020, 6, 15))
+    SubjectScreeningPage(page).verify_date_of_birth_filter_input("15/06/2020")
     SubjectScreeningPage(page).click_clear_filters_button()
     SubjectScreeningPage(page).select_dob_using_calendar_picker(datetime.today())
+    SubjectScreeningPage(page).verify_date_of_birth_filter_input(
+        str(datetime.today().strftime("%d/%m/%Y"))
+    )
 
 
 @pytest.mark.smoke
 def test_calender_picker_v2(page: Page) -> None:
     """
     This test is used to verify that the v2 calendar picker in utils/calendar_picker.py works as intended
     This uses the active batch list page in order to do so
-    NOTE: currently there is no validation that it has selected the correct date.
-        This should be implemented after each date is selected however the locators on BCSS make this task difficult
     """
     UserTools.user_login(page, "Hub Manager State Registered at BCS01")
     BasePage(page).go_to_communications_production_page()
     CommunicationsProduction(page).go_to_active_batch_list_page()
     ActiveBatchList(page).enter_deadline_date_filter(datetime(1961, 12, 30))
+    ActiveBatchList(page).verify_deadline_date_filter_input("30 Nov 1961")
     ActiveBatchList(page).clear_deadline_filter_date()
     ActiveBatchList(page).enter_deadline_date_filter(datetime(2026, 12, 1))
+    ActiveBatchList(page).verify_deadline_date_filter_input("1 Dec 2026")
     ActiveBatchList(page).clear_deadline_filter_date()
     ActiveBatchList(page).enter_deadline_date_filter(datetime(1989, 6, 15))
+    ActiveBatchList(page).verify_deadline_date_filter_input("15 Jun 1989")
     ActiveBatchList(page).clear_deadline_filter_date()
     ActiveBatchList(page).enter_deadline_date_filter(datetime.today())
+    if platform == "win32":  # Windows
+        ActiveBatchList(page).verify_deadline_date_filter_input(
+            str(datetime.today().strftime("%#d %b %Y"))
+        )
+    else:  # Linux or Mac
+        ActiveBatchList(page).verify_deadline_date_filter_input(
+            str(datetime.today().strftime("%-d %b %Y"))
+        )

tests_utils/test_calendar_picker_util.py

@@ -14,10 +14,8 @@ def test_calculate_v2_calendar_variables(page: Page):
         month_short,
         current_year,
         year,
-        end_of_current_decade,
         current_decade,
         decade,
-        end_of_current_century,
         current_century,
         century,
     ) = calendar_picker.calculate_v2_calendar_variables(
@@ -29,10 +27,8 @@ def test_calculate_v2_calendar_variables(page: Page):
     assert month_short == "Apr"
     assert current_year == 2020
     assert year == 2025
-    assert end_of_current_decade == "2029"
     assert current_decade == 2020
     assert decade == 2020
-    assert end_of_current_century == "2090"
     assert current_century == 2000
     assert century == 2000
 

utils/calendar_picker.py

@@ -3,7 +3,6 @@
 from playwright.sync_api import Page, Locator
 from pages.base_page import BasePage
 from sys import platform
-import logging
 import pytest
 
 
@@ -16,6 +15,13 @@ def __init__(self, page: Page):
         self.v1_prev_month = self.page.get_by_role("cell", name="‹").locator("div")
         self.v1_next_month = self.page.get_by_role("cell", name="›").locator("div")
         self.v1_next_year = self.page.get_by_role("cell", name="»").locator("div")
+        self.v1_calendar_current_date = self.page.locator(
+            'td.title[colspan="5"][style="cursor: move;"]'
+        )
+        # V2 Calendar picker locators
+        self.v2date_picker_switch = self.page.locator(
+            'th.datepicker-switch[colspan="5"]:visible'
+        )
         # Book Appointment picker locators
         self.appointments_prev_month = self.page.get_by_role(
             "link", name="<-", exact=True
@@ -98,23 +104,32 @@ def select_day(self, date: datetime) -> None:
             "cell", name=day_to_select
         ).count()
 
+        all_days = self.page.locator(".day").all()
+
+        matching_days = [
+            day
+            for day in all_days
+            if day.evaluate("el => el.textContent.trim()") == day_to_select
+        ]
+
         if int(day_to_select) < 15 and number_of_cells_with_day > 1:
-            self.click(self.page.locator(".day", has_text=day_to_select).first)
+            self.click(matching_days[0].first)
         elif int(day_to_select) > 15 and number_of_cells_with_day > 1:
-            self.click(self.page.locator(".day", has_text=day_to_select).last)
+            self.click(matching_days[0].last)
         else:
-            self.click(self.page.locator(".day", has_text=day_to_select))
+            self.click(matching_days[0])
 
     def v1_calender_picker(self, date: datetime) -> None:
         """
         This is the main method used to traverse the v1 calendar picker (e.g. the one on the subject screening search page)
         You provide it with a date and it will call the necessary functions to calculate how to navigate to the specified date
         """
-        current_date = datetime.today()
+        current_date = datetime.strptime(
+            self.v1_calendar_current_date.inner_text(), "%B, %Y"
+        )
         years_to_traverse, months_to_traverse = (
             self.calculate_years_and_months_to_traverse(date, current_date)
         )
-
         self.traverse_years_in_v1_calendar(years_to_traverse)
 
         self.traverse_months_in_v1_calendar(months_to_traverse)
@@ -132,21 +147,17 @@ def calculate_v2_calendar_variables(
             month_short: the wanted month is short format (e.g. Jun)
             current_year: the current year in yyyy format (e.g. 2025)
             year: the wanted year in yyyy format (e.g. 1983)
-            end_of_current_decade: the end of the current decade in yyyy format (e.g. 2029)
             current_decade: the current decade in yyyy format (e.g. 2020)
             decade: the wanted decade in yyyy format (e.g. 1980)
-            end_of_current_century: 10 years before the end of the current century in yyyy format (e.g. 2090)
             current_century: the current century in yyyy format (e.g. 2000/2100)
             century: the wanted century in yyyy format (e.g. 1900)
         """
         current_month_long = str(current_date.strftime("%B"))
         current_year = int(current_date.strftime("%Y"))
         current_century = (current_year // 100) * 100
-        end_of_current_century = str(current_century + 90)
         current_decade = (
             ((current_year - current_century) // 10) * 10
         ) + current_century
-        end_of_current_decade = str(current_decade + 9)
 
         year = int(date.strftime("%Y"))
         century = (year // 100) * 100
@@ -160,10 +171,8 @@ def calculate_v2_calendar_variables(
             month_short,
             current_year,
             year,
-            end_of_current_decade,
             current_decade,
             decade,
-            end_of_current_century,
             current_century,
             century,
         )
@@ -174,10 +183,8 @@ def v2_calendar_picker_traverse_back(
         month_long: str,
         current_year: int,
         year: int,
-        end_of_current_decade: str,
         current_decade: int,
         decade: int,
-        end_of_current_century: str,
         current_century: int,
         century: int,
     ) -> tuple[bool, bool, bool, bool]:
@@ -193,22 +200,16 @@ def v2_calendar_picker_traverse_back(
         click_century = False
 
         if current_month_long != month_long:
-            self.click(self.page.get_by_role("cell", name=current_month_long))
+            self.click(self.v2date_picker_switch)
             click_month = True
         if current_year != year:
-            self.click(
-                self.page.get_by_role("cell", name=str(current_year), exact=True)
-            )
+            self.click(self.v2date_picker_switch)
             click_year = True
         if current_decade != decade:
-            self.click(
-                self.page.get_by_role("cell", name=("-" + str(end_of_current_decade)))
-            )
+            self.click(self.v2date_picker_switch)
             click_decade = True
         if current_century != century:
-            self.click(
-                self.page.get_by_role("cell", name=("-" + str(end_of_current_century)))
-            )
+            self.click(self.v2date_picker_switch)
             click_century = True
 
         return click_month, click_year, click_decade, click_century
@@ -250,10 +251,8 @@ def v2_calendar_picker(self, date: datetime) -> None:
             month_short,
             current_year,
             year,
-            end_of_current_decade,
             current_decade,
             decade,
-            end_of_current_century,
             current_century,
             century,
         ) = self.calculate_v2_calendar_variables(date, current_date)
@@ -264,10 +263,8 @@ def v2_calendar_picker(self, date: datetime) -> None:
                 month_long,
                 current_year,
                 year,
-                end_of_current_decade,
                 current_decade,
                 decade,
-                end_of_current_century,
                 current_century,
                 century,
             )

utils/oracle/oracle_specific_functions.py

@@ -289,7 +289,7 @@ def get_subjects_with_booked_appointments(subjects_to_retrieve: int) -> pd.DataF
     and a.cancel_dna_reason_id is null
     and a.appointment_date <= sysdate
     and tk.tk_type_id = 2
-    and tk.datestamp > add_months(sysdate,-24)
+    --and tk.datestamp > add_months(sysdate,-24)
     order by a.appointment_date desc
     fetch first {subjects_to_retrieve} rows only
     """