Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml =================================================================== diff -u -r63d2d3c26b9e1cfda1aa8a81610b8ef08f9d2bdb -rc1358f289cb0b96fb75b9ae67659d8a550262f78 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml (.../TreatmentAdjustmentVitals.qml) (revision 63d2d3c26b9e1cfda1aa8a81610b8ef08f9d2bdb) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml (.../TreatmentAdjustmentVitals.qml) (revision c1358f289cb0b96fb75b9ae67659d8a550262f78) @@ -30,7 +30,8 @@ width : 750 x : numPad.isOpened ? Math.round((Variables.applicationWidth - width) / 2) - 200 : Math.round((Variables.applicationWidth - width) / 2) - notification.visible: vTreatmentVitals.lastRead + notification.textfontSize: 20 + notification.visible: vTreatmentVitals.lastRead || vTreatmentAdjustmentVitals.adjustment_ReasonText property string notificationTextString: qsTr("Interval:" ) + " " + (vTreatmentVitals.interval ? (vTreatmentVitals.interval + qsTr("min")) : qsTr("OFF")) @@ -44,24 +45,27 @@ _bphrEntry.heartRate = vHeartRate ? vHeartRate : "" } + function confirm() { + vTreatmentVitals.doConfirm( + _bphrEntry.systolic , + _bphrEntry.diastolic , + _bphrEntry.heartRate + ) + _headerBar.vitalsRecorded() + } + onOpened: { - notificationText = notificationTextString + notificationText = vTreatmentAdjustmentVitals.adjustment_ReasonText ? qsTr("Rejected Reason: %1").arg(vTreatmentAdjustmentVitals.adjustment_ReasonText) : + notificationTextString vTreatmentVitals.doTimerStop() - - vTreatmentAdjustmentVitals.doRequest() ///REMOVE ONLY FOR TESTING MESSAGE } onClosed: vTreatmentVitals.doTimerStart() onConfirmClicked: { numPad.hide() _root.close() - vTreatmentVitals.doConfirm( - _bphrEntry.systolic , - _bphrEntry.diastolic , - _bphrEntry.heartRate - ) - _headerBar.vitalsRecorded() + _root.confirm() } onCloseClicked: { @@ -76,11 +80,9 @@ Connections { target: vTreatmentVitals function onDidTrigger ( vSystolic, vDiastolic, vHeartRate ) { print(("%1 / %2 -- %3").arg(vSystolic).arg(vDiastolic).arg(vHeartRate)) - _root.update ( vSystolic, vDiastolic, vHeartRate ) // vitals recorded if ( vSystolic && vDiastolic && vHeartRate ) { - print("**** vitalsRecorded ") _headerBar.vitalsRecorded() } else { @@ -92,13 +94,16 @@ Connections { target: vTreatmentAdjustmentVitals function onAdjustmentTriggered ( vValue ) { if ( vTreatmentAdjustmentVitals.adjustment_Accepted ) { - // read data - print("**** vTreatmentAdjustmentVitals.adjustment_Accepte ") - + // on accepted read vital data and populate + _root.update ( vTreatmentVitals.systolic__rt, vTreatmentVitals.diastolic_rt, vTreatmentVitals.heartRate_rt ) + _root.confirm() + vTreatmentVitals.doTimerStart() } else { - notificationText = qsTr("Rejected Reason: %1").arg(vTreatmentAdjustmentVitals.adjustment_ReasonText) - if ( vTreatmentVitals.enableDialog ) { _root.open () } + // on rejected prompt user to enter vitals manually + if ( vTreatmentVitals.enableDialog ) { + _root.open () + } } } }