Index: sources/gui/qml/pages/pretreatment/connection/PreTreatmentConnectionStack.qml =================================================================== diff -u -r05502bb4afa7492fcaf9ad5a9b1d5cc23c61715e -rc4dffe90d1a236a107599027b0b4248d25314af6 --- sources/gui/qml/pages/pretreatment/connection/PreTreatmentConnectionStack.qml (.../PreTreatmentConnectionStack.qml) (revision 05502bb4afa7492fcaf9ad5a9b1d5cc23c61715e) +++ sources/gui/qml/pages/pretreatment/connection/PreTreatmentConnectionStack.qml (.../PreTreatmentConnectionStack.qml) (revision c4dffe90d1a236a107599027b0b4248d25314af6) @@ -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 PreTreatmentConnectionStack.qml - * \author (last) Vy - * \date (last) 18-May-2023 + * \author (last) Behrouz NematiPour + * \date (last) 23-Sep-2024 * \author (original) Behrouz NematiPour * \date (original) 18-Mar-2021 * @@ -35,13 +35,23 @@ property int stackStepIndex : 7 + function clear() { + _preTreatmentVitals .clear() + _preTreatmentUltrafiltration.clear() + + } + PreTreatmentBase { id: _preTreatmentVitals // BP/HR Entry function update(vSystolic, vDiastolic ,vHeartRate) { _bphrEntry.systolic = vSystolic ? vSystolic : "" _bphrEntry.diastolic = vDiastolic ? vDiastolic : "" _bphrEntry.heartRate = vHeartRate ? vHeartRate : "" } + function clear() { + _bphrEntry.clear() + } + header.stepIndex : 5 header.confirmText.text : qsTr("CONFIRM") header.backVisible : false @@ -129,8 +139,9 @@ Connections { target: vPreTreatmentAdjustmentUltrafiltrationInit function onAdjustmentTriggered ( vValue ) { // the maximum ultrafiltration volume has to be set/revert regardless - vTreatmentUltrafiltration.maximum = vPreTreatmentAdjustmentUltrafiltrationInit.volume - _preTreatmentUltrafiltration.ufVolume = vPreTreatmentAdjustmentUltrafiltrationInit.volume + vTreatmentUltrafiltration.maximum = vPreTreatmentAdjustmentUltrafiltrationInit.volume + _preTreatmentUltrafiltration.reset ( vPreTreatmentAdjustmentUltrafiltrationInit.volume ) + // but only if it has been accepted it will navigate if ( vPreTreatmentAdjustmentUltrafiltrationInit.adjustment_Accepted ) { page( _preTreatmentPatientConnection ) @@ -186,6 +197,7 @@ _mainMenu.hidden = true } else { + clear() stackView.initialItem = null } }