Index: leahi.qrc
===================================================================
diff -u -rd4b7643b0a19278ea948a75553ff777e4e436c22 -rf46bc6ffce5eb0ac3e1bbd5a9b8ee9202209c881
--- leahi.qrc	(.../leahi.qrc)	(revision d4b7643b0a19278ea948a75553ff777e4e436c22)
+++ leahi.qrc	(.../leahi.qrc)	(revision f46bc6ffce5eb0ac3e1bbd5a9b8ee9202209c881)
@@ -53,6 +53,12 @@
         <file alias="HeaderbarPrescription.qml">sources/gui/qml/dialogs/headerbar/HeaderbarPrescription.qml</file>
         <file alias="HeaderbarInformation.qml">sources/gui/qml/dialogs/headerbar/HeaderbarInformation.qml</file>
     </qresource>
+    <qresource prefix="/dialogs/watersample">
+        <file alias="WaterSampleDialog.qml">sources/gui/qml/dialogs/watersample/WaterSampleDialog.qml</file>
+        <file alias="WaterSampleBase.qml">sources/gui/qml/dialogs/watersample/WaterSampleBase.qml</file>
+        <file alias="WaterSamplePage.qml">sources/gui/qml/dialogs/watersample/WaterSamplePage.qml</file>
+        <file alias="WaterSampleDialysatePage.qml">sources/gui/qml/dialogs/watersample/WaterSampleDialysatePage.qml</file>
+    </qresource>
     <qresource prefix="/images">
         <file alias="iLogoD">resources/images/Logo d.png</file>
         <file alias="iLogoDiality">resources/images/Logo DialityT.png</file>
@@ -112,6 +118,7 @@
         <file alias="iVolume">resources/images/Volume.png</file>
         <file alias="iWaterSampleFail">resources/images/water_sample_fail.png</file>
         <file alias="iWaterSamplePass">resources/images/water_sample_pass.png</file>
+        <file alias="iWaterSample">resources/images/water_sample.png</file>
         <file alias="iArrowDownDisabled">resources/images/ArrowDownDisabled.png</file>
         <file alias="iArrowUpDisabled">resources/images/ArrowUpDisabled.png</file>
     </qresource>
@@ -181,6 +188,7 @@
         <file alias="RangedValue.qml">sources/gui/qml/components/RangedValue.qml</file>
         <file alias="SubStepIndicator.qml">sources/gui/qml/components/SubStepIndicator.qml</file>
         <file alias="SDCInfo.qml">sources/gui/qml/components/SDCInfo.qml</file>
+        <file alias="BaseChart.qml">sources/gui/qml/components/BaseChart.qml</file>
     </qresource>
     <qresource prefix="/compounds">
         <file alias="PressureRangeSlider.qml">sources/gui/qml/compounds/PressureRangeSlider.qml</file>
@@ -254,11 +262,9 @@
     <qresource prefix="/pages/pretreatment">
         <file alias="PreTreatmentBase.qml">sources/gui/qml/pages/pretreatment/PreTreatmentBase.qml</file>
         <file alias="PreTreatmentStack.qml">sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml</file>
-        <file alias="PreTreatmentWaterSample.qml">sources/gui/qml/pages/pretreatment/PreTreatmentWaterSample.qml</file>
         <file alias="PreTreatmentSelfTests.qml">sources/gui/qml/pages/pretreatment/PreTreatmentSelfTests.qml</file>
         <file alias="PreTreatmentPrime.qml">sources/gui/qml/pages/pretreatment/PreTreatmentPrime.qml</file>
         <file alias="PreTreatmentInstallStack.qml">sources/gui/qml/pages/pretreatment/PreTreatmentInstallStack.qml</file>
-        <file alias="PreTreatmentUltrafiltration.qml">sources/gui/qml/pages/pretreatment/PreTreatmentUltrafiltration.qml</file>
     </qresource>
     <qresource prefix="/pages/pretreatment/create">
         <file alias="PreTreatmentCreate.qml">sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml</file>
@@ -301,7 +307,7 @@
         <file alias="TreatmentAdjustmentIsolatedUFConfirm.qml">sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentIsolatedUFConfirm.qml</file>
         <file alias="TreatmentAdjustmentVitals.qml">sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml</file>
         <file alias="TreatmentAdjustmentVitalsInterval.qml">sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitalsInterval.qml</file>
-        <file alias="TreatmentAdjustmentMode.qml">sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentMode.qml</file>
+        <file alias="TreatmentAdjustmentHDF.qml">sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentHDF.qml</file>
     </qresource>
     <qresource prefix="/pages/endtreatment">
         <file alias="EndTreatmentRinsebackStack.qml">sources/gui/qml/pages/endtreatment/EndTreatmentRinsebackStack.qml</file>
Index: sources/gui/qml/pages/treatment/TreatmentHome.qml
===================================================================
diff -u -r3454906bbb35aa2976572145068980bf691daf1c -rf46bc6ffce5eb0ac3e1bbd5a9b8ee9202209c881
--- sources/gui/qml/pages/treatment/TreatmentHome.qml	(.../TreatmentHome.qml)	(revision 3454906bbb35aa2976572145068980bf691daf1c)
+++ sources/gui/qml/pages/treatment/TreatmentHome.qml	(.../TreatmentHome.qml)	(revision f46bc6ffce5eb0ac3e1bbd5a9b8ee9202209c881)
@@ -99,6 +99,7 @@
                 objectName      : "treatmentUltrafiltration"
                 width           : cellWidth * 3
                 height          : cellHeight
+                header.setEditActive: ! isTreatmentEnd  // LEAHI-PRS-376
 
                 onEditClicked   : sectionUltrafiltrationClicked()
             }
@@ -131,14 +132,14 @@
         CloseButton { id: _dismissButton
             objectName: "_dismissButton"
             anchors {
-                top: parent.top
-                bottom: parent.bottom
-                right: parent.right
-                margins: 20
+                top     : parent.top
+                bottom  : parent.bottom
+                right   : parent.right
+                margins : 20
             }
-            width: height
-            visible: true
-            onClicked: { _notification.text = "" }
+            width       : height
+            visible     : true
+            onClicked   : { _notification.text = "" }
         }
     }
 
@@ -186,6 +187,17 @@
         }
     }
 
+    Connections { target: vTreatmentAdjustmentSaline
+        function onAdjustmentTriggered              ( vValue ) {
+            if (vTreatmentAdjustmentSaline.adjustment_Accepted) {
+                _notification.text = ""
+            }
+            else {
+                _notification.text = vTreatmentAdjustmentSaline.text()
+            }
+        }
+    }
+
     onVisibleChanged: {
         if (visible) {
             _mainMenu.hidden = true
Index: sources/gui/qml/pages/treatment/TreatmentSectionHeader.qml
===================================================================
diff -u -rd4b731494a05087a763afff95b91c675bb417347 -rf46bc6ffce5eb0ac3e1bbd5a9b8ee9202209c881
--- sources/gui/qml/pages/treatment/TreatmentSectionHeader.qml	(.../TreatmentSectionHeader.qml)	(revision d4b731494a05087a763afff95b91c675bb417347)
+++ sources/gui/qml/pages/treatment/TreatmentSectionHeader.qml	(.../TreatmentSectionHeader.qml)	(revision f46bc6ffce5eb0ac3e1bbd5a9b8ee9202209c881)
@@ -24,11 +24,14 @@
     property bool editEnabled   : true
     property bool showLock      : false
     property bool showEdit      : true
+    property bool showExpanding : false
+
     property int titleLeftMargin: Variables.defaultMargin * 2
     property bool setEditActive : true // set to disable edit no matter what
 
-    signal editClicked
-    signal lockClicked
+    signal editClicked()
+    signal lockClicked()
+    signal expandingClicked()
 
     color       : Colors.treatmentSectionHeader
     height      : Variables.contentHeight + (Variables.defaultMargin * 2)
@@ -58,31 +61,35 @@
         color: Colors.textTextRectLabel
     }
 
-    IconButton { id  : _lockButton
+    Row { id: _buttonRow
+        spacing             : Variables.defaultMargin * 2
         anchors {
             verticalCenter  : _title.verticalCenter
-            right           : _editButton.left
-            rightMargin     : Variables.defaultMargin * 2
+            right           : parent.right
+            rightMargin     :  Variables.defaultMargin * 2
         }
-        iconSize            : 30
-        visible             : showLock
-        iconImageSource     : editEnabled ? "qrc:/images/iUnlock" : "qrc:/images/iLock"
-        onPressed           :  {
-            editEnabled = ! editEnabled
-            _root.lockClicked()
+
+        ArrowButton {id : _expandingArrows
+            iconSize        : Variables.iconButtonSize
+            visible         : showExpanding
+            expandingArrow  : true
+            onClicked       : _root.expandingClicked()
         }
-    }
 
-    IconButton { id  : _editButton
-        anchors {
-            verticalCenter  : _title.verticalCenter
-            right           : parent.right
-            rightMargin     :  Variables.defaultMargin
+        IconButton { id  : _lockButton
+            visible             : showLock
+            iconImageSource     : editEnabled ? "qrc:/images/iUnlock" : "qrc:/images/iLock"
+            onPressed           :  {
+                editEnabled = ! editEnabled
+                _root.lockClicked()
+            }
         }
-        iconSize        : 30
-        visible         : showEdit
-        enabled         : editEnabled && _root.setEditActive
-        iconImageSource : enabled ? "qrc:/images/iEdit" : "qrc:/images/iEditDisabled"
-        onPressed       : _root.editClicked()
+
+        IconButton { id  : _editButton
+            visible         : showEdit
+            enabled         : editEnabled && _root.setEditActive
+            iconImageSource : enabled ? "qrc:/images/iEdit" : "qrc:/images/iEditDisabled"
+            onPressed       : _root.editClicked()
+        }
     }
 }
Index: sources/view/VTreatmentCreate.h
===================================================================
diff -u -rd4b7643b0a19278ea948a75553ff777e4e436c22 -rf46bc6ffce5eb0ac3e1bbd5a9b8ee9202209c881
--- sources/view/VTreatmentCreate.h	(.../VTreatmentCreate.h)	(revision d4b7643b0a19278ea948a75553ff777e4e436c22)
+++ sources/view/VTreatmentCreate.h	(.../VTreatmentCreate.h)	(revision f46bc6ffce5eb0ac3e1bbd5a9b8ee9202209c881)
@@ -100,11 +100,18 @@
     VALUESET(float      , dialysateTemp                                 , 0)
     VALUESET(float      , heparinDispensingRate                         , 0)
     VALUESET(float      , heparinBolusVolume                            , 0)
+    VALUESET(float      , substitutionFluidVolume                       , 0)
 
     VALUESET(QString    , patientID                                     ,"")
     VALUESET(bool       , parametersValidated                           , 0)
     VALUESET(bool       , parametersConfirmed                           , 0)
 
+    VALUESET(qint32     , dryBicabCartridgeSize                         , 0)
+    VALUESET(qint32     , bicarbFinalDialysateComposition               , 0)
+    VALUESET(qint32     , sodiumFinalDialysateComposition               , 0)
+    VALUESET(qint32     , actualRORejectionPercentage                   , 0)
+
+
     PROPERTY(QString    , txCode                                        ,"")
 
     TRIGGER(quint32     , bloodFlowRateRejectReason                     , 0)