Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltration.qml =================================================================== diff -u -rb2844bc11b33db3c2c5845fa6728ab3d1472e4e8 -r71bb1dea18ee4340d90d894a7ab8e147b5977bb4 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltration.qml (.../TreatmentAdjustmentUltrafiltration.qml) (revision b2844bc11b33db3c2c5845fa6728ab3d1472e4e8) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltration.qml (.../TreatmentAdjustmentUltrafiltration.qml) (revision 71bb1dea18ee4340d90d894a7ab8e147b5977bb4) @@ -68,12 +68,12 @@ } TreatmentAdjustmentUltrafiltrationStart { id: _treatmentAdjustmentUltrafiltrationStart - visible: false + objectName : "_treatmentAdjustmentUltrafiltrationStart" + visible : false + StackView.onActivating : { - _root.titleText = Qt.binding( - function() { return qsTr("Ultrafiltration Volume ") + Variables.unitTextUltrafiltrationVolume } - ) - _root.notificationText = "" + _root.titleText = qsTr("Ultrafiltration Volume ") + Variables.unitTextUltrafiltrationVolume + _root.notificationText = "" } onPauseClicked : { // send pause to TD and wait. @@ -95,12 +95,12 @@ } TreatmentAdjustmentUltrafiltrationEdit { id: _treatmentAdjustmentUltrafiltrationEdit - visible: false + objectName : "_treatmentAdjustmentUltrafiltrationEdit" + visible : false + StackView.onActivating : { - _root.titleText = Qt.binding( - function() { return qsTr("Ultrafiltration Volume ") + Variables.unitTextUltrafiltrationVolume } - ) - _root.notificationText = "" + _root.titleText = qsTr("Ultrafiltration Volume ") + Variables.unitTextUltrafiltrationVolume + _root.notificationText = "" } onContinueClicked : function(vVolume) { // send Volume to TD and wait. @@ -110,12 +110,12 @@ } TreatmentAdjustmentUltrafiltrationConfirm { id: _treatmentAdjustmentUltrafiltrationConfirm - visible: false + objectName : "_treatmentAdjustmentUltrafiltrationConfirm" + visible : false + StackView.onActivating : { - _root.titleText = Qt.binding( - function() { return qsTr("Confirm Ultrafiltration Volume ") + Variables.unitTextUltrafiltrationVolume } - ) - _root.notificationText = "" + _root.titleText = qsTr("Confirm Ultrafiltration Volume ") + Variables.unitTextUltrafiltrationVolume + _root.notificationText = "" } onConfirmVolumeClicked : { vTreatmentAdjustmentUltrafiltrationConfirm.doConfirm(vVolume) @@ -124,7 +124,10 @@ Connections { target: vTreatmentAdjustmentUltrafiltrationState function onAdjustmentTriggered ( vValue ) { - if (_treatmentAdjustmentUltrafiltrationStart.StackView.status === StackView.Active) { + if (vTreatmentAdjustmentUltrafiltrationState.adjustment_Accepted) { + notification.text = "" + } + else { notification.text = vTreatmentAdjustmentUltrafiltrationState.adjustment_ReasonText } } @@ -133,6 +136,8 @@ Connections { target: vTreatmentAdjustmentUltrafiltrationEdit function onAdjustmentTriggered ( vValue ) { if (vTreatmentAdjustmentUltrafiltrationEdit.adjustment_Accepted) { + notification.text = "" + _treatmentAdjustmentUltrafiltrationConfirm.ultrafiltrationVolume = vTreatmentAdjustmentUltrafiltrationEdit.volume _treatmentAdjustmentUltrafiltrationConfirm.ultrafiltrationRate = vTreatmentAdjustmentUltrafiltrationEdit.rate @@ -141,22 +146,19 @@ } } else { - if (_treatmentAdjustmentUltrafiltrationEdit.StackView.status === StackView.Active) { - notification.text = vTreatmentAdjustmentUltrafiltrationEdit.adjustment_ReasonText - } + notification.text = vTreatmentAdjustmentUltrafiltrationEdit.adjustment_ReasonText } } } Connections { target: vTreatmentAdjustmentUltrafiltrationConfirm function onAdjustmentTriggered ( vValue ) { if (vTreatmentAdjustmentUltrafiltrationConfirm.adjustment_Accepted) { + notification.text = "" close() } else { - if (_treatmentAdjustmentUltrafiltrationConfirm.StackView.status === StackView.Active) { - notification.text = vTreatmentAdjustmentUltrafiltrationConfirm.adjustment_ReasonText - } + notification.text = vTreatmentAdjustmentUltrafiltrationConfirm.adjustment_ReasonText } } }