Index: sources/gui/qml/pages/pretreatment/PreTreatmentInstallStack.qml =================================================================== diff -u -r1286d74bd015276aab604808be2766136091c125 -r0bc5c7e5752e76707f92b9ef1ecfe54b0c5ead29 --- sources/gui/qml/pages/pretreatment/PreTreatmentInstallStack.qml (.../PreTreatmentInstallStack.qml) (revision 1286d74bd015276aab604808be2766136091c125) +++ sources/gui/qml/pages/pretreatment/PreTreatmentInstallStack.qml (.../PreTreatmentInstallStack.qml) (revision 0bc5c7e5752e76707f92b9ef1ecfe54b0c5ead29) @@ -37,17 +37,14 @@ function continueClicked() { switch ( _root.subStepIndex ) { case PreTreatmentInstallStack.Step.BloodSetTubing: - page ( _preTreatmentBloodLines ) + vPreTreatmentAdjustmentDisposablesConfirm.doConfirm() break case PreTreatmentInstallStack.Step.BloodLines: page ( _preTreatmentPressureLinesAndDialyzer ) break case PreTreatmentInstallStack.Step.PressureLinesAndDialyzer: - page ( _pretreatmentSalineSubstitution ) + goToNextStep() break - case PreTreatmentInstallStack.Step.SalineSubStitution: - vPreTreatmentAdjustmentDisposablesConfirm.doConfirm() - break default: break } @@ -73,9 +70,8 @@ if ( vSettings.advancedMode ) { return qsTr("Auto Load") } switch ( _root.subStepIndex ) { - case PreTreatmentInstallStack.Step.SalineSubStitution: - return qsTr("Auto Load") case PreTreatmentInstallStack.Step.BloodSetTubing: + return qsTr("Auto Load") case PreTreatmentInstallStack.Step.BloodLines: case PreTreatmentInstallStack.Step.PressureLinesAndDialyzer: // fall through default: @@ -107,7 +103,8 @@ function onAdjustmentTriggered ( vValue ) { if ( vPreTreatmentAdjustmentDisposablesConfirm.adjustment_Accepted ) { _preTreatmentBloodSetTubing.reasonText = "" - goToNextStep () + if ( vSettings.advancedMode ) { goToNextStep () } + else { page ( _preTreatmentBloodLines ) } } else { _preTreatmentBloodSetTubing.reasonText = vPreTreatmentAdjustmentDisposablesConfirm.text() }