Index: sources/gui/qml/pages/treatment/sections/TreatmentHeparin.qml =================================================================== diff -u -r16f8cc023ada8e2408164a89d61a036ca0e0cfac -rdf0329c47627ceb1fe460cda2ae3ff8c9c851106 --- sources/gui/qml/pages/treatment/sections/TreatmentHeparin.qml (.../TreatmentHeparin.qml) (revision 16f8cc023ada8e2408164a89d61a036ca0e0cfac) +++ sources/gui/qml/pages/treatment/sections/TreatmentHeparin.qml (.../TreatmentHeparin.qml) (revision df0329c47627ceb1fe460cda2ae3ff8c9c851106) @@ -34,6 +34,8 @@ readonly property bool isDispensing : vHDTreatmentStates.hpDispensing readonly property bool isCompleted : vHDTreatmentStates.hpCompleted readonly property bool isEmpty : vHDTreatmentStates.hpEmpty + readonly property bool isRejected : vTreatmentAdjustmentHeparin.adjustment_Accepted + readonly property bool displayReason : _private.displayReason readonly property bool isTxRunning : vHDTreatmentStates.txDialysis @@ -51,6 +53,8 @@ readonly property string mesgStopped : qsTr("Delivery Stopped") readonly property string mesgPaused : qsTr("Delivery Paused") readonly property string mesgDispensing : qsTr("Dispensing Active") + + property bool displayReason : false readonly property string mesgRejectReason : vTreatmentAdjustmentHeparin.adjustment_ReasonText } @@ -83,15 +87,27 @@ if ( isDispensing ) vTreatmentAdjustmentHeparin.doPause () } + Connections { target: vTreatmentAdjustmentHeparin + onAdjustmentTriggered : { + _private.displayReason = ! vTreatmentAdjustmentHeparin.adjustment_Accepted + } + } + Connections { target: vHDTreatmentStates + onHeparinChanged: { + _private.displayReason = false + } + + } + notification { visible : true - text : isBolus ? _private.mesgBolus : + text : displayReason ? _private.mesgRejectReason : + isBolus ? _private.mesgBolus : isOff ? _private.mesgOff : isStopped ? _private.mesgStopped : isPaused ? _private.mesgPaused : isCompleted ? _private.mesgCompleted : isEmpty ? _private.mesgEmpty : - isDispensing ? _private.mesgDispensing : - _private.mesgRejectReason + isDispensing ? _private.mesgDispensing : "" } }