Index: sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackComplete.qml =================================================================== diff -u -r2d37cfe6593a90633a9db1fa5136f8fc43b56188 -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 --- sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackComplete.qml (.../EndTreatmentRinsebackComplete.qml) (revision 2d37cfe6593a90633a9db1fa5136f8fc43b56188) +++ sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackComplete.qml (.../EndTreatmentRinsebackComplete.qml) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) @@ -1,13 +1,13 @@ /*! * - * Copyright (c) 2021-2022 Diality Inc. - All Rights Reserved. + * Copyright (c) 2021-2024 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 EndTreatmentRinsebackComplete.qml - * \author (last) Behrouz NematiPour - * \date (last) 15-May-2021 + * \author (last) msuleiman + * \date (last) 30-Jun-2023 * \author (original) Behrouz NematiPour * \date (original) 11-Apr-2021 * @@ -16,7 +16,6 @@ // Qt import QtQuick 2.12 -// Project // Qml imports import "qrc:/globals" import "qrc:/components" @@ -34,8 +33,12 @@ title.text : qsTr("Rinseback Complete") instructionBased : true - header.confirmVisible : vTreatmentTime .time_IsLeft - header.confirmEnabled : vTreatmentRinseback .isCompleted + header.confirmVisible : false + + header.backEnabled : true + header.backVisible : vTreatmentTime .time_IsLeft + onBackClicked : treatmentBackClicked() + hasTimeout : vTreatmentRinseback .timeoutTotal timeoutValue : vTreatmentRinseback .timeoutCountDown * 60 @@ -48,11 +51,6 @@ 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 +59,26 @@ onClicked : treatmentEndClicked() }, + TouchRect { id : _recirculateTouchRect + 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.bottom : _beginRinsebackTouchRect.text.top + anchors.leftMargin : 5 + text : qsTr("(50mL)") + font.pixelSize : Fonts.fontPixelFluidVolume + color : _beginRinsebackTouchRect.text.color + } } ] }