Index: sources/gui/qml/pages/pretreatment/connection/PreTreatmentConnectionStack.qml =================================================================== diff -u -r821bf955d0ba7e028bccfee7c04ca77cf80a0bd4 -rac23b968f565c2beeb153ca2d554b8f868634512 --- sources/gui/qml/pages/pretreatment/connection/PreTreatmentConnectionStack.qml (.../PreTreatmentConnectionStack.qml) (revision 821bf955d0ba7e028bccfee7c04ca77cf80a0bd4) +++ sources/gui/qml/pages/pretreatment/connection/PreTreatmentConnectionStack.qml (.../PreTreatmentConnectionStack.qml) (revision ac23b968f565c2beeb153ca2d554b8f868634512) @@ -20,6 +20,7 @@ // Qml imports import "qrc:/globals" import "qrc:/components" +import "qrc:/compounds" import "qrc:/pages/pretreatment" import "qrc:/pages/pretreatment/connection" @@ -39,12 +40,32 @@ title.text : qsTr("Ultrafiltration Setup") } + PreTreatmentBase { id: _preTreatmentVitals // BP/HR Entry + header.stepIndex : 6 + header.confirmText.text : _bphrEntry.isValid ? qsTr("CONFIRM") : qsTr("SKIP") + header.confirmVisible : true + title.text : qsTr("BP/HR") + BPHREntry { id: _bphrEntry + topMarginContent : 250 + contentRectHeight : _root.height + } + onConfirmClicked: { + if ( _bphrEntry.isValid ) { + vTreatmentVitals.doConfirm( + _bphrEntry.systolic , + _bphrEntry.diastolic, + _bphrEntry.heartRate + ) + } + } + } + PreTreatmentBase { id: _preTreatmentPatientConnection header.stepIndex : 7 + header.backVisible : true header.confirmVisible : true title.text : qsTr("Patient Connection") header.confirmText.text : qsTr("CONTINUE") - instructionBased : true } @@ -67,7 +88,7 @@ _preTreatmentUltrafiltration.ufVolume = vPreTreatmentAdjustmentUltrafiltrationInit.volume // but only if it has been accepted it will navigate if ( vPreTreatmentAdjustmentUltrafiltrationInit.adjustment_Accepted ) { - page( _preTreatmentPatientConnection ) + page( _preTreatmentVitals ) } else { _preTreatmentUltrafiltration.reasonText = vPreTreatmentAdjustmentUltrafiltrationInit.text() @@ -79,8 +100,16 @@ onConfirmClicked : { vPreTreatmentAdjustmentUltrafiltrationInit.doAdjustment(_preTreatmentUltrafiltration.ufVolume)} } - Connections { target: _preTreatmentPatientConnection + Connections { target: _preTreatmentVitals onBackClicked : { page( _preTreatmentUltrafiltration )} + onConfirmClicked : { + // vVitals.doConfirm() + page( _preTreatmentPatientConnection ) + } + } + + Connections { target: _preTreatmentPatientConnection + onBackClicked : { page( _preTreatmentVitals )} onConfirmClicked : { vPreTreatmentAdjustmentPatientConnectionConfirm.doConfirm()} }