Index: sources/gui/qml/pages/treatment/TreatmentStack.qml =================================================================== diff -u -r153409973471214f29d5fad170a8b4ec0f4c4f2e -ra25dee6ed9a8cd343056d92bc3a78617eed66a6f --- sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 153409973471214f29d5fad170a8b4ec0f4c4f2e) +++ sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision a25dee6ed9a8cd343056d92bc3a78617eed66a6f) @@ -31,6 +31,7 @@ import "qrc:/globals" import "qrc:/components" import "qrc:/pages/treatment/adjustments" +import "qrc:/pages/pretreatment/create" /*! * \brief TreatmentStack is the screen @@ -112,24 +113,24 @@ } } - TreatmentCreate { id: _treatmentCreate - onClickedBack : {vTreatmentCreate.doCancelSelectingParameters() } - onClickedContinue : {vTreatmentCreate.doFinishedCreate(); } + PreTreatmentCreate { id: _pretreatmentCreate + onBackClicked : {vTreatmentCreate.doCancelSelectingParameters() } + onContinueClicked : {vTreatmentCreate.doFinishedCreate(); } } - TreatmentConfirm { id: _treatmentConfirm - onClickedBack : {vTreatmentCreate.doCancelConfirmParameters() } - onClickedConfirm : {vTreatmentCreate.doFinishedConfirm(); } + PreTreatmentConfirm { id: _pretreatmentConfirm + onBackClicked : {vTreatmentCreate.doCancelConfirmParameters() } + onConfirmClicked : {vTreatmentCreate.doFinishedConfirm(); } } - TreatmentPrime { id: _treatmentPrime - onClickedBack : {vTreatmentCreate.doRequestPop() } - onClickedContinue : {vTreatmentCreate.doFinishedPrime(); } + PreTreatmentPrime { id: _pretreatmentPrime + onBackClicked : {vTreatmentCreate.doRequestPop() } + onContinueClicked : {vTreatmentCreate.doFinishedPrime(); } } - TreatmentBegin { id: _treatmentBegin - onClickedBack : {vTreatmentCreate.doRequestPop() } - onClickedStart : {vTreatmentCreate.doStartTreatment(); } + PreTreatmentUltrafiltration { id: _pretreatmentUltrafiltration + onBackClicked : {vTreatmentCreate.doRequestPop() } + onStartClicked : {vTreatmentAdjustmentUltrafiltrationInit.doAdjustment(_pretreatmentUltrafiltration.ufVolume) } } //// Treatment Adjustment Dialogs @@ -233,6 +234,21 @@ } } + Connections { target: vTreatmentAdjustmentUltrafiltrationInit + onAdjustmentTriggered : { + // the maximum ultrafiltration volume has to be set/revert regardless + vTreatmentUltrafiltration.maximum = vTreatmentAdjustmentUltrafiltrationInit.volume + _pretreatmentUltrafiltration.ufVolume = vTreatmentAdjustmentUltrafiltrationInit.volume + // but only if it has been accepted it will navigate + if (vTreatmentAdjustmentUltrafiltrationInit.adjustment_Accepted) { + vTreatmentCreate.doStartTreatment() + } + else { + _pretreatmentUltrafiltration.reasonText = vTreatmentAdjustmentUltrafiltrationInit.text() + } + } + } + Connections { target: vTreatmentAdjustmentUltrafiltrationState onAdjustmentTriggered : { if ( vTreatmentAdjustmentUltrafiltrationState.adjustment_Accepted ) { @@ -302,10 +318,10 @@ } Connections { target: vTreatmentCreate - onShowCreate : { push(_treatmentCreate) } - onShowConfirm : { push(_treatmentConfirm) } - onShowPrime : { push(_treatmentPrime) } - onShowBegin : { push(_treatmentBegin) } + onShowCreate : { push(_pretreatmentCreate) } + onShowConfirm : { push(_pretreatmentConfirm) } + onShowPrime : { push(_pretreatmentPrime) } + onShowBegin : { push(_pretreatmentUltrafiltration) } onPop : { pop() } onShowTreatmentStart : { push(_treatmentStart) } }