Index: sources/gui/qml/pages/treatment/sections/TreatmentFluid.qml
===================================================================
diff -u -rf7fe40e1e2e5e7ccd02407aead0adcb0f5bf7f53 -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9
--- sources/gui/qml/pages/treatment/sections/TreatmentFluid.qml	(.../TreatmentFluid.qml)	(revision f7fe40e1e2e5e7ccd02407aead0adcb0f5bf7f53)
+++ sources/gui/qml/pages/treatment/sections/TreatmentFluid.qml	(.../TreatmentFluid.qml)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
@@ -1,15 +1,15 @@
 /*!
  *
- * Copyright (c) 2019-2020 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 TreatmentFluid.qml
- * \author (last) Behrouz NematiPour
- * \date (last) 13-Aug-2020
- * \author (original) Behrouz NematiPour
- * \date (original) 27-Jan-2020
+ * \file    TreatmentFluid.qml
+ * \author  (last)      Vy
+ * \date    (last)      18-May-2023
+ * \author  (original)  Behrouz NematiPour
+ * \date    (original)  27-Jan-2020
  *
  */
 
@@ -26,7 +26,10 @@
  * \brief   Treatment Screen Fluid Management section
  */
 TouchArea { id: _root
-    property string buttonText          : ""
+    property string buttonText            : ""
+    property alias  buttonEnabled         : _startFluidButton.enabled
+    property alias  fluidProgressBarColor : _fluidProgressBar.color
+
     property bool   cumulativeVisible   : true
     property bool   targetVisible       : true
     property bool   progressBarVisible  : true
@@ -35,6 +38,7 @@
     property int    volumeTextWidth     : 60
 
     property string unit                : Variables.unitTextFluid
+    property int    valueDecimal        : 0
     property alias  valueTarget         : _fluidTarget      .value
     property alias  valueCumulative     : _cumulativeValue  .value
     property alias  valueDelivered      : _fluidProgressBar .value
@@ -47,7 +51,6 @@
     title: qsTr("FLUID MANAGEMENT")
 
     TouchRect { id: _startFluidButton
-        enabled : _root.isTouchable
         y       : 45
         width   : 340
         height  : 55
@@ -58,12 +61,7 @@
             pixelSize       : 20
             letterSpacing   :  3
         }
-        animated: true
-        duration: 100
-        onClicked: {
-            if (enabled)
-                _root.clicked()
-        }
+        onClicked: _root.clicked()
     }
 
     Text { id: _fluidText
@@ -105,7 +103,7 @@
                 baseline: parent.baseline
             }
             horizontalAlignment: Text.AlignRight
-            text: _fluidProgressBar.value
+            text: _root.valueDelivered.toFixed(_root.valueDecimal)
             width: 60
             font.pixelSize: Fonts.fontPixelFluidValue
             color: Colors.fluidText
@@ -127,6 +125,7 @@
 
         maximum : _fluidTarget.value
         value   : 0
+        decimal : _root.valueDecimal
     }
 
     Text { id: _cumulativeText
@@ -158,7 +157,7 @@
                 baseline: parent.baseline
             }
             horizontalAlignment: Text.AlignRight
-            text: value
+            text: value.toFixed(_root.valueDecimal)
             width: 60
             font.pixelSize: Fonts.fontPixelFluidValue
             color: Colors.fluidText