Index: suite_leahi/shared/scripts/configuration/config.py =================================================================== diff -u -r84f7c51f1c11528ce27196b022a052b68cecf406 -r1aedea813d71404898a50c06f20db0fc49429cd5 --- suite_leahi/shared/scripts/configuration/config.py (.../config.py) (revision 84f7c51f1c11528ce27196b022a052b68cecf406) +++ suite_leahi/shared/scripts/configuration/config.py (.../config.py) (revision 1aedea813d71404898a50c06f20db0fc49429cd5) @@ -174,12 +174,17 @@ INSTITUTIONAL_CONFIGURATIONS = "Institutional Configurations" DATE_AND_TIME = "Date and Time" LANGUAGE = "Language" + +#Menu Bar +PRESCRIPTIONS = "Prescriptions" +TREATMENT = "Treatment" +SETTINGS = "Settings" + # Blood Prime TOTAL_FLUID_DELIVERED = "Total Fluid Delivered" DELIVERING_FLUID = "Delivering Fluid" BLOOD_PRIME_PAUSED_NOTIFICATION = "Blood Prime Paused" - # Pre-Treatment Foundation SELF_TESTS_PAGE_CONTENTS = [ "Auto-Load Blood Tube Set", @@ -203,7 +208,7 @@ #General Aesthetics SD_CARD_SECTION_CONTENTS = ["SD-Card", "0.000 MB Used", "0.000 Free MB of 0.000 MB"] -OPMODE_TITLE = " Opmode " +OPMODE_TITLE = '[0x12] Opmode ' OPMODE = 'opMode ' SUBMODE = 'subMode ' TX_STATES = ' TXStates ' Index: suite_leahi/shared/scripts/names.py =================================================================== diff -u -r5242b0f3bde261dff5670b39bdb263f084d237b6 -r1aedea813d71404898a50c06f20db0fc49429cd5 --- suite_leahi/shared/scripts/names.py (.../names.py) (revision 5242b0f3bde261dff5670b39bdb263f084d237b6) +++ suite_leahi/shared/scripts/names.py (.../names.py) (revision 1aedea813d71404898a50c06f20db0fc49429cd5) @@ -198,6 +198,10 @@ o_PreTreatmentCreate_bicarbonateConcentrateComboBox_BaseComboBox= {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_bicarbonateConcentrateComboBox", "type": "BaseComboBox", "unnamed": 1 } o_PreTreatment_vitalsCombobox_BaseCombobox = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_bpMeasurementIntervalControl", "type": "BaseComboBox", "unnamed": 1 } o_PreTreatmentCreate_Text = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "type": "Text", "unnamed": 1 } +o_PreTreatmentCreate_patientID_LabelUnitContainer = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_patientID", "type": "LabelUnitContainer", "unnamed": 1 } +o_secondaryPatientID_LabelUnitContainer = {"container": o_Overlay, "id": "_secondaryPatientID", "type": "LabelUnitContainer", "unnamed": 1 } + + #prescription header bar o_prescriptionButton_IconButton = {"container": o_Gui_MainView, "id": "_prescriptionButton", "type": "IconButton", "unnamed": 1 } @@ -247,20 +251,32 @@ o_preTreatmentStack_Text = {"container": o_preTreatmentStack_PreTreatmentStack, "type": "Text", "unnamed": 1 } o_preTreatmentStack_stepIndicator_StepIndicator = {"container": o_preTreatmentStack_PreTreatmentStack, "id": "_stepIndicator", "type": "StepIndicator", "unnamed": 1 } -#Helpers +# Settings Service o_SettingsStack_SettingsStack = {"container": o_Gui_MainView, "objectName": "_SettingsStack", "type": "SettingsStack", } o_UserConfirmation_SettingsServicePassword = {"container": o_SettingsStack_SettingsStack, "objectName": "UserConfirmation", "type": "SettingsServicePassword", } o_loginPage_Titletext = {"container": o_UserConfirmation_SettingsServicePassword, "id":"_titleText", "type": "Text", "unnamed": 1 } o_userConfirmation_TextInput = {"container": o_UserConfirmation_SettingsServicePassword, "id": "_input", "type": "TextInput", "unnamed": 1 } o_userConfirmation_ConfirmButton = {"container": o_UserConfirmation_SettingsServicePassword, "objectName": "_confirmButton", "type": "ConfirmButton", } -o_PreTreatmentSampleStack_PreTreatmentWaterSample = {"container": o_preTreatmentStack_PreTreatmentStack, "objectName": "_PreTreatmentSampleStack", "type": "PreTreatmentWaterSample", } -o_PreTreatmentSampleStack_button_TouchRect = {"container": o_PreTreatmentSampleStack_PreTreatmentWaterSample, "id": "_button", "type": "TouchRect", "unnamed": 1 } -o_preTreatmentStack_repeater_Repeater = {"container": o_preTreatmentStack_PreTreatmentStack, "id": "repeater", "type": "Repeater", "unnamed": 1 } -o_PreTreatmentCreate_bpMeasurementIntervalControl_ValueAdjusterCustom= {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_bpMeasurementIntervalControl", "type": "ValueAdjusterCustom", "unnamed": 1 } -o_PostTreatmentStack_PostTreatmentStack = {"container": o_Gui_MainView, "objectName": "_PostTreatmentStack", "type": "PostTreatmentStack", } +o_SettingsHome_confirmButton = {"container": o_SettingsHome, "objectName": "_confirmButton", "type": "ConfirmButton", } o_SettingsBase_SettingsAdvancedMode = {"container": o_Gui_MainView, "objectName": "_SettingsBase", "type": "SettingsAdvancedMode", } o_settingsAdvancedMode_BaseSwitch = {"container": o_SettingsBase_SettingsAdvancedMode, "id": "_settingsAdvancedMode", "type": "BaseSwitch", "unnamed": 1 } o_SettingsBase_backButton_AdvancedMode = {"container": o_SettingsBase_SettingsAdvancedMode, "objectName": "_backButton", "type": "BackButton", } +o_SettingsBase_SettingsDateTime = {"container": o_Gui_MainView, "objectName": "_SettingsBase", "type": "SettingsDateTime", } +o_SettingsBase_ntpSwitch_BaseSwitch = {"container": o_SettingsBase_SettingsDateTime, "id": "_ntpSwitch", "type": "BaseSwitch", "unnamed": 1 } +o_SettingsBase_backButton_NTP_Switch = {"container": o_SettingsBase_SettingsDateTime, "objectName": "_backButton", "type": "BackButton", } +o_timeContainer_LabelUnitContainer = {"container": o_SettingsBase_SettingsDateTime, "id": "_timeContainer", "type": "LabelUnitContainer", "unnamed": 1 } +o_SettingsBase_SettingsRootSSHAccess = {"container": o_Gui_MainView, "objectName": "_SettingsBase", "type": "SettingsRootSSHAccess", } +o_SettingsBase_SSH_LoginSwitch = {"container": o_SettingsBase_SettingsRootSSHAccess, "id": "_settingsRootSSHAccess_SSHDSwitch", "type": "BaseSwitch", "unnamed": 1 } +o_SettingsBase_Root_LoginSwitch = {"container": o_SettingsBase_SettingsRootSSHAccess, "id": "_settingsRootSSHAccess_RootSwitch", "type": "BaseSwitch", "unnamed": 1 } +o_SettingsBase_backButton_RootSSH = {"container": o_SettingsBase_SettingsRootSSHAccess, "objectName": "_backButton", "type": "BackButton", } +o_userConfirmation_SettingsFactoryReset = {"container": o_Gui_MainView, "objectName": "UserConfirmation", "type": "SettingsFactoryReset", } +o_userConfirmation_backButton_FactoryReset = {"container": o_userConfirmation_SettingsFactoryReset, "objectName": "_backButton", "type": "BackButton", } +o_factoryReset_ConfirmButton = {"container": o_userConfirmation_SettingsFactoryReset, "objectName": "_confirmButton", "type": "ConfirmButton", } +o_cancelTouch_TouchRect = {"container": o_Overlay, "id": "_cancelTouch", "type": "TouchRect", "unnamed": 1 } +o_confirmTouch_ConfirmButton = {"container": o_Overlay, "id": "_confirmTouch", "type": "ConfirmButton", "unnamed": 1 } + +#Helpers +o_PostTreatmentStack_PostTreatmentStack = {"container": o_Gui_MainView, "objectName": "_PostTreatmentStack", "type": "PostTreatmentStack", } o_preTreatmentStack_pretreatmentInstallation_PreTreatmentInstallStack= {"container": o_preTreatmentStack_PreTreatmentStack, "id": "_pretreatmentInstallation", "type": "PreTreatmentInstallStack", "unnamed": 1 } o_pretreatmentInstallation_PreTreatmentBase_PreTreatmentBase = {"container": o_preTreatmentStack_pretreatmentInstallation_PreTreatmentInstallStack, "objectName": "_PreTreatmentBase", "type": "PreTreatmentBase", } o_pretreatmentInstallation_instructionView_InstructionView = {"container": o_pretreatmentInstallation_PreTreatmentBase_PreTreatmentBase, "id": "_instructionView", "type": "InstructionView", "unnamed": 1 } Index: suite_leahi/tst_post-treatment_foundation/test.py =================================================================== diff -u -rfdd8eba9862cdad703cecbcf2859200dd5eb3b96 -r1aedea813d71404898a50c06f20db0fc49429cd5 --- suite_leahi/tst_post-treatment_foundation/test.py (.../test.py) (revision fdd8eba9862cdad703cecbcf2859200dd5eb3b96) +++ suite_leahi/tst_post-treatment_foundation/test.py (.../test.py) (revision 1aedea813d71404898a50c06f20db0fc49429cd5) @@ -50,6 +50,8 @@ def main(): utils.tstStart(__file__) test.startSection("Post-Treatment Foundation") + global patientDisconnectConfirmRequest + global bloodSetAutoEject if can_interface is None: test.fail("CAN Interface is not available. Stopping tests.") Index: suite_leahi/tst_recirculate/test.py =================================================================== diff -u -r1d0e60a5615bf3ee78da8ff25c7c15a78a2049a3 -r1aedea813d71404898a50c06f20db0fc49429cd5 --- suite_leahi/tst_recirculate/test.py (.../test.py) (revision 1d0e60a5615bf3ee78da8ff25c7c15a78a2049a3) +++ suite_leahi/tst_recirculate/test.py (.../test.py) (revision 1aedea813d71404898a50c06f20db0fc49429cd5) @@ -235,7 +235,7 @@ test.fail("CAN Interface is not available. Stopping tests.") return - channel_id = CAN.DenaliChannels.ui_to_td_ch_id + channel_id = CAN.CanChannels.ui_to_td_ch_id # Register Recirculate Request message_id = MsgIds.MSG_ID_UI_RECIRCULATE_REQUEST.value Index: suite_leahi/tst_service_institutional/test.py =================================================================== diff -u -r38ffd49d6364e5d840795e1df6b4f312d57816e6 -r1aedea813d71404898a50c06f20db0fc49429cd5 --- suite_leahi/tst_service_institutional/test.py (.../test.py) (revision 38ffd49d6364e5d840795e1df6b4f312d57816e6) +++ suite_leahi/tst_service_institutional/test.py (.../test.py) (revision 1aedea813d71404898a50c06f20db0fc49429cd5) @@ -707,8 +707,6 @@ td_simulator.td_operation_mode(TDOpModes.MODE_PRET.value) td_simulator.td_blood_set_auto_load_response(vRejectionReason = 0) navigation.navigation_pageIndicator_step(config.CREATERX) - mouseClick(utility.get_object_from_names(names.o_PreTreatmentCreate_pretreatmentPatientIDEntry_TextEntry)) - utility.get_object_from_names(names.o_PreTreatmentCreate_pretreatmentPatientIDEntry_TextEntry, 3000).text ="1234" parent_obj = waitForObject(names.o_PreTreatmentCreate_leftColumn_Column, 3000) blood_flow_rate = utility.findObjectById(parent_obj, "_bloodFlowRate") blood_flow_rate_value = utility.findObjectById(blood_flow_rate, "_valueAdjuster") Index: suite_leahi/tst_settings_service/test.py =================================================================== diff -u -rdd5ff0124f6b6a3812008af2ee764936f703c688 -r1aedea813d71404898a50c06f20db0fc49429cd5 --- suite_leahi/tst_settings_service/test.py (.../test.py) (revision dd5ff0124f6b6a3812008af2ee764936f703c688) +++ suite_leahi/tst_settings_service/test.py (.../test.py) (revision 1aedea813d71404898a50c06f20db0fc49429cd5) @@ -58,7 +58,7 @@ container = waitForObject(names.o_UserConfirmation_SettingsServicePassword) # Find all TextInput objects that share the id "_input" - password_inputs = utility.findAllChildrenById(container, "_input") + password_inputs = utility.findAllObjectsById(container, "_input") # Use enumerate to track the index (0, 1, 2) for index, input_field in enumerate(password_inputs): @@ -97,7 +97,7 @@ """ container = waitForObject(names.o_UserConfirmation_SettingsServicePassword) - password_inputs = utility.findAllChildrenById(container, "_input") + password_inputs = utility.findAllObjectsById(container, "_input") for index, input_field in enumerate(password_inputs): # # Clear the field before typing a new value for the test case