Index: sources/gui/qml/components/ConfirmTreatmentTable.qml
===================================================================
diff -u -r8a5dbf556a66524fbe4b60ac1573182a0bd27617 -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9
--- sources/gui/qml/components/ConfirmTreatmentTable.qml	(.../ConfirmTreatmentTable.qml)	(revision 8a5dbf556a66524fbe4b60ac1573182a0bd27617)
+++ sources/gui/qml/components/ConfirmTreatmentTable.qml	(.../ConfirmTreatmentTable.qml)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
@@ -1,14 +1,15 @@
 /*!
  *
- * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
- * \copyright                                                       \n
- *          THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM,  \n
- *          IN PART OR IN WHOLE,                                    \n
- *          WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. \n
+ * 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
- * \date    2020/08/25
- * \author  Peter Lucia
+ * \author  (last)      Behrouz NematiPour
+ * \date    (last)      18-Jul-2023
+ * \author  (original)  Peter Lucia
+ * \date    (original)  22-Sep-2020
  *
  */
 
@@ -95,19 +96,31 @@
         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
-        prescriptionKeys    : vTreatmentCreate.doGetPrescriptionParameterNames()
+        prescriptionKeys    : [ qsTr("Blood Flow Rate"                  ),
+                                qsTr("Dialysate Flow Rate"              ),
+                                qsTr("Duration"                         ),
+                                qsTr("Heparin Dispensing Rate"          ),
+                                qsTr("Heparin Bolus Volume"             ),
+                                qsTr("Heparin Stop Time"                ),
+                                qsTr("Saline Bolus Volume"              )]
         prescriptionValues  : vTreatmentCreate.doGetPrescriptionParameterValues()
-        operatingKeys       : vTreatmentCreate.doGetOperatingParameterNames()
+
+        operatingKeys       : [ qsTr("Heparin Type"                     ),
+                                qsTr("Acid Concentrate"                 ),
+                                qsTr("Bicarbonate Concentrate"          ),
+                                qsTr("Dialyzer Type"                    ),
+                                qsTr("Dialysate Temperature"            ),
+                                qsTr("Blood Pressure Measure Interval"  )]
         operatingValues     : vTreatmentCreate.doGetOperatingParameterValues()
+
         onVisibleChanged: {
             if (visible) {
-                prescriptionKeys    = vTreatmentCreate.doGetPrescriptionParameterNames()
                 prescriptionValues  = vTreatmentCreate.doGetPrescriptionParameterValues()
-                operatingKeys       = vTreatmentCreate.doGetOperatingParameterNames()
                 operatingValues     = vTreatmentCreate.doGetOperatingParameterValues()
             }
         }