Index: sources/gui/qml/pages/treatment/TreatmentStack.qml
===================================================================
diff -u -r39a514158384c0ad4bfcfb90bafbaa4ca8dc5a26 -r0975a67dd4e4673b9a7b226bfea02cbfa489c418
--- sources/gui/qml/pages/treatment/TreatmentStack.qml	(.../TreatmentStack.qml)	(revision 39a514158384c0ad4bfcfb90bafbaa4ca8dc5a26)
+++ sources/gui/qml/pages/treatment/TreatmentStack.qml	(.../TreatmentStack.qml)	(revision 0975a67dd4e4673b9a7b226bfea02cbfa489c418)
@@ -125,6 +125,26 @@
         }
     }
 
+    TreatmentTrends             { id: _treatmentTrends
+        objectName: "_treatmentTrends"
+        Connections { target: vTDOpMode
+            function onInTreatmentChanged() {
+                if (vTDOpMode.inTreatment) {
+                    _treatmentTrends.isParamExpanded = true
+                    vTreatmentTrends.doClearData()
+                }
+            }
+        }
+    }
+
+    TreatmentHeparin            { id: _treatmentHeparin     }
+    Connections { target: _treatmentHeparin
+        function onIdleTimeout  ( ) {
+            _headerBar.headerMenuIndex = HeaderBar.Treatment // on heparin idle timeout go to main treatment
+        }
+    }
+
+    TreatmentHDF                { id: _treatmentHDF         }
     Connections                 { target: _treatmentHDF
         function onSectionPressuresClicked ( ) {
             _treatmentAdjustmentPressuresLimits.open()
@@ -136,11 +156,12 @@
         }
     }
 
-    Connections { target: _treatmentHeparin
-        function onIdleTimeout  ( ) {
-            _headerBar.headerMenuIndex = HeaderBar.Treatment // on heparin idle timeout go to main treatment
-        }
-    }
+    //// Treatment Adjustment Dialogs
+    TreatmentAdjustmentSetPoints            { id:       _treatmentAdjustmentSetPoints       }
+    TreatmentAdjustmentPressuresLimits      { id:       _treatmentAdjustmentPressuresLimits }
+    TreatmentAdjustmentBolusVolume          {    id:       _treatmentAdjustmentBolusVolume     }
+    TreatmentAdjustmentUltrafiltrationStack { id:       _treatmentAdjustmentUltrafiltration }
+    TreatmentAdjustmentHDF                  { id:       _treatmentAdjustmentHDF             }
 
     Connections                 { target:   _treatmentAdjustmentSetPoints
         function onConfirmClicked                   ( vValue ) {
@@ -151,9 +172,12 @@
                 _treatmentAdjustmentSetPoints.dialysateTemperature  ,
 //                _treatmentAdjustmentSetPoints.hepatitus               // TODO
                 _treatmentAdjustmentSetPoints.acidConcentrate       ,
-                _treatmentAdjustmentSetPoints.bicarbConcentrate
-//                _treatmentAdjustmentSetPoints.sodium                  // TODO
-//                _treatmentAdjustmentSetPoints.bicarboante             // TODO
+                vTreatmentRanges.acidConcentrateModel.get(_treatmentAdjustmentSetPoints.acidConcentrate).value,
+                _treatmentAdjustmentSetPoints.bicarbConcentrate     ,
+                _treatmentAdjustmentSetPoints.treatmentModality     ,
+                _treatmentAdjustmentSetPoints.hepatitus             ,
+                _treatmentAdjustmentSetPoints.sodium                ,
+                _treatmentAdjustmentSetPoints.bicarbonate
             )
         }
     }
@@ -201,6 +225,13 @@
     Connections { target: vTreatmentAdjustmentSetPoints
         function onAdjustmentTriggered              ( vValue ) {
             if (vTreatmentAdjustmentSetPoints.adjustment_Accepted) {
+                // TODO update setpoints here?
+                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()
             }
             else {