Index: sources/gui/qml/pages/treatment/TreatmentStack.qml
===================================================================
diff -u -r89e3ca8e108dd4b3315ae7862c631eba43f8fd0f -r5215e145a0f26a20c99e3f10af6ac8a9c3b67383
--- sources/gui/qml/pages/treatment/TreatmentStack.qml	(.../TreatmentStack.qml)	(revision 89e3ca8e108dd4b3315ae7862c631eba43f8fd0f)
+++ sources/gui/qml/pages/treatment/TreatmentStack.qml	(.../TreatmentStack.qml)	(revision 5215e145a0f26a20c99e3f10af6ac8a9c3b67383)
@@ -6,32 +6,22 @@
  * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
  * 
  * \file TreatmentStack.qml
- * \author (last) Behrouz NematiPour
- * \date (last) 16-Oct-2020
- * \author (original) Behrouz NematiPour
- * \date (original) 27-Jan-2020
+ * \author  (last)      Behrouz NematiPour
+ * \date    (last)      09-Feb-2021
+ * \author  (original)  Behrouz NematiPour
+ * \date    (original)  27-Jan-2020
  * 
  */
 
 // Qt
 import QtQuick 2.12
 
-// Project
-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
-import VTreatmentAdjustmentPressuresLimits          0.1
-import VTreatmentAdjustmentHeparin                  0.1
-
 //  Qml imports
 import "qrc:/globals"
 import "qrc:/components"
-import "qrc:/components/pretreatment"
 import "qrc:/pages/treatment/adjustments"
+import "qrc:/pages/pretreatment/create"
+import "qrc:/pages/posttreatment"
 
 /*!
  * \brief   TreatmentStack is the screen
@@ -44,16 +34,6 @@
 
     stackView.initialItem   : _treatmentHome
 
-    // Views
-    VTreatmentRanges                            { id: vTreatmentRanges                              }
-    VTreatmentAdjustmentSaline                  { id: vTreatmentAdjustmentSaline                    }
-    VHDTreatmentStates                          { id: vHDTreatmentStates                            }
-    VTreatmentAdjustmentUltrafiltrationState    { id: vTreatmentAdjustmentUltrafiltrationState      }
-    VTreatmentAdjustmentUltrafiltrationEdit     { id: vTreatmentAdjustmentUltrafiltrationEdit       }
-    VTreatmentAdjustmentUltrafiltrationConfirm  { id: vTreatmentAdjustmentUltrafiltrationConfirm    }
-    VTreatmentAdjustmentPressuresLimits         { id: vTreatmentAdjustmentPressuresLimits           }
-    VTreatmentAdjustmentHeparin                 { id: vTreatmentAdjustmentHeparin                   }
-
     // ultrafiltration state information bar properties
     readonly property bool   isUFPaused         : vHDTreatmentStates.ufPaused
     readonly property bool   isUFOff            : vHDTreatmentStates.ufOff
@@ -84,13 +64,19 @@
         hasLogo         : true
     }
 
+    // Blood Prime
+    PostTreatmentBloodPrime         { id: _postTreatmentBloodPrime          } // only one page, no stack for now.
+    PostTreatmentRinsebackStack     { id: _postTreatmentRinsebackStack      }
+    PostTreatmentRecirculateStack   { id: _postTreatmentRecirculateStack    }
+    PostTreatmentEndStack           { id: _postTreatmentEndStack            }
+
     TreatmentHome               { id:       _treatmentHome
         onTreatmentStarted      : push( _treatmentStart )
-        onTreatmentCreated      : /*push( _treatmentPrime ) //*/ vTreatmentCreate.doSelectParameters()
+        onTreatmentCreated      : vTreatmentCreate.doSelectParameters()
     }
 
     TreatmentStart              { id:       _treatmentStart
-        onBackClicked           : popToItem(_treatmentHome)
+        onBackClicked           : pop( _treatmentHome )
         onSectionFlowClicked    : {
             _treatmentAdjustmentFlow.open()
         }
@@ -113,22 +99,22 @@
         }
     }
 
-    TreatmentCreate             { id:       _treatmentCreate
-        onClickedBack           : {vTreatmentCreate.doCancelSelectingParameters() }
-        onClickedContinue       : {vTreatmentCreate.doFinishedCreate();  }
+    PreTreatmentCreate          { id:       _pretreatmentCreate
+        onBackClicked           : {vTreatmentCreate.doCancelSelectingParameters() }
+        onContinueClicked       : {vTreatmentCreate.doFinishedCreate();  }
     }
 
-    TreatmentConfirm             { id:       _treatmentConfirm
-        onClickedBack           : {vTreatmentCreate.doCancelConfirmParameters()   }
-        onClickedConfirm        : {vTreatmentCreate.doFinishedConfirm(); }
+    PreTreatmentConfirm         { id:      _pretreatmentConfirm
+        onBackClicked           : {vTreatmentCreate.doCancelConfirmParameters()   }
+        onConfirmClicked        : {vTreatmentCreate.doFinishedConfirm(); }
     }
 
-    TreatmentPrime             { id:       _treatmentPrime
-        onClickedBack           : {vTreatmentCreate.doRequestPop()       }
-        onClickedContinue       : {vTreatmentCreate.doFinishedPrime();   }
+    PreTreatmentPrime           { id:        _pretreatmentPrime
+        onBackClicked           : {vTreatmentCreate.doRequestPop()       }
+        onContinueClicked       : {vTreatmentCreate.doFinishedPrime();   }
     }
 
-    TreatmentBegin             { id:       _treatmentBegin
+    PreTreatmentUltrafiltration { id:        _pretreatmentUltrafiltration
         onBackClicked           : {vTreatmentCreate.doRequestPop()       }
         onStartClicked          : {vTreatmentBegin.doCheckBLE()          }
     }
@@ -221,6 +207,7 @@
         }
     }
 
+
     // ---------- Manages Responses ----------
     Connections { target: vTreatmentAdjustmentDuration
         onAdjustmentTriggered   : {
@@ -238,13 +225,13 @@
         onAdjustmentTriggered   : {
             // the maximum ultrafiltration volume has to be set/revert regardless
             vTreatmentUltrafiltration.maximum = vTreatmentAdjustmentUltrafiltrationInit.volume
-            _treatmentBegin.ufVolume          = vTreatmentAdjustmentUltrafiltrationInit.volume
+            _pretreatmentUltrafiltration.ufVolume          = vTreatmentAdjustmentUltrafiltrationInit.volume
             // but only if it has been accepted it will navigate
             if (vTreatmentAdjustmentUltrafiltrationInit.adjustment_Accepted) {
                 vTreatmentBegin.doStartTreatment()
             }
             else {
-                _treatmentBegin.reasonText  = vTreatmentAdjustmentUltrafiltrationInit.text()
+                _pretreatmentUltrafiltration.reasonText  = vTreatmentAdjustmentUltrafiltrationInit.text()
             }
         }
     }
@@ -318,17 +305,39 @@
     }
 
     Connections { target: vTreatmentCreate
-        onShowCreate           : { push(_treatmentCreate)  }
-        onShowConfirm          : { push(_treatmentConfirm) }
-        onShowPrime            : { push(_treatmentPrime)   }
-        onShowBegin            : { push(_treatmentBegin)   }
+        onShowCreate           : { push(_pretreatmentCreate)  }
+        onShowConfirm          : { push(_pretreatmentConfirm) }
+        onShowPrime            : { push(_pretreatmentPrime)   }
+        onShowBegin            : { push(_pretreatmentUltrafiltration)   }
         onPop                  : { pop()                   }
         onShowTreatmentStart   : { push(_treatmentStart)   }
     }
 
+    // the back is more flixible regarding our current design
+    // and it's easier(or may not need) to modify later if required.
+    // and is more optimized and will never leave screen empty
+    // also with what ever order they have been push with the reverse/correct animation will be poped or pushed.
+    Connections { target: vHDTreatmentStates
+        // Blood Prime
+        onTxBloodPrimeChanged   : { if ( vtxBloodPrime      ) { page( _postTreatmentBloodPrime          )}}
+        onBpRampChanged         : { if ( vbpRamp            ) { /* No action defined yet */              }}
+
+        // in-Treatmet
+        onTxDialysisChanged     : { if ( vtxDialysis        ) { page( _treatmentStart                   )}}
+
+        onTxRinsebackChanged    : { if ( vtxRinseback       ) { page( _postTreatmentRinsebackStack      )}}
+        onTxRecirculateChanged  : { if ( vtxRecirculate     ) { page( _postTreatmentRecirculateStack    )}}
+        onTxEndChanged          : { if ( vtxEnd             ) { page( _postTreatmentEndStack            )}}
+
+        // Treatment Stop
+        onTxStopChanged         : { if ( vtxStop            ) { page( _treatmentStart                   )}}
+        onTsRecirculateChanged  : { if ( vtsRecirculate     ) { /* No action defined yet */              }}
+        onTsRecirculateNoChanged: { if ( vtsRecirculateNo   ) { /* No action defined yet */              }}
+    }
+
     Connections { target: vTreatmentBegin
         onDidConfirmReadyToStartTreament: {
-            vTreatmentAdjustmentUltrafiltrationInit.doAdjustment(_treatmentBegin.ufVolume);
+            vTreatmentAdjustmentUltrafiltrationInit.doAdjustment(_pretreatmentUltrafiltration.ufVolume);
         }
     }
 }