Index: suite_leahi/shared/scripts/configuration/config.py =================================================================== diff -u -rf7c5babf0cceeac7cacd155523b3fca43ac25a95 -rbf4e1edb998d1ab22c639f571c5ad3b264dbac4b --- suite_leahi/shared/scripts/configuration/config.py (.../config.py) (revision f7c5babf0cceeac7cacd155523b3fca43ac25a95) +++ suite_leahi/shared/scripts/configuration/config.py (.../config.py) (revision bf4e1edb998d1ab22c639f571c5ad3b264dbac4b) @@ -83,11 +83,15 @@ ACTIVE = 'Active' RESUME = 'Resume' COMPLETE = 'Complete' -HEPARIN = "Heparin" -CREATERX = "Rx" -VALIDATE = "VALIDATE" -CONFIRM = "CONFIRM" -NEXT ="Next" +HEPARIN = 'Heparin' +CREATERX = 'Rx' +VALIDATE = 'VALIDATE' +CONFIRM = 'CONFIRM' +NEXT = 'Next' +AUTO_LOAD = 'Auto Load' +WATER_SAMPLE = 'Water Sample' +START = 'Start' +AUTO_EJECT = 'Auto Eject' # Settings Service DEFAULT_SERVICE_PASSWORD_RAW = "Atal.Matal.22leh" # TODO need to update if we ever change the default @@ -104,6 +108,14 @@ FACTORY_RESET_SCREEN_TEXT = "Do you want to perform the factory reset?" SET_PASSWORD = "Set Password" +#Blood Set Auto Load +BLOOD_SET_AUTO_LOAD_REJECTION = "[1] Request is not allowed in the current operating mode" +BLOOD_SET_AUTO_EJECT_REJECTION = "[1] Request is not allowed in the current operating mode" +#Feature Options +FEATURE_CONFIGURATIONS_SCREEN_TITLE_TEXT = "Feature Configurations" +FEATURE_CONFIGURATIONS_PARAMETERS_TEXTS = ["Integrated BP Cuff", "Heparin Syringe Pump", "Chemical Disinfection"] +MEASURE_VITALS = "Measure Vitals" + #Device Settings Options DEVICE_SETTINGS = "Device Settings" ADVANCED_MODE = "Advanced Mode" @@ -124,4 +136,66 @@ #Menu Bar PRESCRIPTIONS = "Prescriptions" TREATMENT = "Treatment" -SETTINGS = "Settings" \ No newline at end of file +SETTINGS = "Settings" + +# Pre-Treatment Foundation +CONCENTRATES_PAGE_TITLE = "Connect Acid and Bicarbonate Concentrates" +CONCENTRATES_PAGE_CONTENTS = [ + "Remove acid connector and connect to acid concentrate.", + "Connect dry bicarbonate.", +] +INSTALLATION_STEPPER_1_PAGE_TITLE = "Install Blood Tubing Set" +INSTALL_BLOOD_TUBING_SET_CONTENTS = [ + "Open the blood pump door.", + "Insert blood tubing set and ensure it is secure.", + "Push the blood tube into the blood pump.", + "Close the blood pump door.", +] +INSTALLATION_STEPPER_2_PAGE_TITLE = "Install Bloodlines" +INSTALL_BLOODLINES_CONTENTS = [ + "Insert saline line into the first slot.", + "Insert arterial line into the second slot.", + "Ensure the venous line is placed in the bubble detector.", + "Insert the venous line into the third slot.", + "Connect the arterial and venous bloodlines using the recirculation connector.", +] +INSTALLATION_STEPPER_3_PAGE_TITLE = "Install Pressure Lines and Dialyzer" +INSTALL_PRESSURE_LINES_CONTENTS = [ + "Connect the arterial pressure line to the arterial pressure transducer port.", + "Connect the venous pressure line to the venous pressure transducer port.", + "Insert dialyzer into the holder and connect the dialysate lines.", + "Connect the bloodlines to the dialyzer.", + "Clamp the venous chamber line.", + "Clamp the heparin line.", +] +SELF_TESTS_PAGE_CONTENTS = [ + "Auto-Load Blood Tubing", + "Cartridge Install Checks", + "Pressure Leak Check", +] +SALINE_PAGE_TITLE = "Connect Saline Bag" +SALINE_PAGE_CONTENTS = [ + "Hang saline bag on the hook.", + "Clamp saline line.", + "Use the saline line to spike saline bag.", + "Unclamp saline line.", +] +PRIME_PAGE_CONTENTS = ["Blood Tubing Circuit Priming", "Dialysate Circuit Priming"] +CONNECT_PAGE_TITLE = "Connect Bloodlines to the Patient" +CONNECT_PAGE_CONTENTS = [ + "Clamp arterial and venous bloodlines (2 clamps).", + "Remove recirculation connector from the bloodlines.", + "Connect bloodlines to patient access lines.", + "Unclamp arterial and venous bloodlines (2 clamps).", +] +DISCONNECT_PAGE_TITLE = "Remove Concentrates and Blood Tubing Set" +DISCONNECT_PAGE_CONTENTS = [ + "Remove blood tubing set and dialyzer.", + "Remove acid and bicarbonate concentrates.", +] +INSTALLATION_PAGE_TITLE = "Install Concentrates and Blood Tubing Set" +INSTALLATION_PAGE_CONTENTS = [ + "Install acid and bicarbonate concentrates.", + "Install blood tubing set and dialyzer.", +] +START_TREATMENT_REJECTION_NOTIFICATION = "[1] Request is not allowed in the current operating mode" \ No newline at end of file Index: suite_leahi/shared/scripts/configuration/utility.py =================================================================== diff -u -rf7c5babf0cceeac7cacd155523b3fca43ac25a95 -rbf4e1edb998d1ab22c639f571c5ad3b264dbac4b --- suite_leahi/shared/scripts/configuration/utility.py (.../utility.py) (revision f7c5babf0cceeac7cacd155523b3fca43ac25a95) +++ suite_leahi/shared/scripts/configuration/utility.py (.../utility.py) (revision bf4e1edb998d1ab22c639f571c5ad3b264dbac4b) @@ -73,7 +73,7 @@ return squish.waitForObject(names_dict, timeout_ms) except LookupError: test.fail("ERROR : " + error_message) - return None + return None def get_bullet_object(screen_obj, num): """ @@ -196,7 +196,7 @@ set_value_based_on_target(names.o_PreTreatmentCreate_dialysateTemperatureControl_ValueAdjuster,37.0) select_different_dropdown(names.o_PreTreatmentCreate_dialyzerTypeComboBox_BaseComboBox,config.DIALYZER_TYPE,2) set_value_based_on_target(names.o_PreTreatmentCreate_salineBolusVolumeControl_ValueAdjuster, 200) - select_different_dropdown(names.o_PreTreatment_vitalsCombobox_BaseCombobox,config.VITALS,1) + set_value_based_on_target(names.o_PreTreatmentCreate_bpMeasurementIntervalControl_ValueAdjusterCustom,5.0) select_different_dropdown(names.o_PreTreatmentCreate_bicarbonateConcentrateComboBox_BaseComboBox,config.BICARBONATE,0) Validatebutton = setObjectText(obj = names.o_preTreatmentStack_Text, text =config.VALIDATE) squish.mouseClick(squish.waitForObject(Validatebutton)) @@ -216,14 +216,12 @@ vArterialPressureLimitWindowRejectReason = 0, vVenousPressureLimitWindowRejectReason = 0, vVenousPressureLimitAsymtrcRejectReason = 0, - vTransmembranePressureLimitWindowRejectReason = 0, + vTransmembranePressureLimitWindowRejectReason= 0, vDialysateTempRejectReason = 0, vHeparinDispensingRateRejectReason = 0, vHeparinBolusVolumeRejectReason = 0 ) - - confirmButton = setObjectText(obj = names.o_preTreatmentStack_Text,text = config.CONFIRM ) - squish.mouseClick(squish.waitForObject(confirmButton)) + squish.mouseClick(names.o_preTreatmentStack_confirmButton_ConfirmButton) test.endSection() def findAllChildrenById(parent, target_id): @@ -328,8 +326,8 @@ return squish.waitForObject(names_dict, timeout_ms).text except LookupError: test.fail("ERROR : " + error_message) - return None - + return None + def findAllObjectsByText(parent, target_text): """ Recursively finds all child objects that have a 'text' property @@ -344,4 +342,4 @@ for child in object.children(parent): results.extend(findAllObjectsByText(child, target_text)) - return results + return results \ No newline at end of file Index: suite_leahi/shared/scripts/names.py =================================================================== diff -u -rdb01fece1e342cbdfa4d2f0a86d501a744080857 -rbf4e1edb998d1ab22c639f571c5ad3b264dbac4b --- suite_leahi/shared/scripts/names.py (.../names.py) (revision db01fece1e342cbdfa4d2f0a86d501a744080857) +++ suite_leahi/shared/scripts/names.py (.../names.py) (revision bf4e1edb998d1ab22c639f571c5ad3b264dbac4b) @@ -40,18 +40,25 @@ o_dialyste_cond_title_Text = {"container": mainTreatmentScreen, "id": "_dialysateCond", "objectName": "dialysateCondComponent", "type": "TreatmentFlowsComponent" } o_treatmentTimeNotificationBarSmall = {"container": mainTreatmentScreen, "objectName": "notification", "type": "NotificationBarSmall" } -# settings_service_export_logs -o_SettingsHome = {"container": o_Gui_MainView, "objectName": "_SettingsHome", "type": "SettingsHome", } -o_SettingsExportLogs = {"container": o_Gui_MainView, "objectName": "_SettingsBase", "type": "SettingsExportLogs", } -o_SettingsInformation = {"container": o_Gui_MainView, "objectName": "_SettingsBase", "type": "SettingsBase", } -o_USBEjectButton = {"container": o_SettingsExportLogs, "id": "_usbEjectButton", "type": "USBButton", "unnamed": 1 } -o_LogTypeComboBox = {"container": o_SettingsInformation, "id": "_logTypeCombo", "type": "ComboBox", "unnamed": 1 } -o_OptionComboBox = {"container": o_Overlay, "type": "Text", "unnamed": 1 } -o_ExportButton = {"container": o_SettingsExportLogs, "id": "_logTypeExportButton", "type": "ExportButton", "unnamed": 1 } -o_ExportLogsProgressRect = {"container": o_SettingsExportLogs, "id": "_progressRect", "type": "ProgressRect", "unnamed": 1 } -o_ExportLogsNotificationBar = {"container": o_SettingsExportLogs, "id": "_information", "type": "NotificationBarSmall", } -o_DeviceSettingsGrid = {"container": o_SettingsHome, "id": "_grid", "type": "Grid", } - +# settings_service_export_logs +o_mainMenu_MainMenu = {"container": o_Gui_MainView, "id": "_mainMenu", "type": "MainMenu", "unnamed": 1 } +o_headerBar_HeaderBar = {"container": o_Gui_MainView, "id": "_headerBar", "type": "HeaderBar", "unnamed": 1 } +o_listView_ListView = {"container": o_Gui_MainView, "id": "_listView", "type": "ListView", "unnamed": 1 } +o_listView_delegateControl = {"container": o_listView_ListView, "index": 2, "objectName": "delegateControl", "type": "Item" } +o_Settings_Menu = {"container": o_listView_delegateControl, "objectName": "_touchRect2", "type": "TouchRect" } +o_SettingsHome = {"container": o_Gui_MainView, "objectName": "_SettingsHome", "type": "SettingsHome" } +o_SettingsExportLogs = {"container": o_Gui_MainView, "objectName": "_SettingsBase", "type": "SettingsExportLogs" } +o_DeviceSettingsTitleText = {"container": o_SettingsHome, "id":"_titleText", "type": "Text", "unnamed": 1 } +o_SettingsInformation = {"container": o_Gui_MainView, "objectName": "_SettingsBase", "type": "SettingsBase" } +o_USBEjectButton = {"container": o_SettingsExportLogs, "id": "_usbEjectButton", "type": "USBButton", "unnamed": 1 } +o_ExportLogsPageTitleText = {"container": o_SettingsInformation, "id":"_titleText", "type": "Text", "unnamed": 1 } +o_LogTypeComboBox = {"container": o_SettingsInformation, "id": "_logTypeCombo", "type": "ComboBox", "unnamed": 1 } +o_OptionComboBox = {"container": o_Overlay, "type": "Text", "unnamed": 1 } +o_ExportButton = {"container": o_SettingsExportLogs, "id": "_logTypeExportButton", "type": "ExportButton", "unnamed": 1 } +o_ExportLogsProgressRect = {"container": o_SettingsExportLogs, "id": "_progressRect", "type": "ProgressRect", "unnamed": 1 } +o_ExportLogsNotificationBar = {"container": o_SettingsExportLogs, "id": "_information", "type": "NotificationBarSmall" } +o_DeviceSettingsGrid = {"container": o_SettingsHome, "id": "_grid", "type": "Grid", } + #HeaderBar Information Pop up o_InformationIconButton = {"container": o_Gui_MainView, "id": "_informationButton", "type": "IconButton", "unnamed": 1 } o_InformationParameters = {"container": o_Overlay, "type": "Text", "unnamed": 1 } @@ -241,3 +248,30 @@ 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_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_preTreatmentStack_confirmButton_ConfirmButton = {"container": o_preTreatmentStack_PreTreatmentStack, "objectName": "_confirmButton", "type": "ConfirmButton", "visible": True } +o_PostTreatmentStack_PostTreatmentStack = {"container": o_Gui_MainView, "objectName": "_PostTreatmentStack", "type": "PostTreatmentStack", } +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_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 } + +# Feature Options +o_SettingsBase_SettingsFeatureConfigurations = {"container": o_Gui_MainView, "objectName": "_SettingsBase", "type": "SettingsFeatureConfigurations", } +o_SettingsBase_integratedBPCuffSwitch_BaseSwitch = {"checkable": True, "container": o_SettingsBase_SettingsFeatureConfigurations, "id": "_integratedBPCuffSwitch", "type": "BaseSwitch", "unnamed": 1 } +o_SettingsFeatureConfigurations_BackButton = {"container": o_SettingsBase_SettingsFeatureConfigurations, "objectName": "_backButton", "type": "BackButton", } +o_SettingsBase_heparinSyringePumpSwitch_BaseSwitch = {"checkable": True, "container": o_SettingsBase_SettingsFeatureConfigurations, "id": "_heparinSyringePumpSwitch", "type": "BaseSwitch", "unnamed": 1 } +o_vitalsButton_VitalsButton = {"container": o_Gui_MainView, "id": "_vitalsButton", "type": "VitalsButton", "unnamed": 1 } +o_vitalsPopup_Close_Image = {"container": o_Overlay, "id": "_image", "source": "qrc:/images/iClose", "type": "Image", "unnamed": 1 }