Index: sources/gui/qml/pages/treatment/TreatmentHome.qml =================================================================== diff -u -r56b0b13aa9f9e7ae201bce1843015fe5b4b43d2c -r3454906bbb35aa2976572145068980bf691daf1c --- sources/gui/qml/pages/treatment/TreatmentHome.qml (.../TreatmentHome.qml) (revision 56b0b13aa9f9e7ae201bce1843015fe5b4b43d2c) +++ sources/gui/qml/pages/treatment/TreatmentHome.qml (.../TreatmentHome.qml) (revision 3454906bbb35aa2976572145068980bf691daf1c) @@ -37,11 +37,12 @@ signal sectionFlowClicked() signal sectionVitalsClicked() signal sectionPressuresClicked() + signal sectionSalineClicked() signal sectionTimeClicked() signal sectionUltrafiltrationClicked() - readonly property int cellWidth : (_root.width / 7) - 10 // = screen width / # columns - readonly property int cellHeight: (Variables.screenContentHeight / 2) - Variables.notificationHeight // = screen height / # rows - headerbar + readonly property int cellWidth : Variables.treatmentCellWidth + readonly property int cellHeight: Variables.treatmentCellHeight Column { id: _column objectName: "column" @@ -71,6 +72,7 @@ objectName : "treatmentSaline" width : cellWidth + Variables.defaultMargin height : cellHeight + onEditClicked: sectionSalineClicked() } TreatmentVitals { id: _treatmentVitals @@ -120,6 +122,70 @@ } } + NotificationBarSmall { id: _notification + objectName : "_notification" + anchors.bottom : parent.bottom + height : 60 + visible : ! _alarmBar.visible && text + + CloseButton { id: _dismissButton + objectName: "_dismissButton" + anchors { + top: parent.top + bottom: parent.bottom + right: parent.right + margins: 20 + } + width: height + visible: true + onClicked: { _notification.text = "" } + } + } + + Connections { target: vTreatmentAdjustmentBloodFlowRate + function onAdjustmentTriggered ( vValue ) { + if (vTreatmentAdjustmentBloodFlowRate.adjustment_Accepted) { + _notification.text = "" + } + else { + _notification.text = vTreatmentAdjustmentBloodFlowRate.text() + } + } + } + + Connections { target: vTreatmentAdjustmentDialysateFlowRate + function onAdjustmentTriggered ( vValue ) { + if (vTreatmentAdjustmentDialysateFlowRate.adjustment_Accepted) { + _notification.text = "" + } + else { + _notification.text = vTreatmentAdjustmentDialysateFlowRate.text() + } + } + } + + Connections { target: vTreatmentAdjustmentDialysateTemperature + function onAdjustmentTriggered ( vValue ) { + if (vTreatmentAdjustmentDialysateTemperature.adjustment_Accepted) { + _notification.text = "" + } + else { + _notification.text = vTreatmentAdjustmentDialysateTemperature.text() + } + } + } + + Connections { target: vTreatmentAdjustmentPressuresWidening + function onAdjustmentTriggered ( vValue ) { + if (vTreatmentAdjustmentPressuresWidening.adjustment_Accepted) { + _notification.text = "" + } + else { + _notification.text = vTreatmentAdjustmentPressuresWidening.text() + } + } + } + onVisibleChanged: { if (visible) { _mainMenu.hidden = true