Index: sources/gui/qml/components/ConfirmTreatmentTable.qml =================================================================== diff -u -re8df7fe7fe6274c416f176369250b9581e07d2a5 -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 --- sources/gui/qml/components/ConfirmTreatmentTable.qml (.../ConfirmTreatmentTable.qml) (revision e8df7fe7fe6274c416f176369250b9581e07d2a5) +++ sources/gui/qml/components/ConfirmTreatmentTable.qml (.../ConfirmTreatmentTable.qml) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) @@ -1,13 +1,13 @@ /*! * - * Copyright (c) 2020-2022 Diality Inc. - All Rights Reserved. + * Copyright (c) 2020-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 ConfirmTreatmentTable.qml * \author (last) Behrouz NematiPour - * \date (last) 15-May-2021 + * \date (last) 18-Jul-2023 * \author (original) Peter Lucia * \date (original) 22-Sep-2020 * @@ -96,7 +96,8 @@ anchors.top: _prescription.bottom anchors.left: _root.left anchors.leftMargin: Variables.createTreatmentMargin - anchors.topMargin: Variables.createTreatmentTableMargin + // Disabled for now since the rows changed for the A/V change and doesn't need scrolling + // anchors.topMargin: Variables.createTreatmentTableMargin anchors.bottom: parent.bottom width: parent.width - 2*Variables.createTreatmentMargin height: _root.height - _header.height @@ -107,19 +108,16 @@ qsTr("Heparin Bolus Volume" ), qsTr("Heparin Stop Time" ), qsTr("Saline Bolus Volume" )] + prescriptionValues : vTreatmentCreate.doGetPrescriptionParameterValues() + operatingKeys : [ qsTr("Heparin Type" ), qsTr("Acid Concentrate" ), qsTr("Bicarbonate Concentrate" ), qsTr("Dialyzer Type" ), qsTr("Dialysate Temperature" ), - qsTr("Arterial Pressure Limit Low" ), - qsTr("Arterial Pressure Limit High" ), - qsTr("Venous Pressure Limit Low" ), - qsTr("Venous Pressure Limit High" ), - qsTr("Blood Pressure Measure Interval" ), - qsTr("Rinseback Rate" )] - prescriptionValues : vTreatmentCreate.doGetPrescriptionParameterValues() + qsTr("Blood Pressure Measure Interval" )] operatingValues : vTreatmentCreate.doGetOperatingParameterValues() + onVisibleChanged: { if (visible) { prescriptionValues = vTreatmentCreate.doGetPrescriptionParameterValues()