Index: sources/gui/qml/pages/treatment/TreatmentStack.qml =================================================================== diff -u -r506a9e3db1a20bda1685e38c5e9041005c9a4a4f -rab7ffd27ecea1277d8645a8b62ff48c0cb3f6ff4 --- sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 506a9e3db1a20bda1685e38c5e9041005c9a4a4f) +++ sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision ab7ffd27ecea1277d8645a8b62ff48c0cb3f6ff4) @@ -1,16 +1,16 @@ /*! - * + * * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. * \copyright * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. - * + * * \file TreatmentStack.qml * \author (last) Behrouz NematiPour * \date (last) 28-Feb-2021 * \author (original) Behrouz NematiPour * \date (original) 27-Jan-2020 - * + * */ // Qt @@ -19,6 +19,7 @@ // Qml imports import "qrc:/globals" import "qrc:/components" +import "qrc:/compounds" import "qrc:/pages/treatment/adjustments" /*! @@ -63,7 +64,7 @@ _treatmentAdjustmentFlow.open() } onSectionVitalsClicked : { - // no page yet + _vitalEntry.open() } onSectionPressuresClicked: { _treatmentAdjustmentPressuresLimits.open() @@ -79,18 +80,44 @@ //// Treatment Adjustment Dialogs TreatmentAdjustmentFlow { id: _treatmentAdjustmentFlow - onCloseClicked : close() onConfirmClicked : vTreatmentAdjustmentFlows.doAdjustment(bloodFlowRateValue, dialysateFlowRateValue) } + EntryDialog { id: _vitalEntry + titleText : qsTr("VITALS") + autoHide : true + autoHideDuration : vTreatmentVitals.timeout * 60000 // min => ms + confirmEnabled : _bphrEntry.isValid + onConfirmClicked : { + vTreatmentVitals.doConfirm( + _bphrEntry.systolic , + _bphrEntry.diastolic , + _bphrEntry.heartRate + ) + _vitalEntry.close() + } + + onCloseClicked : + vTreatmentVitals.doSkip() // only for logging + + onAutoHidden : + vTreatmentVitals.doTimeout() // only for logging + + BPHREntry { id : _bphrEntry + contentRectHeight : _vitalEntry.contentRect.height + onClicked : { + _vitalEntry.autoHideCancel = true + } + } + } + TreatmentAdjustmentPressuresLimits { id: _treatmentAdjustmentPressuresLimits - onCloseClicked : close() onConfirmClicked : vTreatmentAdjustmentPressuresLimits.doAdjustment( arterialPressureLowerBound , arterialPressureUpperBound , venousPressureLowerBound , venousPressureUpperBound - ) + ) arterialPressureMinimum : Variables.arterialValueMin arterialPressureLowerBound : vTreatmentAdjustmentPressuresLimits.arterialLimitLow @@ -110,7 +137,6 @@ } TreatmentAdjustmentDuration { id: _treatmentAdjustmentDuration - onCloseClicked : close() onConfirmClicked : vTreatmentAdjustmentDuration.doAdjustment(durationValue) } @@ -168,4 +194,9 @@ Connections { target: _mainHome onStartTreatment : { page ( _treatmentHome )} } + + Connections { target: vTreatmentVitals + onDidTrigger : { _vitalEntry.open() } + } + }