Index: sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentAdditional.qml =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -rab9a10b56fd25b10f09544333864f68c0ce3d6ee --- sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentAdditional.qml (.../EndTreatmentAdditional.qml) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentAdditional.qml (.../EndTreatmentAdditional.qml) (revision ab9a10b56fd25b10f09544333864f68c0ce3d6ee) @@ -28,7 +28,7 @@ EndTreatmentBase { id: _root objectName: "_EndTreatmentAdditional" - title.text: qsTr("Additional Rinseback") + title.text: qsTr("Saline Bolus") // DEN-10163 // hasTimeout : vTreatmentRinseback.timeoutTotal Index: sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackComplete.qml =================================================================== diff -u -r628e5f9b6e42b6a6bbb8e493590a5caff7094a58 -rab9a10b56fd25b10f09544333864f68c0ce3d6ee --- sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackComplete.qml (.../EndTreatmentRinsebackComplete.qml) (revision 628e5f9b6e42b6a6bbb8e493590a5caff7094a58) +++ sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackComplete.qml (.../EndTreatmentRinsebackComplete.qml) (revision ab9a10b56fd25b10f09544333864f68c0ce3d6ee) @@ -16,9 +16,6 @@ // Qt import QtQuick 2.12 -// Project -import VTreatmentSaline 0.1; - // Qml imports import "qrc:/globals" import "qrc:/components" @@ -36,11 +33,10 @@ title.text : qsTr("Rinseback Complete") instructionBased : true - header.confirmVisible : vTreatmentTime .time_IsLeft - header.confirmEnabled : vTreatmentRinseback .isCompleted && _root.instructionIsLast + header.confirmVisible : false header.backEnabled : true - header.backVisible : true + header.backVisible : vTreatmentTime .time_IsLeft onBackClicked : treatmentBackClicked() hasTimeout : vTreatmentRinseback .timeoutTotal @@ -50,7 +46,6 @@ width : parent.width height : Variables.touchRectHeight } - VTreatmentSaline { id: vTreatmentSaline } FooterStatic { childrenWidth : 300 @@ -64,7 +59,7 @@ onClicked : treatmentEndClicked() }, - TouchRect { id : _backTreatmentTouchRect + TouchRect { id : _recirculateTouchRect visible : vTreatmentTime .time_IsLeft enabled : vTreatmentRinseback .isCompleted && _root.instructionIsLast text.text : qsTr("RECIRCULATE") @@ -78,9 +73,9 @@ Text { id: _salineVolumeLabel anchors.left : _beginRinsebackTouchRect.text.right - anchors.top : _beginRinsebackTouchRect.text.top + anchors.bottom : _beginRinsebackTouchRect.text.top anchors.leftMargin : 5 - text : qsTr("(%1 %2)").arg(vTreatmentSaline.delivered).arg(Variables.unitTextSaline) + text : qsTr("(10mL)") font.pixelSize : Fonts.fontPixelFluidVolume color : _beginRinsebackTouchRect.text.color } Index: sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackInit.qml =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -rab9a10b56fd25b10f09544333864f68c0ce3d6ee --- sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackInit.qml (.../EndTreatmentRinsebackInit.qml) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackInit.qml (.../EndTreatmentRinsebackInit.qml) (revision ab9a10b56fd25b10f09544333864f68c0ce3d6ee) @@ -32,6 +32,9 @@ signal rinsebackClicked () signal treatmentEndClicked () + header.backVisible : vTreatmentTime .time_IsLeft + header.backEnabled : _root.instructionIsLast + title.text : qsTr("Rinseback Setup") instructionBased : true @@ -46,24 +49,21 @@ childrenWidth : 300 anchors.fill : footer children : [ - TouchRect { id : _backTreatmentTouchRect + TouchRect { id : _endTreatmentTouchRect enabled : _root.instructionIsLast visible : vTreatmentTime .time_IsLeft - text.text : qsTr("BACK TO TREATMENT") - onClicked : treatmentBackClicked() + text.text : qsTr("END TREATMENT") + onClicked : treatmentEndClicked() }, + TouchRect { id : _beginRinsebackTouchRect enabled : _root.instructionIsLast visible : true isDefault : true text.text : qsTr("START RINSEBACK") onClicked : rinsebackClicked() }, - TouchRect { id : _endTreatmentTouchRect - enabled : _root.instructionIsLast - visible : vTreatmentTime .time_IsLeft - text.text : qsTr("END TREATMENT") - onClicked : treatmentEndClicked() + Item { id: placeholder } ] }