Index: sources/gui/qml/pages/posttreatment/PostTreatmentDisconnectStack.qml =================================================================== diff -u -r9c0335bc7f5a2b591a9c6241b00ebb9510ea611a -r20765b9c0e05cd7c3b0a3320606eecc1d4fdfc91 --- sources/gui/qml/pages/posttreatment/PostTreatmentDisconnectStack.qml (.../PostTreatmentDisconnectStack.qml) (revision 9c0335bc7f5a2b591a9c6241b00ebb9510ea611a) +++ sources/gui/qml/pages/posttreatment/PostTreatmentDisconnectStack.qml (.../PostTreatmentDisconnectStack.qml) (revision 20765b9c0e05cd7c3b0a3320606eecc1d4fdfc91) @@ -61,6 +61,16 @@ return _root.subStepIndex === PostTreatmentDisconnectStack.Step.DrainConsumable } + function continueEnabled() { + switch ( _root.subStepIndex ) { + case PostTreatmentDisconnectStack.Step.DisconnectPatient: + return true + case PostTreatmentDisconnectStack.Step.DrainConsumable: + return ! vTreatmentDryBicartDisconnect.depressurizeInProgress && ! vTreatmentDryBicartDisconnect.drainInProgress + default: + } + } + // ----- Screens definitions PostTreatmentBase { id: _postTreatmentDisconnectPatient; stepIndex: PostTreatmentDisconnectStack.Step.DisconnectPatient; subStepName: qsTr("Disconnect Patient BloodLines"); instructionBased: true} PostTreatmentDrainConsumables { id: _postTreatmentDrainConsumables; stepIndex: PostTreatmentDisconnectStack.Step.DrainConsumable; } Index: sources/gui/qml/pages/posttreatment/PostTreatmentStack.qml =================================================================== diff -u -r490a131c41be4c335a7fbd74ff79b5784fb1726c -r20765b9c0e05cd7c3b0a3320606eecc1d4fdfc91 --- sources/gui/qml/pages/posttreatment/PostTreatmentStack.qml (.../PostTreatmentStack.qml) (revision 490a131c41be4c335a7fbd74ff79b5784fb1726c) +++ sources/gui/qml/pages/posttreatment/PostTreatmentStack.qml (.../PostTreatmentStack.qml) (revision 20765b9c0e05cd7c3b0a3320606eecc1d4fdfc91) @@ -123,6 +123,18 @@ } } + function continueEnabled() { + switch ( _root.stackStepIndex ) { + case PostTreatmentStack.Disconnect: + return _postTreatmentDisconnectStack.continueEnabled() + case PostTreatmentStack.Remove: + case PostTreatmentStack.Review: + case PostTreatmentStack.Disinfection: // fallthrough + default: + return true + } + } + StepNavigationTitleBar { id: _titleBar stepIndex : _root.stackStepIndex anchors { @@ -137,6 +149,7 @@ backVisible : _root.backEnabled() width : _root.width stepNames : _root.stepNames + confirmEnabled : _root.continueEnabled() subStepIndex : isDisconnect ? _postTreatmentDisconnectStack.subStepIndex + 1 : 0