Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml =================================================================== diff -u -r1ea05b21849b7ee431804166f8e206f623c39509 -r2270e3265bcbe5465589eb235ebf98cd849abcbd --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml (.../TreatmentAdjustmentUltrafiltrationConfirm.qml) (revision 1ea05b21849b7ee431804166f8e206f623c39509) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml (.../TreatmentAdjustmentUltrafiltrationConfirm.qml) (revision 2270e3265bcbe5465589eb235ebf98cd849abcbd) @@ -1,21 +1,20 @@ /*! * - * Copyright (c) 2020-2024 Diality Inc. - All Rights Reserved. + * Copyright (c) 2020-2025 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 TreatmentAdjustmentUltrafiltrationConfirm.qml - * \author (last) Behrouz NematiPour - * \date (last) 19-Jul-2023 + * \author (last) Stephen Quong + * \date (last) 08-Oct-2025 * \author (original) Behrouz NematiPour * \date (original) 18-May-2020 * */ // Qt import QtQuick 2.12 -//import QtGraphicalEffects 1.0 // Project @@ -24,20 +23,15 @@ import "qrc:/components" /*! - * \brief TreatmentAdjustmentUltrafiltrationEdit.qml is the screen - * To adjust the treatment ultrafiltration + * \brief TreatmentAdjustmentUltrafiltrationConfirm.qml is the screen + * to confirm requested changes to the treatment ultrafiltration setting. */ TreatmentAdjustmentBase { id: _root contentItem.objectName: "TreatmentAdjustmentUltrafiltrationConfirm" //SquishQt testability property real ultrafiltrationVolume : 0.000 property real ultrafiltrationRate : 0.000 - QtObject { id: _private - property int decimalVolume: Variables.ultrafiltrationPrecision - property int decimalRate : 0 - } - signal confirmVolumeClicked(real vVolume) closeVisible : false @@ -53,7 +47,7 @@ textColor : Colors.ufVolumeGoalText textfontSize : Fonts.fontPixelUltrafiltrationAdjustmentNotification textfontWeight : Font.Medium - } + } titleText : qsTr("Confirm Ultrafiltration Volume ") + Variables.unitTextUltrafiltrationVolume @@ -172,6 +166,6 @@ font.pixelSize : Fonts.fontPixelUltrafiltrationAdjustmentButton } - onClicked: confirmVolumeClicked(ultrafiltrationVolume) + onClicked: confirmVolumeClicked(_root.ultrafiltrationVolume) } } Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml =================================================================== diff -u -rf8c80661c806c50047e81d581df0dd6e05f1c8ef -r2270e3265bcbe5465589eb235ebf98cd849abcbd --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml (.../TreatmentAdjustmentUltrafiltrationEdit.qml) (revision f8c80661c806c50047e81d581df0dd6e05f1c8ef) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml (.../TreatmentAdjustmentUltrafiltrationEdit.qml) (revision 2270e3265bcbe5465589eb235ebf98cd849abcbd) @@ -1,13 +1,13 @@ /*! * - * Copyright (c) 2020-2024 Diality Inc. - All Rights Reserved. + * Copyright (c) 2020-2025 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 TreatmentAdjustmentUltrafiltrationEdit.qml - * \author (last) Vy - * \date (last) 20-Mar-2023 + * \author (last) Stephen Quong + * \date (last) 08-Oct-2025 * \author (original) Behrouz NematiPour * \date (original) 15-May-2020 * @@ -30,11 +30,10 @@ TreatmentAdjustmentBase { id: _root contentItem.objectName: "TreatmentAdjustmentUltrafiltrationEdit" //SquishQt testability QtObject { id: _private - readonly property real minimum : vTreatmentRanges.treatmentRanges_Ultrafiltration_Volume_Min - readonly property real maximum : vTreatmentRanges.treatmentRanges_Ultrafiltration_Volume_Max - property int decimal : Variables.ultrafiltrationPrecision - property real setVolume : vTreatmentUltrafiltration.setVolume - property real volumeRemoved : vTreatmentUltrafiltration.volumeRemoved + readonly property real minimum : vTreatmentRanges.treatmentRanges_Ultrafiltration_Volume_Min + readonly property real maximum : vTreatmentRanges.treatmentRanges_Ultrafiltration_Volume_Max + readonly property real setVolume : vTreatmentUltrafiltration.setVolume + readonly property real volumeRemoved : vTreatmentUltrafiltration.volumeRemoved } signal continueClicked(real vVolume)