Index: sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackComplete.qml =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r628e5f9b6e42b6a6bbb8e493590a5caff7094a58 --- sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackComplete.qml (.../EndTreatmentRinsebackComplete.qml) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackComplete.qml (.../EndTreatmentRinsebackComplete.qml) (revision 628e5f9b6e42b6a6bbb8e493590a5caff7094a58) @@ -17,6 +17,8 @@ import QtQuick 2.12 // Project +import VTreatmentSaline 0.1; + // Qml imports import "qrc:/globals" import "qrc:/components" @@ -36,23 +38,24 @@ instructionBased : true header.confirmVisible : vTreatmentTime .time_IsLeft header.confirmEnabled : vTreatmentRinseback .isCompleted && _root.instructionIsLast + + header.backEnabled : true + header.backVisible : true + onBackClicked : treatmentBackClicked() + hasTimeout : vTreatmentRinseback .timeoutTotal timeoutValue : vTreatmentRinseback .timeoutCountDown * 60 footer { width : parent.width height : Variables.touchRectHeight } + VTreatmentSaline { id: vTreatmentSaline } FooterStatic { childrenWidth : 300 anchors.fill : footer children : [ - TouchRect { id : _backTreatmentTouchRect - visible : vTreatmentTime .time_IsLeft - text.text : qsTr("BACK TO TREATMENT") - onClicked : treatmentBackClicked() - }, TouchRect { id : _endTreatmentTouchRect visible : true // after the rinseback complete user can always end the treatment, regardless of incomplete or compeleted treatment @@ -61,10 +64,26 @@ onClicked : treatmentEndClicked() }, + TouchRect { id : _backTreatmentTouchRect + visible : vTreatmentTime .time_IsLeft + enabled : vTreatmentRinseback .isCompleted && _root.instructionIsLast + text.text : qsTr("RECIRCULATE") + onClicked : confirmClicked() + }, + TouchRect { id : _beginRinsebackTouchRect visible : true - text.text : qsTr("ADDITIONAL") + text.text : qsTr("SALINE BOLUS") onClicked : additionalClicked() + + Text { id: _salineVolumeLabel + anchors.left : _beginRinsebackTouchRect.text.right + anchors.top : _beginRinsebackTouchRect.text.top + anchors.leftMargin : 5 + text : qsTr("(%1 %2)").arg(vTreatmentSaline.delivered).arg(Variables.unitTextSaline) + font.pixelSize : Fonts.fontPixelFluidVolume + color : _beginRinsebackTouchRect.text.color + } } ] }