Index: sources/gui/qml/pages/treatment/TreatmentHome.qml =================================================================== diff -u -r9bd436782039b50ac45eb38f561a36706517271b -r3454906bbb35aa2976572145068980bf691daf1c --- sources/gui/qml/pages/treatment/TreatmentHome.qml (.../TreatmentHome.qml) (revision 9bd436782039b50ac45eb38f561a36706517271b) +++ 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" @@ -61,59 +62,56 @@ height: cellHeight TreatmentTime { id: _treatmentTime - objectName: "treatmentTime" - width: (cellWidth * 2) - (Variables.defaultMargin * 2) - height: cellHeight - onClicked: sectionTimeClicked() + objectName : "treatmentTime" + width : (cellWidth * 2) - (Variables.defaultMargin * 2) + height : cellHeight + onClicked : sectionTimeClicked() } TreatmentSaline { id: _treatmentSaline - objectName: "treatmentSaline" - - width: cellWidth + Variables.defaultMargin - height: cellHeight + objectName : "treatmentSaline" + width : cellWidth + Variables.defaultMargin + height : cellHeight + onEditClicked: sectionSalineClicked() } TreatmentVitals { id: _treatmentVitals - objectName: "treatmentVitals" - - width: cellWidth + Variables.defaultMargin - height: cellHeight - onEditClicked: sectionVitalsClicked() + objectName : "treatmentVitals" + width : cellWidth + Variables.defaultMargin + height : cellHeight + onEditClicked : sectionVitalsClicked() } - TreatmentPressures { id: _treatmentPressures - objectName: "treatmentPressures" - - width: (cellWidth * 3) - (Variables.defaultMargin * 2) // without auto layouts needs to fine tune - height: cellHeight - onEditClicked: sectionPressuresClicked() + TreatmentPressures { id: _treatmentPressures + objectName : "treatmentPressures" + width : (cellWidth * 3) - (Variables.defaultMargin * 2) // without auto layouts needs to fine tune + height : cellHeight + onEditClicked : sectionPressuresClicked() } } Row { id: _bottomRow - objectName: "bottomRow" + objectName : "bottomRow" + spacing : Variables.defaultMargin + height : cellHeight - spacing: Variables.defaultMargin - height: cellHeight + TreatmentUltrafiltration { id: _treatmentUltrafiltration; + objectName : "treatmentUltrafiltration" + width : cellWidth * 3 + height : cellHeight - TreatmentUltrafiltration { id: _treatmentUltrafiltration; - objectName: "treatmentUltrafiltration" - - width: cellWidth * 3 - height: cellHeight onEditClicked : sectionUltrafiltrationClicked() } TreatmentFlows { id: _treatmentFlows - objectName: "treatmentFlows" - - width: cellWidth * 4 - height: cellHeight - + objectName : "treatmentFlows" + width : cellWidth * 4 + height : cellHeight + header.setEditActive: ! isTreatmentEnd // LEAHI-PRS-376 + editEnabled : ! _lockDialog.isLocked onEditClicked : sectionFlowClicked() onLockClicked : { - _lockDialog.isLocked = editEnabled + _lockDialog.isLocked = editEnabled _lockDialog.showDialog ( editEnabled ? qsTr("Treatment Parameters Unlocked") : qsTr("Treatment Parameters Locked"), @@ -124,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