Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml =================================================================== diff -u -r477c26a4e1dcbdf7ad0f29ae7a1df4738d4dcce2 -rb07595ece768d4093d78ca1ef068a993ff4f70a3 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml (.../TreatmentAdjustmentVitals.qml) (revision 477c26a4e1dcbdf7ad0f29ae7a1df4738d4dcce2) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml (.../TreatmentAdjustmentVitals.qml) (revision b07595ece768d4093d78ca1ef068a993ff4f70a3) @@ -70,7 +70,7 @@ BPHREntry { id: _bphrEntry } Row { id: _buttonRow - spacing: Variables.defaultMargin * 2 + spacing: Variables.defaultMargin * 4 anchors { bottom : _root.contentItem.bottom @@ -89,7 +89,7 @@ font.pixelSize : Fonts.fontPixelConfirm } - onClicked: { vTreatmentAdjustmentVitals.doRequest() ; print ("BPHREntry doRequest") } + onClicked: vTreatmentAdjustmentVitals.doRequest() } ConfirmButton { id : _confirmButton @@ -117,6 +117,7 @@ Connections { target: vTreatmentAdjustmentVitals function onAdjustmentTriggered ( vValue ) { if ( vTreatmentAdjustmentVitals.adjustment_Accepted ) { + notificationText = "" // on accepted read vital data and populate _root.update ( vTreatmentVitals.systolic__rt, vTreatmentVitals.diastolic_rt, vTreatmentVitals.heartRate_rt ) @@ -127,16 +128,13 @@ } } else { // on rejected prompt user to enter vitals manually - if ( vTreatmentVitals.enableDialog ) { - _root.open () - } + if ( vTreatmentVitals.enableDialog ) { _root.open () } notificationText = rejectionTextString _bphrEntry.systolic = "" _bphrEntry.diastolic = "" _bphrEntry.heartRate = "" } - } }