Index: sources/gui/qml/pages/treatment/TreatmentStack.qml
===================================================================
diff -u -r810e4b12507feba688c3ea2ab045040214661298 -r2c9421bd6da03c7e0bd0bfa1f49fa95c2bd18a95
--- sources/gui/qml/pages/treatment/TreatmentStack.qml	(.../TreatmentStack.qml)	(revision 810e4b12507feba688c3ea2ab045040214661298)
+++ sources/gui/qml/pages/treatment/TreatmentStack.qml	(.../TreatmentStack.qml)	(revision 2c9421bd6da03c7e0bd0bfa1f49fa95c2bd18a95)
@@ -1,28 +1,35 @@
 /*!
- * 
+ *
  * Copyright (c) 2019-2020 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 TreatmentStack.qml
- * \author (last) Behrouz NemaiPour
- * \date (last) 18-Jun-2020
+ * \author (last) Behrouz NematiPour
+ * \date (last) 16-Oct-2020
  * \author (original) Behrouz NematiPour
  * \date (original) 27-Jan-2020
- * 
+ *
  */
 
 // Qt
 import QtQuick 2.12
 
 // Project
-import VTreatmentRanges 0.1
+import Gui.Actions                                  0.1
+import VTreatmentRanges                             0.1
+import VTreatmentAdjustmentSaline                   0.1
+import VHDTreatmentStates                           0.1
+import VTreatmentAdjustmentUltrafiltrationState     0.1
+import VTreatmentAdjustmentUltrafiltrationEdit      0.1
+import VTreatmentAdjustmentUltrafiltrationConfirm   0.1
 
 //  Qml imports
 import "qrc:/globals"
 import "qrc:/components"
 import "qrc:/pages/treatment/adjustments"
+
 /*!
  * \brief   TreatmentStack is the screen
  * which contains the main stack for all the Trearment screens
@@ -34,10 +41,32 @@
 
     stackView.initialItem   : _treatmentHome
 
-    VTreatmentRanges        { id: vTreatmentRanges }
+    // Views
+    VTreatmentRanges                            { id: vTreatmentRanges                              }
+    VTreatmentAdjustmentSaline                  { id: vTreatmentAdjustmentSaline                    }
+    VHDTreatmentStates                          { id: vHDTreatmentStates                            }
+    VTreatmentAdjustmentUltrafiltrationState    { id: vTreatmentAdjustmentUltrafiltrationState      }
+    VTreatmentAdjustmentUltrafiltrationEdit     { id: vTreatmentAdjustmentUltrafiltrationEdit       }
+    VTreatmentAdjustmentUltrafiltrationConfirm  { id: vTreatmentAdjustmentUltrafiltrationConfirm    }
 
+    // ultrafiltration state information bar properties
+    readonly property bool   isUFPaused         : vHDTreatmentStates.ufPaused
+    readonly property bool   isUFOff            : vHDTreatmentStates.ufOff
+    readonly property bool   isUFRunning        : vHDTreatmentStates.ufRunning
+    readonly property bool   isUFCompleted      : vHDTreatmentStates.ufCompleted
+    readonly property string ufInfoImageSource  : isUFPaused    ? "qrc:/images/iPauseGray" :
+                                                  isUFOff       ? "qrc:/images/iOffGray"   :
+                                                  isUFCompleted ? "qrc:/images/iDone"      : ""
+    readonly property string ufInfoText         : isUFPaused    ? qsTr("Ultrafiltration is paused"    ) :
+                                                  isUFOff       ? qsTr("Ultrafiltration is off"       ) :
+                                                  isUFCompleted ? qsTr("Ultrafiltration is completed" ) : ""
+    readonly property string ufInfoTextColor    : isUFPaused    ? "gray"  :
+                                                  isUFOff       ? "gray"  :
+                                                  isUFCompleted ? "lightgray" : ""
+
+    // Components
     MainMenu                { id: _treatmentMenu
-        y               : -Variables.mainMenuHeight
+        y               : Variables.mainMenuHeight * -1
         position        : MainMenu.Position.Top
         hidden          : true
         titles          : [ qsTr("Back") , qsTr("Treatment") , qsTr("Trending") , qsTr("Settings") ]
@@ -63,32 +92,32 @@
             _treatmentAdjustmentDuration.open()
         }
         onSectionUltrafiltrationClicked: {
-            if ( vTreatmentAdjustmentUltrafiltrationState.isPaused ) {
-                _treatmentAdjustmentUltrafiltrationPaused.open()
-            } else {
+            if ( isUFRunning ) {
                 _treatmentAdjustmentUltrafiltrationStart .open()
+            } else {
+                _treatmentAdjustmentUltrafiltrationPaused.open()
             }
         }
     }
 
     TreatmentCreate             { id:       _treatmentCreate
         onBackClicked          : pop()
-        onContinueClicked      : {vCreateTreatment.onFinishedCreate(); }
+        onContinueClicked      : vCreateTreatment.onFinishedCreate()
     }
 
     TreatmentConfirm             { id:       _treatmentConfirm
         onBackClicked           : pop()
-        onConfirmClicked        : {vCreateTreatment.onFinishedConfirm(); }
+        onConfirmClicked        : vCreateTreatment.onFinishedConfirm()
     }
 
     TreatmentPrime             { id:       _treatmentPrime
         onBackClicked           : pop()
-        onContinueClicked       : {vCreateTreatment.onFinishedPrime(); }
+        onContinueClicked       : vCreateTreatment.onFinishedPrime()
     }
 
     TreatmentBegin             { id:       _treatmentBegin
         onBackClicked           : pop()
-        onStartClicked          : {vCreateTreatment.onStart(); }
+        onStartClicked          : vCreateTreatment.onStart()
     }
 
 
@@ -169,17 +198,18 @@
     Connections { target: vTreatmentAdjustmentUltrafiltrationState
         onAdjustmentTriggered   : {
             if ( vTreatmentAdjustmentUltrafiltrationState.adjustment_Accepted ) {
-                if ( vTreatmentAdjustmentUltrafiltrationState.isPaused ) {
+                if (vHDTreatmentStates.ufPaused) { // handle screen regarding current accepted
                     _treatmentAdjustmentUltrafiltrationStart .close()
                     _treatmentAdjustmentUltrafiltrationPaused.open ()
                 } else {
                     _treatmentAdjustmentUltrafiltrationPaused.close()
                 }
-            } else {
-                if ( vTreatmentAdjustmentUltrafiltrationState.isPaused ) {
-                    _treatmentAdjustmentUltrafiltrationPaused.notification.text = vTreatmentAdjustmentUltrafiltrationState.text()
+            }
+            else {
+                if (vHDTreatmentStates.ufRunning) { // handle error messages regarding current accepted
+                    _treatmentAdjustmentUltrafiltrationStart.notificationText = vTreatmentAdjustmentUltrafiltrationState.adjustment_ReasonText
                 } else {
-                    _treatmentAdjustmentUltrafiltrationStart .notification.text = vTreatmentAdjustmentUltrafiltrationState.text()
+                    _treatmentAdjustmentUltrafiltrationPaused.notificationText = vTreatmentAdjustmentUltrafiltrationState.adjustment_ReasonText
                 }
             }
         }
@@ -207,17 +237,14 @@
     Connections { target: vTreatmentAdjustmentUltrafiltrationConfirm
         onAdjustmentTriggered   : {
             if (vTreatmentAdjustmentUltrafiltrationConfirm.adjustment_Accepted) {
-                // HD resumes the ultrafiltration and no need to recall the doPause just update the state
-                vTreatmentAdjustmentUltrafiltrationState.isPaused           = false
-                vTreatmentUltrafiltration.maximum                           = vTreatmentAdjustmentUltrafiltrationConfirm.volume
+                vTreatmentUltrafiltration.maximum                            = vTreatmentAdjustmentUltrafiltrationConfirm.volume
                 _treatmentAdjustmentUltrafiltrationConfirm.close()
             } else {
                 _treatmentAdjustmentUltrafiltrationConfirm.notification.text = vTreatmentAdjustmentUltrafiltrationConfirm.text()
             }
         }
     }
 
-
     Connections { target: vCreateTreatment
         onShowConfirm : { push(_treatmentConfirm) }
         onShowPrime   : { push(_treatmentPrime) }