Skip to content

Commit 5c96fec

Browse files
Removing IOM functionality as our understand was incorrect. Currently our environment is not setup for it.
1 parent d4d77cb commit 5c96fec

File tree

2 files changed

+2
-30
lines changed

2 files changed

+2
-30
lines changed

tests/Smokescreen/test_compartment_1.py

Lines changed: 1 addition & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,11 @@
77
@pytest.mark.smoke
88
@pytest.mark.smokescreen
99
def test_compartment_1(page: Page) -> None:
10-
execute_iom = False
1110

1211
page.goto("/")
1312
BcssLoginPage(page).login_as_user("BCSS401")
1413

15-
# Create plan
16-
# England
14+
# Create plan - England
1715
MainMenu(page).go_to_call_and_recall_page()
1816
CallAndRecall(page).go_to_planning_and_monitoring_page()
1917
InvitationsMonitoring(page).go_to_bcss001_invitations_plan_page()
@@ -27,20 +25,6 @@ def test_compartment_1(page: Page) -> None:
2725
CreateAPlan(page).click_saveNote_button()
2826
InvitationsPlans(page).invitations_plans_title.wait_for()
2927

30-
# Isle Of Man
31-
if execute_iom:
32-
NavigationBar(page).click_back_link()
33-
InvitationsMonitoring(page).go_to_bcss009_invitations_plan_page()
34-
InvitationsPlans(page).go_to_create_a_plan_page()
35-
CreateAPlan(page).click_set_all_button()
36-
CreateAPlan(page).fill_daily_invitation_rate_field("1") # This step will fail as currently there are insufficient subjects in the next invitations shortlist (we are working on this with compartment 0)
37-
CreateAPlan(page).click_update_button()
38-
CreateAPlan(page).click_confirm_button()
39-
CreateAPlan(page).click_save_button()
40-
CreateAPlan(page).fill_note_field("test data")
41-
CreateAPlan(page).click_saveNote_button()
42-
InvitationsPlans(page).invitations_plans_title.wait_for()
43-
4428
# Generate Invitations
4529
NavigationBar(page).click_main_menu_link()
4630
MainMenu(page).go_to_call_and_recall_page()
@@ -54,23 +38,11 @@ def test_compartment_1(page: Page) -> None:
5438
for index, row in nhs_number_df.iterrows():
5539
OracleDB().exec_bcss_timed_events(row["subject_nhs_number"])
5640

57-
# Print the batch of Pre-Invitation Letters - Isle Of Man
58-
if execute_iom:
59-
nhs_number_df = batch_processing(page, "S1", "Pre-invitation (gFOBT)", "S9 - Pre-invitation Sent")
60-
for index, row in nhs_number_df.iterrows():
61-
OracleDB().exec_bcss_timed_events(row["subject_nhs_number"])
62-
6341
# Print the batch of Invitation & Test Kit Letters - England
6442
nhs_number_df = batch_processing(page, "S9", "Invitation & Test Kit (FIT)", "S10 - Invitation & Test Kit Sent")
6543
for index, row in nhs_number_df.iterrows():
6644
OracleDB().exec_bcss_timed_events(row["subject_nhs_number"])
6745

68-
# Print the batch of Pre-Invitation Letters - Isle Of Man
69-
if execute_iom:
70-
nhs_number_df = batch_processing(page, "S9", "Invitation & Test Kit (gFOBT)", "S10 - Invitation & Test Kit Sent")
71-
for index, row in nhs_number_df.iterrows():
72-
OracleDB().exec_bcss_timed_events(row["subject_nhs_number"])
73-
7446
# Print a set of reminder letters
7547
batch_processing(page, "S10", "Test Kit Reminder", "S19 - Reminder of Initial Test Sent")
7648

utils/get_nhs_no_from_batch_id.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ def get_nhs_no_from_batch_id(batch_id):
1111
WHERE lbr.BATCH_ID IN {batch_id}
1212
AND ss.screening_status_id != 4008
1313
ORDER BY ss.subject_nhs_number
14-
FETCH FIRST 5 ROWS ONLY""")
14+
""")
1515
return nhs_number_df

0 commit comments

Comments
 (0)