Index: sources/gui/qml/pages/treatment/TreatmentStack.qml
===================================================================
diff -u -r8cf828e5768d491c3e329c39b108624832054e94 -r59a1b4dceeb629ed08a434775d819ce108fe894b
--- sources/gui/qml/pages/treatment/TreatmentStack.qml	(.../TreatmentStack.qml)	(revision 8cf828e5768d491c3e329c39b108624832054e94)
+++ sources/gui/qml/pages/treatment/TreatmentStack.qml	(.../TreatmentStack.qml)	(revision 59a1b4dceeb629ed08a434775d819ce108fe894b)
@@ -145,11 +145,9 @@
     Connections                 { target:   _treatmentAdjustmentSetPoints
         function onConfirmClicked                   ( vValue ) {
             vTreatmentAdjustmentSetPoints.doAdjustment(
-//                _treatmentAdjustmentSetPoints.treatmentModality     , // TODO
                 _treatmentAdjustmentSetPoints.bloodFlowRate         ,
                 _treatmentAdjustmentSetPoints.dialysateFlowRate     ,
                 _treatmentAdjustmentSetPoints.dialysateTemperature  ,
-//                _treatmentAdjustmentSetPoints.hepatitus               // TODO
                 _treatmentAdjustmentSetPoints.acidConcentrate       ,
                 vTreatmentRanges.acidConcentrateModel.get(_treatmentAdjustmentSetPoints.acidConcentrate).value,
                 _treatmentAdjustmentSetPoints.bicarbConcentrate     ,
@@ -193,7 +191,7 @@
     Connections { target: vTreatmentAdjustmentPressuresLimits
         function onAdjustmentTriggered              ( vValue ) {
             if (vTreatmentAdjustmentPressuresLimits.adjustment_Accepted) {
-                _treatmentAdjustmentPressuresLimits.close()
+                if ( _treatmentAdjustmentPressuresLimits.isValid ) { _treatmentAdjustmentPressuresLimits.close() }
             }
             else {
                 _treatmentAdjustmentPressuresLimits.notification.text = vTreatmentAdjustmentPressuresLimits.text()
@@ -204,21 +202,32 @@
     Connections { target: vTreatmentAdjustmentSetPoints
         function onAdjustmentTriggered              ( vValue ) {
             if (vTreatmentAdjustmentSetPoints.adjustment_Accepted) {
-                // TODO update setpoints here?
-                vTreatmentCreate.treatmentModality                  =  _treatmentAdjustmentSetPoints.treatmentModality
+                vTreatmentCreate.treatmentModality                  = _treatmentAdjustmentSetPoints.treatmentModality
                 vTreatmentCreate.acidConcentrate                    = _treatmentAdjustmentSetPoints.acidConcentrate
                 vTreatmentCreate.dryBicarbCartSize                  = _treatmentAdjustmentSetPoints.bicarbConcentrate
                 vTreatmentCreate.hepatitusBStatus                   = _treatmentAdjustmentSetPoints.hepatitus
                 vTreatmentCreate.sodium                             = _treatmentAdjustmentSetPoints.sodium
                 vTreatmentCreate.bicarbonate                        = _treatmentAdjustmentSetPoints.bicarbonate
-                _treatmentAdjustmentSetPoints.close()
+                if ( _treatmentAdjustmentSetPoints.isValid ) { _treatmentAdjustmentSetPoints.close() }
             }
             else {
                 _treatmentAdjustmentSetPoints.notification.text = vTreatmentAdjustmentSetPoints.text()
             }
         }
     }
 
+
+    Connections { target: vTreatmentAdjustmentVitalsAlarmLimits
+        function onAdjustmentTriggered              ( vValue ) {
+            if (vTreatmentAdjustmentVitalsAlarmLimits.adjustment_Accepted) {
+                if ( _treatmentAdjustmentVitalsInterval.isValid ) { _treatmentAdjustmentVitalsInterval.close() }
+            }
+            else {
+                _treatmentAdjustmentVitalsInterval.notification.text = vTreatmentAdjustmentVitalsAlarmLimits.text()
+            }
+        }
+    }
+
     Connections                 { target: vTreatmentAdjustmentBloodPrime
         function onAdjustmentTriggered              ( vValue ) {
             if (vTreatmentAdjustmentBloodPrime.adjustment_Accepted) {