Index: sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml
===================================================================
diff -u -rac23b968f565c2beeb153ca2d554b8f868634512 -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9
--- sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml	(.../PreTreatmentStack.qml)	(revision ac23b968f565c2beeb153ca2d554b8f868634512)
+++ sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml	(.../PreTreatmentStack.qml)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
@@ -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    PreTreatmentStack.qml
  * \author  (last)      Behrouz NematiPour
- * \date    (last)      28-Feb-2021
+ * \date    (last)      02-Feb-2023
  * \author  (original)  Behrouz NematiPour
- * \date    (original)  28-Feb-2021
+ * \date    (original)  21-Jun-2021
  *
  */
 
@@ -32,22 +32,21 @@
 
     property int stackStepIndex : 0
 
-    PreTreatmentWaterSampleStack{ id: _preTreatmentWaterSampleStack     }
-    PreTreatmentConsumablesStack{ id: _preTreatmentConsumablesStack     }
-    PreTreatmentDisposablesStack{ id: _preTreatmentDisposablesStack     }
-    PreTreatmentPrimeStack      { id: _pretreatmentPrimeStack           }
-    PreTreatmentConnectionStack { id: _pretreatmentConnectionStack      }
+    PreTreatmentWaterSampleStack{ id: _preTreatmentWaterSampleStack     ;objectName: "_preTreatmentWaterSampleStack" }
+    PreTreatmentConsumablesStack{ id: _preTreatmentConsumablesStack     ;objectName: "_preTreatmentConsumablesStack" }
+    PreTreatmentDisposablesStack{ id: _preTreatmentDisposablesStack     ;objectName: "_preTreatmentDisposablesStack" }
+    PreTreatmentPrimeStack      { id: _pretreatmentPrimeStack           ;objectName: "_pretreatmentPrimeStack"       }
+    PreTreatmentConnectionStack { id: _pretreatmentConnectionStack      ;objectName: "_pretreatmentConnectionStack " }
 
     Connections { target: vPreTreatmentStates
-        onStartChanged              : {}
-        onWaterSampleChanged        : { page( _preTreatmentWaterSampleStack , vwaterSample          )}
-        onSelfTestConsumablesChanged: { page( _preTreatmentConsumablesStack , vselfTestConsumables  )}
-        onSelfTestNoCartridgeChanged: { page( _preTreatmentDisposablesStack , vselfTestNoCartridge  )}
-        onInstallationChanged       : { console.debug("vinstallation       ", vinstallation         )}
-        onSelfTestDryChanged        : { page( _pretreatmentPrimeStack       , vselfTestDry          )}
-        onPrimeChanged              : { console.debug("vprime              ", vprime                )}
-        onRecirculateChanged        : { console.debug("vrecirculate        ", vrecirculate          )}
-        onPatientConnectionChanged  : { page( _pretreatmentConnectionStack  , vpatientConnection    )}
+        function onWaterSampleChanged           ( vValue ) { page( _preTreatmentWaterSampleStack , vValue )}
+        function onSelfTestConsumablesChanged   ( vValue ) { page( _preTreatmentConsumablesStack , vValue )}
+        function onSelfTestNoCartridgeChanged   ( vValue ) { page( _preTreatmentDisposablesStack , vValue )}
+        function onInstallationChanged          ( vValue ) { page( _preTreatmentDisposablesStack , vValue )} // DEBUG: Experimental : console.debug("vinstallation       "
+        function onSelfTestDryChanged           ( vValue ) { page( _pretreatmentPrimeStack       , vValue )}
+        function onPrimeChanged                 ( vValue ) { page( _pretreatmentPrimeStack       , vValue )} // DEBUG: Experimental : console.debug("vprime              "
+        function onRecirculateChanged           ( vValue ) { page( _pretreatmentPrimeStack       , vValue )} // DEBUG: Experimental : console.debug("vrecirculate        "
+        function onPatientConnectionChanged     ( vValue ) { page( _pretreatmentConnectionStack  , vValue )}
     }
 
     onVisibleChanged: {