Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateStack.qml
===================================================================
diff -u -rf7e23265f6ac05c41c8411fac485f3a38640927a -r3b323bd6a1a03429c2321a889049de1c3b11302f
--- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateStack.qml	(.../PreTreatmentCreateStack.qml)	(revision f7e23265f6ac05c41c8411fac485f3a38640927a)
+++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateStack.qml	(.../PreTreatmentCreateStack.qml)	(revision 3b323bd6a1a03429c2321a889049de1c3b11302f)
@@ -1,15 +1,15 @@
 /*!
  *
- * Copyright (c) 2019-2020 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-Feb-2021
+ * \date    (last)      13-Mar-2024
  * \author  (original)  Behrouz NematiPour
- * \date    (original)  28-Feb-2021
+ * \date    (original)  12-Mar-2021
  *
  */
 
@@ -40,14 +40,26 @@
     }
 
     function  pagePatientID( vCondition ) {
-        if ( vCondition !== undefined && vCondition === false ) return
+        if ( vCondition !== undefined && vCondition === false ) {
+            _keyboard.setVisible(false)
+            return
+        }
 
-                           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()
@@ -57,12 +69,12 @@
         title.text              : qsTr("Patient ID")
         header.backVisible      : true
         header.confirmVisible   : true
-        header.confirmEnabled   : _pretreatmentPatientIDEntry.text
+        header.confirmText.text : _pretreatmentPatientIDEntry.text ? qsTr("CONTINUE") : qsTr("SKIP")
         TextEntry               { id  :     _pretreatmentPatientIDEntry
             property int topMarginContent   : 200
 
             clip                : true
-            hasCarret           : true
+            hasCursor           : true
             textInput   .width  : 450
             text                : vTreatmentCreate.patientID
             anchors {
@@ -72,6 +84,9 @@
             }
             textInput.inputMethodHints  : Qt.ImhPreferLowercase
             textInput.echoMode          : TextInput.Normal
+            textInput.validator         : RegExpValidator {
+                regExp: Variables.regExp_PatientID
+            }
         }
     }
 
@@ -89,28 +104,37 @@
     }
 
     Connections { target: vHDOperationMode
-        onValidateParametersChanged : { pagePatientID                  ( vvalidateParameters )}
+        function onValidateParametersChanged    ( vValue ) { pagePatientID                         ( vValue     )}
     }
 
     Connections { target:  _pretreatmentPatientID
-        onBackClicked               : { vPreTreatmentAdjustmentInitTreatment.doCancel       ()}
-        onConfirmClicked            : { setPatientID                             ( patientID )
-                                        page( _pretreatmentCreate                            )}
+        function onBackClicked                  (        ) { vPreTreatmentAdjustmentInitTreatment.doCancel     ()}
+        function onConfirmClicked               (        ) { setPatientID                     ( _root.patientID )
+                                                           page( _pretreatmentCreate                            )}
     }
 
     Connections { target:  _pretreatmentCreate
-        onBackClicked               : { pagePatientID                                       ()}
-        onConfirmClicked            : { vTreatmentCreate.doValidation                       ()}
+        function onBackClicked                  (        ) { pagePatientID                                     ()}
+        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
-        onFwValidationSuccess       : { page( _pretreatmentConfirm                          )}
+        function onDidValidationPass            ( vValue ) { page( _pretreatmentConfirm                         )
+            vPostTreatmentAdjustmentTreatmentLog.heparinDispensingRateOff = vTreatmentCreate.heparinDispensingRateOff
+            vPostTreatmentAdjustmentTreatmentLog.heparinBolusVolumeOff    = vTreatmentCreate.heparinBolusVolumeOff
+        }
     }
 
     Connections { target: _pretreatmentConfirm
-        onBackClicked               : { vTreatmentCreate.doCancel                           ()
-                                        page( _pretreatmentCreate                            )}
-        onConfirmClicked            : { vTreatmentCreate.doConfirm                          ()}
+        function onBackClicked                  (        ) { vTreatmentCreate.doCancel                         ()
+                                                             page( _pretreatmentCreate                          )}
+        function onConfirmClicked               (        ) { vTreatmentCreate.doConfirm                        ()}
     }
 
     onVisibleChanged: {