Index: sources/gui/qml/pages/treatment/TreatmentStack.qml
===================================================================
diff -u -r524fee2471717bf627eae41c6a599c9b5f4fbe55 -r6616f7b9b88efffa42ab605833d296afb76d3cb1
--- sources/gui/qml/pages/treatment/TreatmentStack.qml	(.../TreatmentStack.qml)	(revision 524fee2471717bf627eae41c6a599c9b5f4fbe55)
+++ sources/gui/qml/pages/treatment/TreatmentStack.qml	(.../TreatmentStack.qml)	(revision 6616f7b9b88efffa42ab605833d296afb76d3cb1)
@@ -95,6 +95,7 @@
         onCloseClicked          : close()
         onEditClicked           : {
             close()
+            _treatmentAdjustmentUltrafiltrationEdit.reset() // reset the slider to minimum value position
             _treatmentAdjustmentUltrafiltrationEdit.open()
         }
         onResumeClicked         : {
@@ -110,7 +111,7 @@
             close()
             _treatmentAdjustmentUltrafiltrationPaused.open()
         }
-        onNextClicked         : {
+        onNextClicked           : {
             // send Volume to HD and wait.
             // if accepted close()
             // not accepted show error in notification
@@ -121,19 +122,31 @@
     TreatmentAdjustmentUltrafiltrationConfirm { id: _treatmentAdjustmentUltrafiltrationConfirm
         onBackClicked           : {
             close()
-            _treatmentAdjustmentUltrafiltrationEdit.open()
+            _treatmentAdjustmentUltrafiltrationEdit.open ()
         }
-        onConfirmRateClicked         : {
+        onConfirmRateClicked    : {
             vTreatmentUltrafiltrationConfirm.doOptionRate(vVolume)
         }
-        onConfirmDurationClicked         : {
+        onConfirmDurationClicked: {
             vTreatmentUltrafiltrationConfirm.doOptionDuration(vVolume)
         }
     }
 
-    // manage the Pause Resume response
+    // ---------- Manages Responses ----------
+    Connections { target: vTreatmentAdjustmentDuration
+        onAdjustmentTriggered   : {
+            if ( vTreatmentAdjustmentDuration.adjustment_Accepted ) {
+                vTreatmentUltrafiltration.maximum               = vTreatmentAdjustmentDuration.ultrafiltration
+                _treatmentAdjustmentDuration.accept()
+            } else {
+                _treatmentAdjustmentDuration.durationValue      = vTreatmentAdjustmentDuration.duration;
+                _treatmentAdjustmentDuration.notification.text  = vTreatmentAdjustmentDuration.text();
+            }
+        }
+    }
+
     Connections { target: vTreatmentUltrafiltrationState
-        onAdjustmentTriggered: {
+        onAdjustmentTriggered   : {
             if ( vTreatmentUltrafiltrationState.adjustment_Accepted ) {
                 if ( vTreatmentUltrafiltrationState.isPaused ) {
                     _treatmentAdjustmentUltrafiltrationStart .close()
@@ -152,29 +165,33 @@
     }
 
     Connections { target: vTreatmentAdjustmentUltrafiltration
-        onAdjustmentTriggered: {
-            console.debug(
-                        vTreatmentAdjustmentUltrafiltration.volume        ,
-                        vTreatmentAdjustmentUltrafiltration.duration      ,
-                        vTreatmentAdjustmentUltrafiltration.durationDiff  ,
-                        vTreatmentAdjustmentUltrafiltration.rate          ,
-                        vTreatmentAdjustmentUltrafiltration.rateDiff      ,
-                        vTreatmentAdjustmentUltrafiltration.rateOld
-                        )
+        onAdjustmentTriggered   : {
             if (vTreatmentAdjustmentUltrafiltration.adjustment_Accepted) {
-                _treatmentAdjustmentUltrafiltrationEdit   .close()
-
-                _treatmentAdjustmentUltrafiltrationConfirm.ultrafiltrationVolume    = 1000 * vTreatmentAdjustmentUltrafiltration.volume     .toFixed(3)
+                _treatmentAdjustmentUltrafiltrationConfirm.ultrafiltrationVolume    = vTreatmentAdjustmentUltrafiltration.volume
                 _treatmentAdjustmentUltrafiltrationConfirm.treatmentDuration        = vTreatmentAdjustmentUltrafiltration.duration
                 _treatmentAdjustmentUltrafiltrationConfirm.treatmentDurationDiff    = vTreatmentAdjustmentUltrafiltration.durationDiff
-                _treatmentAdjustmentUltrafiltrationConfirm.ultrafiltrationRate      = vTreatmentAdjustmentUltrafiltration.rate       .toFixed(3)
-                _treatmentAdjustmentUltrafiltrationConfirm.ultrafiltrationRateDiff  = vTreatmentAdjustmentUltrafiltration.rateDiff   .toFixed(3)
-                _treatmentAdjustmentUltrafiltrationConfirm.ultrafiltrationRateOld   = vTreatmentAdjustmentUltrafiltration.rateOld    .toFixed(3)
+                _treatmentAdjustmentUltrafiltrationConfirm.ultrafiltrationRate      = vTreatmentAdjustmentUltrafiltration.rate
+                _treatmentAdjustmentUltrafiltrationConfirm.ultrafiltrationRateDiff  = vTreatmentAdjustmentUltrafiltration.rateDiff
+                _treatmentAdjustmentUltrafiltrationConfirm.ultrafiltrationRateOld   = vTreatmentAdjustmentUltrafiltration.rateOld
 
-                _treatmentAdjustmentUltrafiltrationConfirm.open()
+                _treatmentAdjustmentUltrafiltrationEdit   .close()
+                _treatmentAdjustmentUltrafiltrationConfirm.reset()
+                _treatmentAdjustmentUltrafiltrationConfirm.open ()
             } else {
                 _treatmentAdjustmentUltrafiltrationEdit.notification.text = vTreatmentAdjustmentUltrafiltration.text()
             }
         }
     }
-}
+
+    Connections { target: vTreatmentUltrafiltrationConfirm
+        onAdjustmentTriggered   : {
+            if (vTreatmentUltrafiltrationConfirm.adjustment_Accepted) {
+                // HD resumes the ultrafiltration and no need to recall the doPause just update the state
+                vTreatmentUltrafiltrationState.isPaused = false
+                vTreatmentUltrafiltration.maximum                           = vTreatmentUltrafiltrationConfirm.volume
+                _treatmentAdjustmentUltrafiltrationConfirm.close()
+            } else {
+                _treatmentAdjustmentUltrafiltrationConfirm.notification.text = vTreatmentUltrafiltrationConfirm.text()
+            }
+        }
+    }}