Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateStack.qml
===================================================================
diff -u -rf68b226e67eb500758ee94fe015df48931240013 -r3b323bd6a1a03429c2321a889049de1c3b11302f
--- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateStack.qml	(.../PreTreatmentCreateStack.qml)	(revision f68b226e67eb500758ee94fe015df48931240013)
+++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateStack.qml	(.../PreTreatmentCreateStack.qml)	(revision 3b323bd6a1a03429c2321a889049de1c3b11302f)
@@ -1,13 +1,13 @@
 /*!
  *
- * Copyright (c) 2021-2022 Diality Inc. - All Rights Reserved.
+ * Copyright (c) 2021-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    PreTreatmentCreateStack.qml
  * \author  (last)      Behrouz NematiPour
- * \date    (last)      28-Sep-2022
+ * \date    (last)      13-Mar-2024
  * \author  (original)  Behrouz NematiPour
  * \date    (original)  12-Mar-2021
  *
@@ -45,12 +45,21 @@
             return
         }
 
-        _root.patientID = ""
+              _pretreatmentPatientID.clear   ()
         page( _pretreatmentPatientID )
               _pretreatmentPatientID.setFocus()
     }
 
+    function clear(vValue) {
+        if ( ! vValue ) return // delete only if asked to. // is used on state enter, and not done on exiting.
+        _pretreatmentPatientID.clear()
+        _pretreatmentCreate.clear()
+    }
+
     PreTreatmentBase            { id:       _pretreatmentPatientID
+        function clear() {
+            vTreatmentCreate.patientID = ""
+        }
 
         function setFocus() {
             _pretreatmentPatientIDEntry.textInput.forceActiveFocus()
@@ -65,7 +74,7 @@
             property int topMarginContent   : 200
 
             clip                : true
-            hasCarret           : true
+            hasCursor           : true
             textInput   .width  : 450
             text                : vTreatmentCreate.patientID
             anchors {
@@ -106,11 +115,20 @@
 
     Connections { target:  _pretreatmentCreate
         function onBackClicked                  (        ) { pagePatientID                                     ()}
-        function onConfirmClicked               (        ) { vTreatmentCreate.doValidation                     ()}
+        function onConfirmClicked               (        ) {
+            vTreatmentCreate.arterialPressureLimitWindow = vTreatmentRanges.arterialPressureLimitWindowDef  // these parameters don't have a user option on create treatment, so sending the default.
+            vTreatmentCreate.venousPressureLimitWindow   = vTreatmentRanges.venousPressureLimitWindowDef    // these parameters don't have a user option on create treatment, so sending the default.
+            vTreatmentCreate.venousPressureLimitAsymtrc  = vTreatmentRanges.venousPressureLimitAsymtrcDef   // these parameters don't have a user option on create treatment, so sending the default.
+            vTreatmentCreate.rinsebackFlowRate           = vTreatmentRanges.rinsebackFlowRateDef            // these parameters don't have a user option on create treatment, so sending the default.
+            vTreatmentCreate.doValidation       (        )
+        }
     }
 
     Connections { target: vTreatmentCreate
-        function onFwValidationSuccess          ( vValue ) { page( _pretreatmentConfirm                         )}
+        function onDidValidationPass            ( vValue ) { page( _pretreatmentConfirm                         )
+            vPostTreatmentAdjustmentTreatmentLog.heparinDispensingRateOff = vTreatmentCreate.heparinDispensingRateOff
+            vPostTreatmentAdjustmentTreatmentLog.heparinBolusVolumeOff    = vTreatmentCreate.heparinBolusVolumeOff
+        }
     }
 
     Connections { target: _pretreatmentConfirm