Index: suite_leahi/shared/scripts/names.py =================================================================== diff -u -r279e768763ca90eadc690f1c922889f8969e5e6f -r4b929ef6eef32479f10e84325b0ad12173474a4d --- suite_leahi/shared/scripts/names.py (.../names.py) (revision 279e768763ca90eadc690f1c922889f8969e5e6f) +++ suite_leahi/shared/scripts/names.py (.../names.py) (revision 4b929ef6eef32479f10e84325b0ad12173474a4d) @@ -6,6 +6,8 @@ o_Gui_MainView = { "type": "Gui::MainView", "unnamed": 1 } o_QQuickView = { "type": "QQuickView" } o_Overlay = {"container": o_QQuickView, "type": "Overlay" } +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 } # Solution Infusion o_standByScreen_MainHome = {"container": o_Gui_MainView, "type": "MainHome" } @@ -38,7 +40,7 @@ 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 +# 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 } @@ -61,6 +63,7 @@ o_InformationIconButton = {"container": o_Gui_MainView, "id": "_informationButton", "type": "IconButton", "unnamed": 1 } o_InformationParameters = {"container": o_Overlay, "type": "Text", "unnamed": 1 } o_VersionColumn = {"container": o_Overlay, "id": "_versionColumn", "type": "Column", "unnamed": 1 } + # General Alarm Requirements Instruction o_AlarmButton_Mute = {"container": o_Overlay, "id": "_muteButton", "type": "MuteButton" } o_AlarmButton_Mute_Min = {"container": o_AlarmButton_Mute, "id": "_hourText", "type": "Text" } @@ -101,7 +104,6 @@ # Device Settings Information Version o_DeviceSettingsInformation = {"container": o_SettingsHome, "id": "_touchItem", "type": "TouchRect", "unnamed": 1 } -o_InformationPageTitleText = {"container": o_SettingsInformation, "id": "_titleText", "type": "Text", "unnamed": 1 } o_SettingsBase_SettingsInformation = {"container": o_Gui_MainView, "objectName": "_SettingsBase", "type": "SettingsBase" } o_SettingsBase_Information_Text = {"container": o_SettingsBase_SettingsInformation, "type": "Text", "unnamed": 1 } o_SettingsBase_SettingsInformation_2 = {"container": o_Gui_MainView, "objectName": "_SettingsBase", "type": "SettingsInformation" } @@ -114,9 +116,6 @@ o_HeaderBar_WiFi_IconImage = {"container": o_Gui_MainView, "id": "_iconImage", "source": "qrc:/images/iWifi", "type": "Image", "unnamed": 1 } #Device Settings Wi-Fi -o_SettingsBase_SettingsInformation = {"container": o_Gui_MainView, "objectName": "_SettingsBase", "type": "SettingsBase" } -o_SettingsBase_Information_Text = {"container": o_SettingsBase_SettingsInformation, "type": "Text", "unnamed": 1 } -o_InformationPageTitleText = {"container": o_SettingsInformation, "id": "_titleText", "type": "Text", "unnamed": 1 } o_SettingsBase_SettingsWiFi = {"container": o_Gui_MainView, "objectName": "_SettingsBase", "type": "SettingsWiFi" } o_SettingsBase_WifiScreen_ScanButton = {"container": o_SettingsBase_SettingsWiFi, "id": "_scanButton", "type": "TouchRect", "unnamed": 1 } o_SettingsBase_WifiScreen_BackButton = {"container": o_SettingsBase_SettingsWiFi, "objectName": "_backButton", "type": "BackButton" , } @@ -196,8 +195,7 @@ o_preTreatmentStack_PreTreatmentStack = {"container": o_Gui_MainView, "id": "_preTreatmentStack", "type": "PreTreatmentStack", "unnamed": 1 } o_preTreatmentStack_PreTreatmentBase_PreTreatmentBase = {"container": o_preTreatmentStack_PreTreatmentStack, "objectName": "_PreTreatmentBase", "type": "PreTreatmentBase" } o_PreTreatmentBase_instructionView_InstructionView = {"container": o_preTreatmentStack_PreTreatmentBase_PreTreatmentBase, "id": "_instructionView", "type": "InstructionView", "unnamed": 1 } - - + #Heparin o_listView_Item = {"container": o_Gui_MainView, "type": "Item", "unnamed": 1 } o_treatmentHeparin_TreatmentHeparin = {"container": o_Gui_MainView, "id": "_treatmentHeparin", "type": "TreatmentHeparin", "unnamed": 1 } @@ -226,12 +224,86 @@ 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 } -#Service -o_SettingsStack_SettingsStack = {"container": o_Gui_MainView, "objectName": "_SettingsStack", "type": "SettingsStack", } -o_UserConfirmation_SettingsServicePassword = {"container": o_SettingsStack_SettingsStack, "objectName": "UserConfirmation", "type": "SettingsServicePassword", } -o_userConfirmation_TextInput = {"container": o_UserConfirmation_SettingsServicePassword, "echoMode": 2, "id": "_input", "passwordCharacter": "•", "type": "TextInput", "unnamed": 1 } -o_userConfirmation_ConfirmButton = {"container": o_UserConfirmation_SettingsServicePassword, "objectName": "_confirmButton", "type": "ConfirmButton", } +# 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_headerBar_HeaderBar = {"container": o_Gui_MainView, "id": "_headerBar", "type": "HeaderBar", "unnamed": 1 } +o_userConfirmation_ConfirmButton = {"container": o_UserConfirmation_SettingsServicePassword, "objectName": "_confirmButton", "type": "ConfirmButton", } +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_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 } + +#end of treatment +o_cancelTouch_TouchRect = {"container": o_Overlay, "id": "_cancelTouch", "type": "TouchRect", "unnamed": 1 } +o_treatmentCompleteButton_TreatmentCompleteButton = {"container": o_Gui_MainView, "id": "_treatmentCompleteButton", "type": "TreatmentCompleteButton", "unnamed": 1 } +o_treatmentHome_iconImage_Image = {"container": mainTreatmentScreen, "id": "_iconImage", "source": "qrc:/images/iEditDisabled", "type": "Image", "unnamed": 1 } +o_treatmentHome_editButton_IconButton = {"container": mainTreatmentScreen, "id": "_editButton", "type": "IconButton", "unnamed": 1 } +o_vitalsButton_VitalsButton = {"container": o_Gui_MainView, "id": "_vitalsButton", "type": "VitalsButton", "unnamed": 1 } +o_isolatedUfButton_TouchRect = {"container": o_Overlay, "objectName": "_isolatedUfButton", "type": "TouchRect" } +o_pauseResumeButton_TouchRect = {"container": o_Overlay, "objectName": "_pauseResumeButton", "type": "TouchRect" } +o_treatmentHome_editButton_IconButton_2 = {"container": mainTreatmentScreen, "id": "_editButton", "type": "IconButton", "unnamed": 1 } +o_image_Image = {"container": o_Overlay, "id": "_image", "source": "qrc:/images/iClose", "type": "Image", "unnamed": 1 } +o_treatmentHome_upArrowIcon_ArrowButton = {"container": mainTreatmentScreen, "objectName": "upArrowIcon", "type": "ArrowButton" } +o_treatmentHome_downArrowIcon_ArrowButton = {"container": mainTreatmentScreen, "objectName": "downArrowIcon", "type": "ArrowButton" } +o_confirmTouch_ConfirmButton = {"container": o_Overlay, "id": "_confirmTouch", "type": "ConfirmButton", "unnamed": 1 } +o_bloodPressureSystolic_TextEntry = {"container": o_Overlay, "id": "_bloodPressureSystolic", "type": "TextEntry", "unnamed": 1 } +o_bloodPressureDiastolic_TextEntry = {"container": o_Overlay, "id": "_bloodPressureDiastolic", "type": "TextEntry", "unnamed": 1 } +o_heartRate_TextEntry = {"container": o_Overlay, "id": "_heartRate", "type": "TextEntry", "unnamed": 1 } +o_confirm_button = {"container": o_Overlay, "id": "_confirmButton", "type": "ConfirmButton", "unnamed": 1 } +keyboard_input = {"container": o_Overlay, "type": "Text", "unnamed": 1 } +o_treatmentHome_bloodPressure_LabelValue = {"container": mainTreatmentScreen, "id": "_bloodPressure", "type": "LabelValue", "unnamed": 1 } +o_treatmentHome_heartBeat_LabelValue = {"container": mainTreatmentScreen, "id": "_heartBeat", "type": "LabelValue", "unnamed": 1 } +o_preTreatmentStack_repeater_Repeater = {"container": o_preTreatmentStack_PreTreatmentStack, "id": "repeater", "type": "Repeater", "unnamed": 1 } +o_preTreatmentStack_PreTreatmentSampleStack_PreTreatmentWaterSample = {"container": o_preTreatmentStack_PreTreatmentStack, "objectName": "_PreTreatmentSampleStack", "type": "PreTreatmentWaterSample" } +o_PreTreatmentSampleStack_failContainer_WaterSampleContainer = {"container": o_preTreatmentStack_PreTreatmentSampleStack_PreTreatmentWaterSample, "id": "_failContainer", "type": "WaterSampleContainer", "unnamed": 1 } +o_PreTreatmentSampleStack_button_TouchRect = {"container": o_preTreatmentStack_PreTreatmentSampleStack_PreTreatmentWaterSample, "id": "_button", "type": "TouchRect", "unnamed": 1 } +o_PreTreatmentCreate_bpMeasurementIntervalControl_ValueAdjusterCustom = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_bpMeasurementIntervalControl", "type": "ValueAdjusterCustom", "unnamed": 1 } +#The `visible` property must remain in place. It ensures the element is rendered and interactable; without it, the element may not be clickable, which impactsboth user interaction and automated test execution. +o_preTreatmentStack_confirmButton_ConfirmButton = {"container": o_preTreatmentStack_PreTreatmentStack, "objectName": "_confirmButton", "type": "ConfirmButton", "visible": True } + # Service Institutional o_Row_Object = { "id": "_row", "type": "Row", "unnamed": 1 } o_SettingsBase_SettingsInstitutionalRecord = {"container": o_Gui_MainView, "objectName": "_SettingsBase", "type": "SettingsInstitutionalRecord", }