Index: sources/gui/qml/components/ConfirmTreatmentTable.qml
===================================================================
diff -u -r6e4cc1f67e9290035b4e3a5be2eac04a85ae0c9a -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9
--- sources/gui/qml/components/ConfirmTreatmentTable.qml	(.../ConfirmTreatmentTable.qml)	(revision 6e4cc1f67e9290035b4e3a5be2eac04a85ae0c9a)
+++ 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
  *
  */
 
@@ -21,19 +22,17 @@
 import "qrc:/globals"
 import "qrc:/components"
 
-Rectangle {
-    id: _root
+Item { id: _root
     objectName: "ConfirmTreatmentTable"
-    width: Variables.cTreatmentTableWidth
-    height: Variables.cTreatmentTableHeight
-    color: Colors.backgroundDialog
+    width: Variables.createTreatmentTableWidth
+    height: Variables.createTreatmentTableHeight
 
     Rectangle {
         id: _header
         width: parent.width
-        height: Variables.cTreatmentHdrHeight
-        color: "transparent"
-        radius: 5
+        height: Variables.createTreatmentHeaderHeight
+        color: Colors.transparent
+        radius: Variables.dialogRadius
 
         Rectangle {
             id: _treatment_profile_id
@@ -42,10 +41,10 @@
             width: height
             anchors.top: _header.top
             anchors.left: _header.left
-            anchors.topMargin: Variables.cTreatmentMargin
-            anchors.leftMargin: Variables.cTreatmentMargin
+            anchors.topMargin: Variables.createTreatmentMargin
+            anchors.leftMargin: Variables.createTreatmentMargin
             color: Colors.createTrProfileID
-            radius: 5
+            radius: Variables.dialogRadius
 
             Text {
                 id: _treatment_profile_id_text
@@ -63,60 +62,67 @@
             objectName: _root.objectName + "_treatment_profile_name"
             anchors.bottom: _treatment_profile_id.bottom
             anchors.left: _treatment_profile_id.right
-            anchors.topMargin: Variables.cTreatmentMargin
+            anchors.topMargin: Variables.createTreatmentMargin
             anchors.leftMargin: 20
-            text: "New Treatment"
-            color: "white"
-            font.pixelSize: Fonts.crTreatmentFontSize
+            text: qsTr("New Treatment")
+            color: Colors.textMain
+            font.pixelSize: Fonts.fontPixelCreateTreatment
         }
-
     }
 
     Text {
         id: _prescription
         objectName: _root.objectName + "_prescription"
-        text: "PRESCRIPTION"
-        font.pixelSize: Fonts.crTreatmentTableFontSize
-        color: "white"
+        text: qsTr("PRESCRIPTION")
+        font.pixelSize: Fonts.fontPixelCreateTreatmentTable
+        color: Colors.textMain
         anchors.left: parent.left
         anchors.top: _header.bottom
-        anchors.leftMargin: Variables.cTreatmentMargin
-
+        anchors.leftMargin: Variables.createTreatmentMargin
     }
 
     Text {
         id: _operating_parameters
         objectName: _root.objectName + "_operating_parameters"
-        text: "OPERATING PARAMETERS"
-        font.pixelSize: Fonts.crTreatmentTableFontSize
-        color: "white"
+        text: qsTr("OPERATING PARAMETERS")
+        font.pixelSize: Fonts.fontPixelCreateTreatmentTable
+        color: Colors.textMain
         anchors.top: _header.bottom
         anchors.left: _root.horizontalCenter
-
     }
 
     ConfirmTreatmentSubTable {
         id: _left_table
         anchors.top: _prescription.bottom
         anchors.left: _root.left
-        anchors.leftMargin: Variables.cTreatmentMargin
-        anchors.topMargin: Variables.cTreatmentTblMargin
+        anchors.leftMargin: Variables.createTreatmentMargin
+        // 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.cTreatmentMargin
+        width: parent.width - 2*Variables.createTreatmentMargin
         height: _root.height - _header.height
-        prescriptionKeys: vTreatmentCreate.getPrescriptionParameterNames()
-        prescriptionValues: vTreatmentCreate.getPrescriptionParameterValues()
-        operatingKeys: vTreatmentCreate.getOperatingParameterNames()
-        operatingValues: vTreatmentCreate.getOperatingParameterValues()
+        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       : [ 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.getPrescriptionParameterNames()
-                prescriptionValues = vTreatmentCreate.getPrescriptionParameterValues()
-                operatingKeys = vTreatmentCreate.getOperatingParameterNames()
-                operatingValues = vTreatmentCreate.getOperatingParameterValues()
+                prescriptionValues  = vTreatmentCreate.doGetPrescriptionParameterValues()
+                operatingValues     = vTreatmentCreate.doGetOperatingParameterValues()
             }
         }
-
     }
-
 }