Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml =================================================================== diff -u -r23121e17d1a6120ae4a31930e18de362d9533bcb -r63d2d3c26b9e1cfda1aa8a81610b8ef08f9d2bdb --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml (.../TreatmentAdjustmentVitals.qml) (revision 23121e17d1a6120ae4a31930e18de362d9533bcb) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml (.../TreatmentAdjustmentVitals.qml) (revision 63d2d3c26b9e1cfda1aa8a81610b8ef08f9d2bdb) @@ -48,7 +48,7 @@ notificationText = notificationTextString vTreatmentVitals.doTimerStop() - vTreatmentAdjustmentVitals.doRequest() ///trjhrtjr + vTreatmentAdjustmentVitals.doRequest() ///REMOVE ONLY FOR TESTING MESSAGE } onClosed: vTreatmentVitals.doTimerStart() @@ -84,18 +84,22 @@ _headerBar.vitalsRecorded() } else { - print("**** vTreatmentAdjustmentVitals.doRequest() ") - vTreatmentAdjustmentVitals.doRequest() - } + } + } + Connections { target: vTreatmentAdjustmentVitals + function onAdjustmentTriggered ( vValue ) { + if ( vTreatmentAdjustmentVitals.adjustment_Accepted ) { + // read data + print("**** vTreatmentAdjustmentVitals.adjustment_Accepte ") - if ( vTreatmentVitals.enableDialog ) { - print("**** vTreatmentVitals.enableDialog " + vTreatmentVitals.enableDialog) -// _root.update ( vSystolic, vDiastolic, vHeartRate ) -// _root.open () } + else { + notificationText = qsTr("Rejected Reason: %1").arg(vTreatmentAdjustmentVitals.adjustment_ReasonText) + if ( vTreatmentVitals.enableDialog ) { _root.open () } + } } }