Index: sources/gui/qml/pages/posttreatment/PostTreatmentStack.qml =================================================================== diff -u -r6210028a421d6259963bf172efbe4f23abfecf2f -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 --- sources/gui/qml/pages/posttreatment/PostTreatmentStack.qml (.../PostTreatmentStack.qml) (revision 6210028a421d6259963bf172efbe4f23abfecf2f) +++ sources/gui/qml/pages/posttreatment/PostTreatmentStack.qml (.../PostTreatmentStack.qml) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) @@ -1,13 +1,13 @@ /*! * - * Copyright (c) 2021-2023 Diality Inc. - All Rights Reserved. + * Copyright (c) 2021-2024 Diality Inc. - All Rights Reserved. * \copyright * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * * \file PostTreatmentStack.qml * \author (last) Behrouz NematiPour - * \date (last) 23-Nov-2022 + * \date (last) 11-Aug-2023 * \author (original) Behrouz NematiPour * \date (original) 13-Apr-2021 * @@ -35,10 +35,10 @@ signal disposablesRemovalConfirm () signal disposablesRemovalBack () - onPatientDisconnectionConfirm : { vPostTreatmentAdjustmentPatientDisconnectionConfirm .doConfirm( ) + onPatientDisconnectionConfirm : { vPostTreatmentAdjustmentPatientDisconnectionConfirm .doNotify ( ) /* No wait for Rsp, so navigates => */ page( _treatmentReviewConfirm ) /* After navigation ask for Tx data */ vPostTreatmentAdjustmentTreatmentLog .doRequest( )} - onTreatmentReviewConfirm : page( _disposablesRemovalConfirm ) + onTreatmentReviewConfirm : { vPostTreatmentAdjustmentPatientDisconnectionConfirm .doConfirm( )} onDisposablesRemovalConfirm : vPostTreatmentAdjustmentDisposablesRemovalConfirm .doConfirm( ) onDisposablesRemovalBack : page( _treatmentReviewConfirm ) onVisibleChanged: { @@ -93,14 +93,27 @@ // connections Connections { target: vPostTreatmentStates - function onPatientDisconnectionChanged ( vValue ) { console.debug("patientDisconnection", vValue )} function onDrainReservoirsChanged ( vValue ) { console.debug("drainReservoirs ", vValue )} + function onPatientDisconnectionChanged ( vValue ) { console.debug("patientDisconnection", vValue )} + function onDisposableRemovalChanged ( vValue ) { console.debug("disposableRemoval ", vValue )} function onVerifyChanged ( vValue ) { console.debug("verify ", vValue )} } Connections { target: vHDOperationMode function onPostTreatmentChanged ( vValue ) { page( _patientDisconnectionConfirm , vValue )} } + + Connections { target: vPostTreatmentAdjustmentPatientDisconnectionConfirm + function onAdjustmentTriggered ( vValue ) { + if ( vPostTreatmentAdjustmentPatientDisconnectionConfirm.adjustment_Accepted ) { + page( _disposablesRemovalConfirm ) + _treatmentReviewConfirm.reasonText = "" + } else { + _treatmentReviewConfirm.reasonText = vPostTreatmentAdjustmentPatientDisconnectionConfirm.text() + } + } + } + Connections { target: vPostTreatmentAdjustmentDisposablesRemovalConfirm function onAdjustmentTriggered ( vValue ) { if ( vPostTreatmentAdjustmentDisposablesRemovalConfirm.adjustment_Accepted ) {