Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml =================================================================== diff -u -rde099919f262c3429cb0592ef71deb6a16e92892 -r83d2e1a9625c2035214bf6604d1603736877dab8 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml (.../TreatmentAdjustmentVitals.qml) (revision de099919f262c3429cb0592ef71deb6a16e92892) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml (.../TreatmentAdjustmentVitals.qml) (revision 83d2e1a9625c2035214bf6604d1603736877dab8) @@ -167,25 +167,24 @@ Connections { target: vTreatmentVitals // Vitals Request - function onDidTrigger () { + function onDidTimeout () { vTreatmentAdjustmentVitals.doRequest() vTreatmentVitals.doTimerStart() } + + // Vitals Reading Ready + function onDidTrigger() { + _root.update ( vTreatmentVitals.systolic__rt, vTreatmentVitals.diastolic_rt, vTreatmentVitals.heartRate_rt ) + _root.confirm() + } } Connections { target: vTreatmentAdjustmentVitals // Vitals Response function onAdjustmentTriggered ( vValue ) { - if ( vTreatmentAdjustmentVitals.adjustment_Accepted ) { - // on accepted read vital data and populate - _root.update ( vTreatmentVitals.systolic__rt, vTreatmentVitals.diastolic_rt, vTreatmentVitals.heartRate_rt ) - - // confirm only if triggered from interval timer and popup is not open - _root.confirm() - } - else { // on rejected prompt user to enter vitals manually + // on rejected prompt user to enter vitals manually + if ( ! vTreatmentAdjustmentVitals.adjustment_Accepted ) { _root.open () - _bphrEntry.systolic = "" _bphrEntry.diastolic = "" _bphrEntry.heartRate = ""