Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml =================================================================== diff -u -r7d2122a9a4330ebc2ff4c22be36f32e9a82417ec -r13d04e674e9d22091bcc72b97574bbba21fdc9c9 --- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml (.../PreTreatmentCreate.qml) (revision 7d2122a9a4330ebc2ff4c22be36f32e9a82417ec) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml (.../PreTreatmentCreate.qml) (revision 13d04e674e9d22091bcc72b97574bbba21fdc9c9) @@ -29,12 +29,16 @@ PreTreatmentBase { id: _root objectName: "_PreTreatmentCreate" // SquishQt testability - header.backVisible : false + header.backVisible : true header.confirmVisible : true title.visible : false header.confirmEnabled : _preTreatmentCreateContent.confirmReady() - onConfirmClicked : _preTreatmentCreateContent.confirm() + header.confirmText.text : vTreatmentCreate.parametersValidated ? qsTr("CONFIRM") : qsTr("VALIDATE") + onConfirmClicked : vTreatmentCreate.parametersValidated ? _preTreatmentCreateContent.confirm() : _preTreatmentCreateContent.validate() + + onBackClicked : vTreatmentCreate.doCancel() + function clear( vValue ) { if ( ! vValue ) return _preTreatmentCreateContent.clear() Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml =================================================================== diff -u -rc62102200fea4a7acdee773156e6647a30d77967 -r13d04e674e9d22091bcc72b97574bbba21fdc9c9 --- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml (.../PreTreatmentCreateContent.qml) (revision c62102200fea4a7acdee773156e6647a30d77967) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml (.../PreTreatmentCreateContent.qml) (revision 13d04e674e9d22091bcc72b97574bbba21fdc9c9) @@ -73,7 +73,7 @@ _bpMeasurementIntervalControl .active && _bpMeasurementInterval .valid } - function confirm () { + function validate () { vTreatmentCreate .patientID = _pretreatmentPatientIDEntry.text vPostTreatmentAdjustmentTreatmentLog.patientID = _pretreatmentPatientIDEntry.text // store for the TreatmentLog @@ -84,6 +84,8 @@ vTreatmentCreate.doValidation ( ) } + function confirm () { vTreatmentCreate.doConfirm() } + Connections{ target: vTreatmentCreate function onDidValidationPass ( vValue ) { vPostTreatmentAdjustmentTreatmentLog.heparinDispensingRateOff = vTreatmentCreate.heparinDispensingRateOff = ! vTreatmentCreate.heparinDispensingRate @@ -101,7 +103,6 @@ vTreatmentCreate.dialysateTempRejectReason = Variables.noRejectReason vTreatmentCreate.salineBolusVolumeRejectReason = Variables.noRejectReason vTreatmentCreate.bloodPressureMeasureIntervalRejectReason = Variables.noRejectReason - vTreatmentCreate.doConfirm () _root.editingEnabled = false } } Index: sources/view/VTreatmentCreate.cpp =================================================================== diff -u -rc62102200fea4a7acdee773156e6647a30d77967 -r13d04e674e9d22091bcc72b97574bbba21fdc9c9 --- sources/view/VTreatmentCreate.cpp (.../VTreatmentCreate.cpp) (revision c62102200fea4a7acdee773156e6647a30d77967) +++ sources/view/VTreatmentCreate.cpp (.../VTreatmentCreate.cpp) (revision 13d04e674e9d22091bcc72b97574bbba21fdc9c9) @@ -64,6 +64,8 @@ data.mHeparinBolusVolume = _heparinBolusVolume ; emit didAdjustment(data); + parametersConfirmed(false); + parametersValidated(false); } /** @@ -76,6 +78,8 @@ AdjustParametersConfirmRequestData confirmTreatmentRequest; confirmTreatmentRequest.requestedState = AdjustParametersConfirmRequestData::eConfirm; emit didAdjustment(confirmTreatmentRequest); + parametersConfirmed(true); + } /** @@ -131,10 +135,12 @@ trancembrncPressureLimitWindowRejectReason (data.mTrancembrncPressureLimitWindowRejectReason ); emit didValidationFail(); + parametersValidated(false); } else { if ( _txCode.isEmpty()) { generateTxCode(); } emit didValidationPass(); + parametersValidated(true); } } Index: sources/view/VTreatmentCreate.h =================================================================== diff -u -rd862dfcd402206e33b314c458e41c13b684a4565 -r13d04e674e9d22091bcc72b97574bbba21fdc9c9 --- sources/view/VTreatmentCreate.h (.../VTreatmentCreate.h) (revision d862dfcd402206e33b314c458e41c13b684a4565) +++ sources/view/VTreatmentCreate.h (.../VTreatmentCreate.h) (revision 13d04e674e9d22091bcc72b97574bbba21fdc9c9) @@ -100,7 +100,8 @@ VALUESET(float , heparinBolusVolume , 0) VALUESET(QString , patientID ,"") - VALUESET(bool , continueEnabled , 0) + VALUESET(bool , parametersValidated , 0) + VALUESET(bool , parametersConfirmed , 0) PROPERTY(QString , txCode ,"")