Index: suite_leahi/shared/scripts/names.py =================================================================== diff -u -r4b929ef6eef32479f10e84325b0ad12173474a4d -ra6d893b28af0dfab579a0c4ee00055af0a6d152d --- suite_leahi/shared/scripts/names.py (.../names.py) (revision 4b929ef6eef32479f10e84325b0ad12173474a4d) +++ suite_leahi/shared/scripts/names.py (.../names.py) (revision a6d893b28af0dfab579a0c4ee00055af0a6d152d) @@ -90,8 +90,9 @@ o_uf_Volume_LabelValue = {"container": mainTreatmentScreen, "id": "_ufVolume", "type": "LabelValue", "unnamed": 1 } o_uf_Rate_LabelValue = {"container": mainTreatmentScreen, "id": "_ufRate", "type": "LabelValue", "unnamed": 1 } o_volume_Delivered = {"container": mainTreatmentScreen, "id": "_valueText", "type": "Text", "unnamed": 1 } -o_ufVolumeRemovedItem_ValueItem = {"container": o_Overlay, "id": "_ufVolumeRemovedItem", "type": "ValueItem", "unnamed": 1 } -o_ufVolumeGoalItem_ValueItem = {"container": o_Overlay, "id": "_ufVolumeGoalItem", "type": "ValueItem", "unnamed": 1 } +o_left_LabelUnitText = {"container": o_Overlay, "objectName": "_left", "type": "LabelUnitText" } +o_right_LabelUnitText = {"container": o_Overlay, "objectName": "_right", "type": "LabelUnitText" } +o_newValues_TreatmentAdjustmentUltrafiltrationMetrics = {"container": o_Overlay, "objectName": "_newValues", "type": "TreatmentAdjustmentUltrafiltrationMetrics" } o_editButton_TouchRect = {"container": o_Overlay, "objectName": "_editButton", "type": "TouchRect" } o_volumeGoalAdjuster_ValueAdjuster = {"container": o_Overlay, "objectName": "_volumeGoalAdjuster", "type": "ValueAdjuster" } o_continueButton_TouchRect = {"container": o_Overlay, "objectName": "_continueButton", "type": "TouchRect" } @@ -173,29 +174,30 @@ 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 } - + + #prescription header bar o_prescriptionButton_IconButton = {"container": o_Gui_MainView, "id": "_prescriptionButton", "type": "IconButton", "unnamed": 1 } -o_prescriptionMenu_BaseComboBox = {"container": o_Overlay, "id": "_prescriptionMenu", "type": "BaseComboBox", "unnamed": 1 } -o_pretreatmentPatientIDEntry_TextEntry = {"container": o_Overlay, "id": "_pretreatmentPatientIDEntry", "type": "TextEntry", "unnamed": 1 } -o_bloodFlowRateControl_ValueAdjuster = {"container": o_Overlay, "id": "_bloodFlowRateControl", "type": "ValueAdjuster", "unnamed": 1 } +# o_prescriptionMenu_BaseComboBox = {"container": o_Overlay, "id": "_prescriptionMenu", "type": "BaseComboBox", "unnamed": 1 } +# o_pretreatmentPatientIDEntry_TextEntry = {"container": o_Overlay, "id": "_pretreatmentPatientIDEntry", "type": "TextEntry", "unnamed": 1 } +o_bloodFlowRateControl_ValueAdjuster = {"container": o_Overlay, "id": "_bloodFlowRate", "type": "ValueAdjuster", "unnamed": 1 } o_dialysateFlowRateControl_ValueAdjuster = {"container": o_Overlay, "id": "_dialysateFlowRateControl", "type": "ValueAdjuster", "unnamed": 1 } o_durationControl_ValueAdjuster = {"container": o_Overlay, "id": "_durationControl", "type": "ValueAdjuster", "unnamed": 1 } -o_heparinBolusVolumeControl_ValueAdjuster = {"container": o_Overlay, "id": "_heparinBolusVolumeControl", "type": "ValueAdjuster", "unnamed": 1 } -o_heparinDispensingRateControl_ValueAdjuster = {"container": o_Overlay, "id": "_heparinDispensingRateControl", "type": "ValueAdjuster", "unnamed": 1 } -o_heparinStopTimeControl_ValueAdjuster = {"container": o_Overlay, "id": "_heparinStopTimeControl", "type": "ValueAdjuster", "unnamed": 1 } -o_acidConcentrateComboBox_BaseComboBox = {"container": o_Overlay, "id": "_acidConcentrateComboBox", "type": "BaseComboBox", "unnamed": 1 } -o_dialysateTemperatureControl_ValueAdjuster = {"container": o_Overlay, "id": "_dialysateTemperatureControl", "type": "ValueAdjuster", "unnamed": 1 } -o_dialyzerTypeComboBox_BaseComboBox = {"container": o_Overlay, "id": "_dialyzerTypeComboBox", "type": "BaseComboBox", "unnamed": 1 } -o_salineBolusVolumeControl_ValueAdjuster = {"container": o_Overlay, "id": "_salineBolusVolumeControl", "type": "ValueAdjuster", "unnamed": 1 } -o_bpMeasurementIntervalControl_BaseComboBox = {"container": o_Overlay, "id": "_bpMeasurementIntervalControl", "type": "BaseComboBox", "unnamed": 1 } -o_bicarbonateConcentrateComboBox_BaseComboBox = {"container": o_Overlay, "id": "_bicarbonateConcentrateComboBox", "type": "BaseComboBox", "unnamed": 1 } -o_confirmButton_ConfirmButton = {"container": o_Overlay, "id": "_confirmButton", "type": "ConfirmButton", "unnamed": 1 } -o_qrCode_Image = {"container": o_Overlay, "id": "_qrCode", "type": "Image", "unnamed": 1 } -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 } - +# o_heparinBolusVolumeControl_ValueAdjuster = {"container": o_Overlay, "id": "_heparinBolusVolumeControl", "type": "ValueAdjuster", "unnamed": 1 } +# o_heparinDispensingRateControl_ValueAdjuster = {"container": o_Overlay, "id": "_heparinDispensingRateControl", "type": "ValueAdjuster", "unnamed": 1 } +# o_heparinStopTimeControl_ValueAdjuster = {"container": o_Overlay, "id": "_heparinStopTimeControl", "type": "ValueAdjuster", "unnamed": 1 } +# o_acidConcentrateComboBox_BaseComboBox = {"container": o_Overlay, "id": "_acidConcentrateComboBox", "type": "BaseComboBox", "unnamed": 1 } +# o_dialysateTemperatureControl_ValueAdjuster = {"container": o_Overlay, "id": "_dialysateTemperatureControl", "type": "ValueAdjuster", "unnamed": 1 } +# o_dialyzerTypeComboBox_BaseComboBox = {"container": o_Overlay, "id": "_dialyzerTypeComboBox", "type": "BaseComboBox", "unnamed": 1 } +# o_salineBolusVolumeControl_ValueAdjuster = {"container": o_Overlay, "id": "_salineBolusVolumeControl", "type": "ValueAdjuster", "unnamed": 1 } +# o_bpMeasurementIntervalControl_ValueAdjusterCustom = {"container": o_Overlay, "id": "_bpMeasurementIntervalControl", "type": "ValueAdjusterCustom", "unnamed": 1 } +# o_bicarbonateConcentrateComboBox_BaseComboBox = {"container": o_Overlay, "id": "_bicarbonateConcentrateComboBox", "type": "BaseComboBox", "unnamed": 1 } +# o_confirmButton_ConfirmButton = {"container": o_Overlay, "id": "_confirmButton", "type": "ConfirmButton", "unnamed": 1 } +# o_qrCode_Image = {"container": o_Overlay, "id": "_qrCode", "type": "Image", "unnamed": 1 } +# 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 } @@ -223,7 +225,7 @@ o_PreTreatmentCreate_pretreatmentPatientIDEntry_TextEntry = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_pretreatmentPatientIDEntry", "type": "TextEntry", "unnamed": 1 } 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 } - + # Settings Service o_SettingsStack_SettingsStack = {"container": o_Gui_MainView, "objectName": "_SettingsStack", "type": "SettingsStack", } o_UserConfirmation_SettingsServicePassword = {"container": o_SettingsStack_SettingsStack, "objectName": "UserConfirmation", "type": "SettingsServicePassword", } @@ -300,7 +302,7 @@ 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 } +# 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 } @@ -328,3 +330,29 @@ 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 } +#New design create Rx +o_createHDTreatment_TouchRect = {"container": o_standByScreen_MainHome, "id": "_createHDTreatment", "type": "TouchRect", "unnamed": 1 } +o_PreTreatmentCreate_leftColumn_Column = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_leftColumn", "type": "Column", "unnamed": 1 } +o_PreTreatmentCreate_rightColumn_Column = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_rightColumn", "type": "Column", "unnamed": 1 } +o_LabelUnitValueAdjuster_LabelUnitValueAdjuster = {"container": o_Overlay, "objectName": "_LabelUnitValueAdjuster", "type": "LabelUnitValueAdjuster" } +o_heparinDispensingRate_LabelUnitValueAdjuster = {"container": o_Overlay, "objectName": "_LabelUnitValueAdjuster", "id": "_heparinDispensingRate", "type": "LabelUnitValueAdjuster" } +o_heparinDeliveryDuration_LabelUnitValueAdjuster = {"container": o_Overlay, "objectName": "_LabelUnitValueAdjuster", "id": "_heparinDeliveryDuration", "type": "LabelUnitValueAdjuster" } +o_PreTreatmentCreate_leftColumn_Column_2 = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_leftColumn", "type": "Column", "unnamed": 1 } +o_PreTreatmentCreate_rightColumn_Column_2 = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_rightColumn", "type": "Column", "unnamed": 1 } +o_PreTreatmentCreate_sodium_LabelUnitValueAdjuster = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_sodium", "objectName": "_LabelUnitValueAdjuster", "type": "LabelUnitValueAdjuster" } +o_PreTreatmentCreate_bicarbonate_LabelUnitValueAdjuster = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_bicarbonate", "objectName": "_LabelUnitValueAdjuster", "type": "LabelUnitValueAdjuster" } +o_PreTreatmentCreate_fluidBolusVolume_LabelUnitValueAdjuster = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_fluidBolusVolume", "objectName": "_LabelUnitValueAdjuster", "type": "LabelUnitValueAdjuster" } +o_PreTreatmentCreate_primeRinsebackVolume_LabelUnitValueAdjuster= {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_primeRinsebackVolume", "objectName": "_LabelUnitValueAdjuster", "type": "LabelUnitValueAdjuster" } +o_PreTreatmentCreate_listView_ListView = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_listView", "type": "ListView", "unnamed": 1 } +o_createHDFTreatment_TouchRect = {"container": o_standByScreen_MainHome, "id": "_createHDFTreatment", "type": "TouchRect", "unnamed": 1 } +o_PreTreatmentCreate_hdfTreatmentMode_LabelUnitContainer = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_hdfTreatmentMode", "type": "LabelUnitContainer", "unnamed": 1 } +o_PreTreatmentCreate_treatmentModalityComboBox_BaseComboBox = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_treatmentModalityComboBox", "type": "BaseComboBox", "unnamed": 1 } + +#prescription_header_bar +o_leftColumn_Column = {"container": o_Overlay, "id": "_leftColumn", "type": "Column", "unnamed": 1} +o_PostTreatmentStack_postTreatmentDisconnectStack_PostTreatmentDisconnectStack = {"container": o_PostTreatmentStack_PostTreatmentStack, "id": "_postTreatmentDisconnectStack", "type": "PostTreatmentDisconnectStack", "unnamed": 1, "visible": True} +o_postTreatmentDisconnectStack_PostTreatmentBase_PostTreatmentBase = {"container": o_PostTreatmentStack_postTreatmentDisconnectStack_PostTreatmentDisconnectStack, "objectName": "_PostTreatmentBase", "type": "PostTreatmentBase", "visible": True} +o_PostTreatmentBase_instructionView_InstructionView = {"container": o_postTreatmentDisconnectStack_PostTreatmentBase_PostTreatmentBase, "id": "_instructionView", "type": "InstructionView", "unnamed": 1} +o_PostTreatmentStack_confirmButton_ConfirmButton = {"container": o_PostTreatmentStack_PostTreatmentStack, "objectName": "_confirmButton", "type": "ConfirmButton", "visible": True} + +