Index: sources/gui/qml/pages/posttreatment/PostTreatmentStack.qml =================================================================== diff -u -rc71946746586d5a4061ad866ce7dbbaf74b9798a -r5e3b27057e9c7dedf9c46e3881609b7e96c3fb71 --- sources/gui/qml/pages/posttreatment/PostTreatmentStack.qml (.../PostTreatmentStack.qml) (revision c71946746586d5a4061ad866ce7dbbaf74b9798a) +++ sources/gui/qml/pages/posttreatment/PostTreatmentStack.qml (.../PostTreatmentStack.qml) (revision 5e3b27057e9c7dedf9c46e3881609b7e96c3fb71) @@ -20,6 +20,7 @@ // Qml imports import "qrc:/globals" import "qrc:/components" +import "qrc:/compounds" import "qrc:/pages/posttreatment" /*! * \brief the post treatment prime stack screen @@ -32,6 +33,7 @@ signal patientDisconnectionConfirm () signal treatmentReviewConfirm () signal disposablesRemovalConfirm () + signal disposablesRemovalBack () PostTreatmentBase { id: _patientDisconnectionConfirm property int stackStepIndex : 0 @@ -41,7 +43,7 @@ onConfirmClicked : _root.patientDisconnectionConfirm() } - PostTreatmentBase { id: _treatmentReviewConfirm + PostTreatmentReview { id: _treatmentReviewConfirm property int stackStepIndex : 1 header.confirmVisible : true title.text : qsTr("Treatment Review") @@ -51,10 +53,12 @@ PostTreatmentBase { id: _disposablesRemovalConfirm property int stackStepIndex : 2 + header. backVisible : true header.confirmVisible : true title.text : qsTr("Disposables Removal") instructionBased : true onConfirmClicked : _root.disposablesRemovalConfirm() + onBackClicked : _root.disposablesRemovalBack () } Connections { target: vPostTreatmentStates @@ -66,11 +70,12 @@ Connections { target: vHDOperationMode onPostTreatmentChanged : { page( _patientDisconnectionConfirm , vpostTreatment )} } - onPatientDisconnectionConfirm : { vPostTreatmentAdjustmentPatientDisconnectionConfirm .doConfirm( ) - /* No wait for Rsp, so navigates => */ page( _treatmentReviewConfirm )} + /* No wait for Rsp, so navigates => */ page( _treatmentReviewConfirm ) + /* After navigate ask for Tx data */ vPostTreatmentAdjustmentTreatmentLog .doRequest( )} onTreatmentReviewConfirm : { page( _disposablesRemovalConfirm )} onDisposablesRemovalConfirm : { vPostTreatmentAdjustmentDisposablesRemovalConfirm .doConfirm( )} + onDisposablesRemovalBack : { page( _treatmentReviewConfirm )} Connections { target: vPostTreatmentAdjustmentDisposablesRemovalConfirm onAdjustmentTriggered : { @@ -82,6 +87,15 @@ } } + Connections { target: vPostTreatmentAdjustmentTreatmentLog + onAdjustmentTriggered : { + if ( vPostTreatmentAdjustmentTreatmentLog.adjustment_Accepted ) { + _treatmentReviewConfirm.reasonText = "" + } else { + _treatmentReviewConfirm.reasonText = vPostTreatmentAdjustmentTreatmentLog.text() + } + } + } onVisibleChanged: { if (visible) { _mainMenu.hidden = true