Index: sources/gui/qml/pages/treatment/TreatmentStack.qml
===================================================================
diff -u -rf68b226e67eb500758ee94fe015df48931240013 -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9
--- sources/gui/qml/pages/treatment/TreatmentStack.qml	(.../TreatmentStack.qml)	(revision f68b226e67eb500758ee94fe015df48931240013)
+++ sources/gui/qml/pages/treatment/TreatmentStack.qml	(.../TreatmentStack.qml)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
@@ -1,13 +1,13 @@
 /*!
  *
- * Copyright (c) 2020-2022 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    TreatmentStack.qml
- * \author  (last)      Behrouz NematiPour
- * \date    (last)      23-Oct-2022
+ * \author  (last)      Vy
+ * \date    (last)      14-Jun-2023
  * \author  (original)  Behrouz NematiPour
  * \date    (original)  27-Jan-2020
  *
@@ -34,7 +34,7 @@
 
     onVisibleChanged        : { // this should never happen by design, but in tests it can easily happen and will block the screen touch.
         _treatmentAdjustmentFlow            .close()
-        _vitalEntry                         .close()
+        _vitalEntry                         .close( true ) // vQuit == true
         _treatmentAdjustmentPressuresLimits .close()
         _treatmentAdjustmentDuration        .close()
         _treatmentUltrafiltrationItem       .close()
@@ -51,12 +51,17 @@
 
     readonly property bool   isSBInProgress     : ( vHDTreatmentStates.sbRunning || vHDTreatmentStates.sbWaitPump )
 
+    readonly property bool isDialogOpened : _treatmentAdjustmentFlow            .visible
+                                         || _treatmentAdjustmentPressuresLimits .visible
+                                         || _treatmentAdjustmentDuration        .visible
+                                         || _treatmentUltrafiltrationItem       .visible
     // Components
     MainMenu            { id: _treatmentMenu
         y               : Variables.mainMenuHeight * -1
         position        : MainMenu.Position.Top
         hidden          : true
         titles          : [ qsTr("Treatment") , qsTr("Trending") , qsTr("Settings") ]
+        visibleItems    : [       true        ,       false      ,       false      ]
         spacing         :  20
         leftPdding      :  20
         rightPdding     :  50
@@ -87,7 +92,8 @@
             _treatmentAdjustmentPressuresLimits.open()
         }
         function onSectionTimeClicked               ( vValue ) {
-            _treatmentAdjustmentDuration.durationValue = vTreatmentTime.time_Total / 60 // minutes => hours
+            //DEBUG: console.log("time total minutes: " + vTreatmentTime.time_Total / 60 )
+            _treatmentAdjustmentDuration.setDurationValue(vTreatmentTime.time_Total / 60) // minutes => hours
             _treatmentAdjustmentDuration.open()
         }
         function onSectionUltrafiltrationClicked    ( vValue ) {
@@ -98,42 +104,28 @@
     ScreenItem                  { id: _treatmentTrending    }
 
     //// Treatment Adjustment Dialogs
-    TreatmentAdjustmentFlow     { id:       _treatmentAdjustmentFlow    }
-    TreatmentAdjustmentPressuresLimits  { id:       _treatmentAdjustmentPressuresLimits
-        arterialPressureMinimum     : vTreatmentRanges.arterialPressureMonitorMin
-        arterialPressureMaximum     : vTreatmentRanges.arterialPressureMonitorMax
-        venousPressureMinimum       : vTreatmentRanges.venousPressureMonitorMin
-        venousPressureMaximum       : vTreatmentRanges.venousPressureMonitorMax
+    TreatmentAdjustmentFlow             { id:       _treatmentAdjustmentFlow    }
+    TreatmentAdjustmentPressuresLimits  { id:       _treatmentAdjustmentPressuresLimits    }
 
-        arterialPressureLowerBound  : vTreatmentAdjustmentPressuresLimits.arterialLimitLow
-        arterialPressureUpperBound  : vTreatmentAdjustmentPressuresLimits.arterialLimitHigh
-        venousPressureLowerBound    : vTreatmentAdjustmentPressuresLimits.venousLimitLow
-        venousPressureUpperBound    : vTreatmentAdjustmentPressuresLimits.venousLimitHigh
-
-        arterialPressureStep        : vTreatmentRanges.arterialPressureLimitLowRes
-        arterialPressureValue       : vTreatmentPressureOcclusion.arterialPressure
-
-        venousPressureStep          : vTreatmentRanges.venousPressureLimitLowRes
-        venousPressureValue         : vTreatmentPressureOcclusion.venousPressure
-    }
-
     Connections                 { target:   _treatmentAdjustmentFlow
-        function onConfirmClicked                   ( vValue ) { vTreatmentAdjustmentFlows.doAdjustment(bloodFlowRateValue, dialysateFlowRateValue) }
+        function onConfirmClicked                   ( vValue ) { vTreatmentAdjustmentFlows.doAdjustment(
+                                            _treatmentAdjustmentFlow.bloodFlowRateValue     ,
+                                            _treatmentAdjustmentFlow.dialysateFlowRateValue )
+        }
     }
     Connections                 { target:   _treatmentAdjustmentPressuresLimits
         function onConfirmClicked                   ( vValue ) { vTreatmentAdjustmentPressuresLimits.doAdjustment(
-                                          arterialPressureLowerBound ,
-                                          arterialPressureUpperBound ,
-                                          venousPressureLowerBound   ,
-                                          venousPressureUpperBound
-                                          )
+                                            _treatmentAdjustmentPressuresLimits.arterialPressureLimitWindow ,
+                                            _treatmentAdjustmentPressuresLimits.venousPressureLimitWindow   ,
+                                            _treatmentAdjustmentPressuresLimits.venousPressureLimitAsymtrc  )
         }
     }
 
     TreatmentAdjustmentDuration { id:       _treatmentAdjustmentDuration    }
     Connections                 { target:   _treatmentAdjustmentDuration
         function onConfirmClicked                   ( vValue ) { vTreatmentAdjustmentDuration.doAdjustment(
-                                           _treatmentAdjustmentDuration.durationValue                       )}
+                                            _treatmentAdjustmentDuration.durationValue                      )
+        }
     }
 
     EntryDialog                 { id:       _vitalEntry
@@ -158,24 +150,22 @@
             vTreatmentVitals.doSkip() // only for logging
         }
 
-        onOpened                : {
-            vTreatmentVitals.doTimerStop() // Can't be moved to C++, and has to be handled here because it can manually being opened by the user
-            _bphrEntry.setFocus()
-        }
+        onOpened                : vTreatmentVitals.doTimerStop() // Can't be moved to C++, and has to be handled here because it can manually being opened by the user
 
         onClosed                : {
-            vTreatmentVitals.doTimerStart()
+            if ( ! vQuit )
+                vTreatmentVitals.doTimerStart()
         }
 
         BPHREntry { id          : _bphrEntry
             contentRectHeight   : _vitalEntry.contentRect.height
         }
 
         Connections { target: vTreatmentVitals
-            function onDidTrigger               ( vSystolic, vDiastolic, vHeartRate ) {
+            function onDidTrigger       ( vSystolic, vDiastolic, vHeartRate ) {
                 if  ( vTreatmentVitals.enableDialog ) {
-                    _vitalEntry.update(vSystolic, vDiastolic, vHeartRate          )
-                    _vitalEntry.open()
+                    _vitalEntry.update  ( vSystolic, vDiastolic, vHeartRate )
+                    _vitalEntry.open    ()
                 }
             }
         }
@@ -188,7 +178,7 @@
                 vTreatmentUltrafiltration.maximum               = vTreatmentAdjustmentDuration.ultrafiltration
                 _treatmentAdjustmentDuration.accept()
             } else {
-                _treatmentAdjustmentDuration.durationValue      = vTreatmentAdjustmentDuration.duration;
+                _treatmentAdjustmentDuration.setDurationValue(vTreatmentAdjustmentDuration.duration);
                 _treatmentAdjustmentDuration.notification.text  = vTreatmentAdjustmentDuration.text();
             }
         }
@@ -198,10 +188,9 @@
         function onAdjustmentTriggered              ( vValue ) {
             // values have to be update even when rejected HD is reverting back the values.
             // if accepted will be updated for later [may need refresh later]
-            _treatmentAdjustmentPressuresLimits.arterialPressureLowerBound = vTreatmentAdjustmentPressuresLimits.arterialLimitLow
-            _treatmentAdjustmentPressuresLimits.arterialPressureUpperBound = vTreatmentAdjustmentPressuresLimits.arterialLimitHigh
-            _treatmentAdjustmentPressuresLimits.venousPressureLowerBound   = vTreatmentAdjustmentPressuresLimits.venousLimitLow
-            _treatmentAdjustmentPressuresLimits.venousPressureUpperBound   = vTreatmentAdjustmentPressuresLimits.venousLimitHigh
+            _treatmentAdjustmentPressuresLimits.arterialPressureLimitWindow = vTreatmentAdjustmentPressuresLimits.arterialPressureLimitWindow
+            _treatmentAdjustmentPressuresLimits.venousPressureLimitWindow   = vTreatmentAdjustmentPressuresLimits.venousPressureLimitWindow
+            _treatmentAdjustmentPressuresLimits.venousPressureLimitAsymtrc  = vTreatmentAdjustmentPressuresLimits.venousPressureLimitAsymtrc
 
             if (vTreatmentAdjustmentPressuresLimits.adjustment_Accepted) {
                 _treatmentAdjustmentPressuresLimits.close()