Altering Calendar picker to use the date time utils

Author: adrianoaru-nhs

tests/test_calendar_picker_methods.py

@@ -9,6 +9,7 @@
 from playwright.sync_api import Page
 from pages.base_page import BasePage
 from utils.user_tools import UserTools
+from utils.date_time_utils import DateTimeUtils
 from datetime import datetime
 from sys import platform
 
@@ -57,9 +58,9 @@ def test_calender_picker_v2(page: Page) -> None:
     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"))
+            str(DateTimeUtils.format_date(datetime.today(), "%#d %b %Y"))
         )
     else:  # Linux or Mac
         ActiveBatchList(page).verify_deadline_date_filter_input(
-            str(datetime.today().strftime("%-d %b %Y"))
+            str(DateTimeUtils.format_date(datetime.today(), "%-d %b %Y"))
         )

tests_utils/test_calendar_picker_util.py

@@ -38,10 +38,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(
@@ -53,10 +51,8 @@ def test_calculate_v2_calendar_variables(page: Page):
     assert month_short == "Jan"
     assert current_year == 2020
     assert year == 1963
-    assert end_of_current_decade == "2029"
     assert current_decade == 2020
     assert decade == 1960
-    assert end_of_current_century == "2090"
     assert current_century == 2000
     assert century == 1900
 
@@ -66,10 +62,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(
@@ -81,10 +75,8 @@ def test_calculate_v2_calendar_variables(page: Page):
     assert month_short == "Dec"
     assert current_year == 2020
     assert year == 2356
-    assert end_of_current_decade == "2029"
     assert current_decade == 2020
     assert decade == 2350
-    assert end_of_current_century == "2090"
     assert current_century == 2000
     assert century == 2300
 

utils/calendar_picker.py

@@ -65,8 +65,12 @@ def calculate_years_and_months_to_traverse(
         This function is used when using the v1 calendar picker
         It calculates how many years and months it needs to traverse
         """
-        years_to_traverse = int(current_date.strftime("%Y")) - int(date.strftime("%Y"))
-        months_to_traverse = int(current_date.strftime("%m")) - int(date.strftime("%m"))
+        years_to_traverse = int(DateTimeUtils.format_date(current_date, "%Y")) - int(
+            DateTimeUtils.format_date(date, "%Y")
+        )
+        months_to_traverse = int(DateTimeUtils.format_date(current_date, "%m")) - int(
+            DateTimeUtils.format_date(date, "%m")
+        )
         return years_to_traverse, months_to_traverse
 
     def traverse_years_in_v1_calendar(self, years_to_traverse: int) -> None:
@@ -97,9 +101,9 @@ def select_day(self, date: datetime) -> None:
         It extracts the day from the date and then selects that value in the calendar picker
         """
         if platform == "win32":  # Windows
-            day_to_select = str(date.strftime("%#d"))
+            day_to_select = DateTimeUtils.format_date(date, "%#d")
         else:  # Linux or Mac
-            day_to_select = str(date.strftime("%-d"))
+            day_to_select = DateTimeUtils.format_date(date, "%-d")
         number_of_cells_with_day = self.page.get_by_role(
             "cell", name=day_to_select
         ).count()
@@ -152,18 +156,18 @@ def calculate_v2_calendar_variables(
             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_month_long = DateTimeUtils.format_date(current_date, "%B")
+        current_year = int(DateTimeUtils.format_date(current_date, "%Y"))
         current_century = (current_year // 100) * 100
         current_decade = (
             ((current_year - current_century) // 10) * 10
         ) + current_century
 
-        year = int(date.strftime("%Y"))
+        year = int(DateTimeUtils.format_date(date, "%Y"))
         century = (year // 100) * 100
         decade = (((year - century) // 10) * 10) + century
-        month_short = str(date.strftime("%b"))
-        month_long = str(date.strftime("%B"))
+        month_short = DateTimeUtils.format_date(date, "%b")
+        month_long = DateTimeUtils.format_date(date, "%B")
 
         return (
             current_month_long,
@@ -300,9 +304,9 @@ def book_first_eligble_appointment(
             current_month_displayed
         )
         if platform == "win32":  # Windows
-            current_month_int = int(datetime.now().strftime("%#m"))
+            current_month_int = int(DateTimeUtils.format_date(datetime.now(), "%#m"))
         else:  # Linux or Mac
-            current_month_int = int(datetime.now().strftime("%-m"))
+            current_month_int = int(DateTimeUtils.format_date(datetime.now(), "%-m"))
 
         self.book_appointments_go_to_month(
             current_month_displayed_int, current_month_int