Index: sources/gui/qml/pages/treatment/TreatmentHome.qml =================================================================== diff -u -r45ce5cd058a8d0239d486e0ab4b057731f7dba76 -rd4b7643b0a19278ea948a75553ff777e4e436c22 --- sources/gui/qml/pages/treatment/TreatmentHome.qml (.../TreatmentHome.qml) (revision 45ce5cd058a8d0239d486e0ab4b057731f7dba76) +++ sources/gui/qml/pages/treatment/TreatmentHome.qml (.../TreatmentHome.qml) (revision d4b7643b0a19278ea948a75553ff777e4e436c22) @@ -99,6 +99,7 @@ objectName : "treatmentUltrafiltration" width : cellWidth * 3 height : cellHeight + header.setEditActive: ! isTreatmentEnd // LEAHI-PRS-376 onEditClicked : sectionUltrafiltrationClicked() } @@ -128,70 +129,64 @@ height : 60 visible : ! _alarmBar.visible && text - property int source: -1 - - onTextChanged: { - if (text === "") { - source = -1 - } - } - CloseButton { id: _dismissButton objectName: "_dismissButton" anchors { - top: parent.top - bottom: parent.bottom - right: parent.right - margins: 20 + top : parent.top + bottom : parent.bottom + right : parent.right + margins : 20 } - width: height - visible: true - onClicked: { _notification.text = "" } + width : height + visible : true + onClicked : { _notification.text = "" } } } Connections { target: vTreatmentAdjustmentBloodFlowRate function onAdjustmentTriggered ( vValue ) { if (vTreatmentAdjustmentBloodFlowRate.adjustment_Accepted) { - if (_notification.source === 0) { - _notification.text = "" - } + _notification.text = "" } else { _notification.text = vTreatmentAdjustmentBloodFlowRate.text() - _notification.source = 0 } } } Connections { target: vTreatmentAdjustmentDialysateFlowRate function onAdjustmentTriggered ( vValue ) { if (vTreatmentAdjustmentDialysateFlowRate.adjustment_Accepted) { - if (_notification.source === 1) { - _notification.text = "" - } + _notification.text = "" } else { _notification.text = vTreatmentAdjustmentDialysateFlowRate.text() - _notification.source = 1 } } } Connections { target: vTreatmentAdjustmentDialysateTemperature function onAdjustmentTriggered ( vValue ) { if (vTreatmentAdjustmentDialysateTemperature.adjustment_Accepted) { - if (_notification.source === 2) { - _notification.text = "" - } + _notification.text = "" } else { _notification.text = vTreatmentAdjustmentDialysateTemperature.text() - _notification.source = 2 } } } + Connections { target: vTreatmentAdjustmentSaline + function onAdjustmentTriggered ( vValue ) { + if (vTreatmentAdjustmentSaline.adjustment_Accepted) { + _notification.text = "" + } + else { + _notification.text = vTreatmentAdjustmentSaline.text() + } + } + } + onVisibleChanged: { if (visible) { _mainMenu.hidden = true