Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml =================================================================== diff -u -r47e53a72dae5a817465b3ef0be9f98a9dd16f60a -rb4d8fe6f11b7cdf0c631b3ab35ba36f18e0d7bc4 --- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml (.../PreTreatmentCreateContent.qml) (revision 47e53a72dae5a817465b3ef0be9f98a9dd16f60a) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml (.../PreTreatmentCreateContent.qml) (revision b4d8fe6f11b7cdf0c631b3ab35ba36f18e0d7bc4) @@ -37,6 +37,7 @@ readonly property string clearAll : qsTr( "Clear All" ) property bool editingEnabled : true + property bool isRxProfile : false onIsValidatedChanged : canEdit ( ! isValidated ) @@ -115,6 +116,7 @@ _dialysateTemperatureControl .isActive && _dialysateTemperature .valid && _salineBolusVolumeControl .isActive && _salineBolusVolume .valid && _bpMeasurementIntervalControl .isActive + (_root.isRxProfile ? _patientID.text != "" : true ) } function validate () { @@ -224,20 +226,20 @@ contentArea.anchors.leftMargin : 120 contentItem : TextEntry { id: _pretreatmentPatientIDEntry - clip : true textInput.width : parent.width - Variables.defaultMargin * 4 - text : vTreatmentCreate.patientID + clip : true + text : _root.isRxProfile ? qsTr("Profile Name") : qsTr("Patient ID") anchors.centerIn : parent textInput.maximumLength : 20 // LEAHI-PRS-236 textInput.rightPadding : Variables.defaultMargin textInput.leftPadding : Variables.defaultMargin * 14 textInput.inputMethodHints : Qt.ImhPreferLowercase textInput.echoMode : TextInput.Normal - textInput.validator : RegExpValidator { regExp: Variables.regExp_PatientID } line.visible : false enabled : _root.editingEnabled onEditingFinished : vTreatmentCreate.patientID = text + textInput.validator : RegExpValidator { regExp: _root.isRxProfile Text { id: _patientIDPlaceHolderText text : Variables.emptyEntry anchors.fill : parent