Merge branch 'feature/smokescreen_compartment_1' of github.com:NHSDigital/bcss-playwright into feature/smokescreen_compartment_1

Author: adrianoaru-nhs

pages/reports_page.py

@@ -1,48 +1,7 @@
-from datetime import datetime
-from utils import date_time_utils
 from utils.click_helper import click
 from playwright.sync_api import Page
 
 
-class ReportsPageUtils:
-    def __init__(self):
-        pass
-
-
-# Timestamp Date Formatting
-def report_timestamp_date_format() -> str:
-    """Gets the current date time and converts it to the timestamp format used on the report pages
-
-    Returns:
-        date report last requested (str): The current datetime in the "date report last requested" timestamp format.
-
-    """
-    dtu = date_time_utils.DateTimeUtils
-    return dtu.format_date(datetime.now(), "%d/%m/%Y" + " at " + "%H:%M:%S")
-
-
-def fobt_kits_logged_but_not_read_report_timestamp_date_format() -> str:
-    """Gets the current date time and converts it to the timestamp format used on the fobt_kits_logged_but_not_read report page
-
-    Returns:
-        fobt_kits_logged_but_not_read timestamp (str): The current datetime in the "fobt_kits_logged_but_not_read report" timestamp format.
-
-    """
-    dtu = date_time_utils.DateTimeUtils
-    return dtu.format_date(datetime.now(), "%d %b %Y %H:%M:%S")
-
-
-def screening_practitioner_appointments_report_timestamp_date_format() -> str:
-    """Gets the current date time and converts it to the timestamp format used on the screening practitioner appointments report page
-
-    Returns:
-        screening practitioner appointments timestamp (str): The current datetime in the "screening practitioner appointments report" timestamp format.
-
-    """
-    dtu = date_time_utils.DateTimeUtils
-    return dtu.format_date(datetime.now(), "%d.%m.%Y" + " at " + "%H:%M:%S")
-
-
 # Reports page main menu links
 def go_to_failsafe_reports_page(page: Page) -> None:
     click(page, page.get_by_role("link", name="Failsafe Reports"))

utils/date_time_utils.py

@@ -70,3 +70,18 @@ def get_a_day_of_week(date: datetime) -> str:
             str: The day of the week relating to the specified date.
         """
         return date.strftime("%A")
+
+    @staticmethod
+    def report_timestamp_date_format() -> str:
+        """Gets the current datetime in the timestamp format used on the report pages."""
+        return DateTimeUtils.format_date(datetime.now(), "%d/%m/%Y at %H:%M:%S")
+
+    @staticmethod
+    def fobt_kits_logged_but_not_read_report_timestamp_date_format() -> str:
+        """Gets the current datetime in the format used for FOBT Kits Logged but Not Read report."""
+        return DateTimeUtils.format_date(datetime.now(), "%d %b %Y %H:%M:%S")
+
+    @staticmethod
+    def screening_practitioner_appointments_report_timestamp_date_format() -> str:
+        """Gets the current datetime in the format used for Screening Practitioner Appointments report."""
+        return DateTimeUtils.format_date(datetime.now(), "%d.%m.%Y at %H:%M:%S")