Commented sections of the code that can be improved/altered

Author: adrianoaru-nhs

pages/generate_invitations_page.py

@@ -32,7 +32,7 @@ def wait_for_invitation_generation_complete(self):
         elapsed = 0
 
         # Loop until the table no longer contains "Queued"
-        while elapsed < timeout:
+        while elapsed < timeout: # there may be a stored procedure to speed this process up
             table_text = self.displayRS.text_content()
             if "Queued" in table_text or "In Progress" in table_text:
                 # Click the Refresh button

tests/Smokescreen/test_compartment_1.py

@@ -6,7 +6,6 @@
 
 # To Do:
 # Create a common click() function -> this aims to solve an issue where sometimes it thinks it has clicked the element but the page does not change
-# playwright._impl._errors.Error: Dialog.accept: Cannot accept dialog which is already handled! - Have a look at removing this error (probably from line 67 of batch_processing)
 
 @pytest.mark.smoke
 @pytest.mark.smokescreen
@@ -17,7 +16,7 @@ def test_compartment_1(page: Page) -> None:
     # Create plan
     MainMenu(page).go_to_call_and_recall_page()
     CallAndRecall(page).go_to_planning_and_monitoring_page()
-    InvitationsMonitoring(page).go_to_bcss001_invitations_plan_page()
+    InvitationsMonitoring(page).go_to_bcss001_invitations_plan_page() # Replicate this for bcss009 (IOM) TODO
     InvitationsPlans(page).go_to_create_a_plan_page()
     CreateAPlan(page).click_set_all_button()
     CreateAPlan(page).fill_daily_invitation_rate_field("10")
@@ -36,15 +35,15 @@ def test_compartment_1(page: Page) -> None:
     GenerateInvitations(page).wait_for_invitation_generation_complete()
 
     # Print the batch of Pre-Invitation Letters
-    s1_nhs_numbers = batch_processing(page, "S1", "Pre-invitation (FIT)", "S9 - Pre-invitation Sent")
     batch_processing(page, "S1", "Pre-invitation (FIT) (digital leaflet)", "S9 - Pre-invitation Sent")
-    for nhs_no in range(len(s1_nhs_numbers)):
+    s1_nhs_numbers = batch_processing(page, "S1", "Pre-invitation (FIT)", "S9 - Pre-invitation Sent") # New batch processing for S1 IOM TODO
+    for nhs_no in range(len(s1_nhs_numbers)): # Change this to get nhs numbers from DF instead of list TODO
         OracleDB().exec_bcss_timed_events(s1_nhs_numbers[nhs_no-1])
 
     # Print the batch of Invitation & Test Kit Letters
-    s9_nhs_numbers = batch_processing(page, "S9", "Invitation & Test Kit (FIT)", "S10 - Invitation & Test Kit Sent")
+    s9_nhs_numbers = batch_processing(page, "S9", "Invitation & Test Kit (FIT)", "S10 - Invitation & Test Kit Sent") # New batch processing for S9 IOM TODO
     for nhs_no in range(len(s9_nhs_numbers)):
-        OracleDB().exec_bcss_timed_events(s9_nhs_numbers[nhs_no-1])
+        OracleDB().exec_bcss_timed_events(s9_nhs_numbers[nhs_no-1]) # Change this to get nhs numbers from DF instead of list TODO
 
     # Print a set of reminder letters
     batch_processing(page, "S10", "Test Kit Reminder", "S19 - Reminder of Initial Test Sent")

utils/batch_processing.py

@@ -28,10 +28,11 @@ def batch_processing(page: Page, batch_type: str, batch_description: str, latest
         row = batch_description_cells.nth(i).locator("..")  # Get the parent row
 
         # Check if the row contains "Prepared" or "Open"
-        if row.locator("td", has_text="Prepared").count() > 0 or row.locator("td", has_text="Open").count() > 0:
+        if row.locator("td", has_text="Prepared").count() > 0 or row.locator("td", has_text="Open").count() > 0: #Within if statement get nhs_number from DB TODO
             # Find the first link in that row and click it
             link = row.locator("a").first
             link_text = link.inner_text()  # Get the batch id dynamically
+            # new code here query DB (getSubjectsFromLetterBatchID function in selenium code) passing in a batch id to get the nhs numbers of the subjects TODO
             link.click()
             break
         else:
@@ -54,7 +55,7 @@ def batch_processing(page: Page, batch_type: str, batch_description: str, latest
         # Wait for the download process to complete and save the downloaded file in a temp folder
         download_file.save_as(file)
         if file.endswith(".pdf"):
-            nhs_numbers = extract_nhs_no_from_pdf(file)
+            nhs_numbers = extract_nhs_no_from_pdf(file) # Remove pdf_reader TODO
             first_nhs_no = nhs_numbers[0]
             os.remove(file) # Deletes the file after extracting the necessary data
         elif file.endswith(".csv"):
@@ -73,5 +74,5 @@ def batch_processing(page: Page, batch_type: str, batch_description: str, latest
     ArchivedBatchList(page).enter_id_filter(link_text)
     ArchivedBatchList(page).verify_table_data(link_text)
 
-    verify_subject_event_status_by_nhs_no(page, first_nhs_no, latest_event_status)
+    verify_subject_event_status_by_nhs_no(page, first_nhs_no, latest_event_status) # This needs to be changed to pass an NHS number from the new DF first_nhs_no = df["COL NAME"].iloc[0] TODO
     return nhs_numbers