Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltration.qml =================================================================== diff -u -rf2aa3ee850de1023cfc011b845ed0364d251b749 -r135c320c850b09365c04e03d95195412c12fba72 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltration.qml (.../TreatmentAdjustmentUltrafiltration.qml) (revision f2aa3ee850de1023cfc011b845ed0364d251b749) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltration.qml (.../TreatmentAdjustmentUltrafiltration.qml) (revision 135c320c850b09365c04e03d95195412c12fba72) @@ -29,12 +29,11 @@ objectName: "_TreatmentAdjustmentUltrafiltration" // ultrafiltration state information bar properties - readonly property bool isUFPaused : vTreatmentUltrafiltration.ufPaused + readonly property bool isUFPaused: vTreatmentUltrafiltration.ufPaused closeVisible : true confirmVisible : false backVisible : _ufStack.stackView.depth > 1 - titleText : qsTr("Ultrafiltration Volume ") + Variables.unitTextUltrafiltrationVolume onAboutToShow : { _ufStack.reset() } onClosed : { _ufStack.reset() } @@ -71,13 +70,11 @@ TreatmentAdjustmentUltrafiltrationStart { id: _treatmentAdjustmentUltrafiltrationStart visible: false - StackView.onActivated : { + StackView.onActivating : { _root.titleText = Qt.binding( function() { return qsTr("Ultrafiltration Volume ") + Variables.unitTextUltrafiltrationVolume } ) - _root.notificationText = Qt.binding( - function() { return vTreatmentAdjustmentUltrafiltrationState.adjustment_ReasonText } - ) + _root.notificationText = "" } onPauseClicked : { // send pause to TD and wait. @@ -100,13 +97,11 @@ TreatmentAdjustmentUltrafiltrationEdit { id: _treatmentAdjustmentUltrafiltrationEdit visible: false - StackView.onActivated : { + StackView.onActivating : { _root.titleText = Qt.binding( function() { return qsTr("Ultrafiltration Volume ") + Variables.unitTextUltrafiltrationVolume } ) - _root.notificationText = Qt.binding( - function() { return vTreatmentAdjustmentUltrafiltrationEdit.adjustment_ReasonText } - ) + _root.notificationText = "" } onContinueClicked : function(vVolume) { // send Volume to TD and wait. @@ -117,19 +112,25 @@ TreatmentAdjustmentUltrafiltrationConfirm { id: _treatmentAdjustmentUltrafiltrationConfirm visible: false - StackView.onActivated : { + StackView.onActivating : { _root.titleText = Qt.binding( function() { return qsTr("Confirm Ultrafiltration Volume ") + Variables.unitTextUltrafiltrationVolume } ) - _root.notificationText = Qt.binding( - function() { return vTreatmentAdjustmentUltrafiltrationConfirm.adjustment_ReasonText } - ) + _root.notificationText = "" } onConfirmVolumeClicked : { vTreatmentAdjustmentUltrafiltrationConfirm.doConfirm(vVolume) } } + Connections { target: vTreatmentAdjustmentUltrafiltrationState + function onAdjustmentTriggered ( vValue ) { + if (_treatmentAdjustmentUltrafiltrationStart.StackView.status === StackView.Active) { + notification.text = vTreatmentAdjustmentUltrafiltrationState.adjustment_ReasonText + } + } + } + Connections { target: vTreatmentAdjustmentUltrafiltrationEdit function onAdjustmentTriggered ( vValue ) { if (vTreatmentAdjustmentUltrafiltrationEdit.adjustment_Accepted) { @@ -138,6 +139,11 @@ _ufStack.stackView.push(_treatmentAdjustmentUltrafiltrationConfirm) } + else { + if (_treatmentAdjustmentUltrafiltrationEdit.StackView.status === StackView.Active) { + notification.text = vTreatmentAdjustmentUltrafiltrationEdit.adjustment_ReasonText + } + } } } @@ -146,6 +152,11 @@ if (vTreatmentAdjustmentUltrafiltrationConfirm.adjustment_Accepted) { close() } + else { + if (_treatmentAdjustmentUltrafiltrationConfirm.StackView.status === StackView.Active) { + notification.text = vTreatmentAdjustmentUltrafiltrationConfirm.adjustment_ReasonText + } + } } } }