Index: sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml
===================================================================
diff -u -ra159e12630645a9a35fb0a5585cc7b639cfe6aa6 -reb19475a6bf4ed7f6a16bc07eefc7813496620ef
--- sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml	(.../TreatmentUltrafiltration.qml)	(revision a159e12630645a9a35fb0a5585cc7b639cfe6aa6)
+++ sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml	(.../TreatmentUltrafiltration.qml)	(revision eb19475a6bf4ed7f6a16bc07eefc7813496620ef)
@@ -25,25 +25,18 @@
  * \brief   Treatment Screen Ultrafiltration section
  */
 TouchArea { id: _root
-    clip: false
-    x   : 0
-    y   : 0
+    clip    : false
+
+    x       : 0
+    y       : 0
     width   : 200
     height  : 200
+
     isTouchable : true
     title   : qsTr("ULTRAFILTRATION VOLUME") + " " + qsTr("(mL)")
-    notificationImageSource: "qrc:/images/iPauseGray"
-
-    Connections { target: vTreatmentUltrafiltrationState
-        onIsPausedChanged : {
-            if ( vTreatmentUltrafiltrationState.isPaused ) {
-                notificationText = qsTr("Ultrafiltration Paused")
-                _progressbarex.marker.color = "dimgray"
-            } else {
-                notificationText = ""
-                _progressbarex.marker.color = Colors.rangeMarker
-            }
-        }
+    notification {
+        imageSource: "qrc:/images/iPauseGray"
+        text : vTreatmentUltrafiltrationState.isPaused ? qsTr("Ultrafiltration Paused") : ""
     }
 
     Connections { target: vTreatmentAdjustmentDuration
@@ -64,12 +57,9 @@
         onProgressClicked   : _root.clicked()
         onExtraClicked      : _root.clicked()
 
-        // TEST : it has to be bound to MeasUFVol to get the actual values from pumps
-        //        but since we have none in testing code bound to the refUFVal which
-        //        is the calculated/expected volume.
-        //// value   : vTreatmentUltrafiltration.ultrafiltration_MeasUFVol.toFixed(2);
-        value   : vTreatmentUltrafiltration.ultrafiltration_RefUFVol.toFixed(2);
-        // TEST : min/max should come from pre-treatment prescription parameters which we don't have now (2020/05/12)
-        maximum : 600 // a constant Volume value for 1h treatment
+        value   : vTreatmentUltrafiltration.ultrafiltration_MeasUFVol.toFixed(2);
+        // TODO : min/max should come from pre-treatment prescription parameters which we don't have now (2020/05/12)
+        maximum : vTreatmentAdjustmentDuration.adjustment ? vTreatmentAdjustmentDuration.ultrafiltration * 1000 : 600 // a constant Volume value for 1h treatment
+        marker.color :vTreatmentUltrafiltrationState.isPaused ? "dimgray" : Colors.rangeMarker
     }
 }