Index: sources/gui/qml/pages/pretreatment/PreTreatmentWaterSampleStack.qml
===================================================================
diff -u -r8a5dbf556a66524fbe4b60ac1573182a0bd27617 -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9
--- sources/gui/qml/pages/pretreatment/PreTreatmentWaterSampleStack.qml	(.../PreTreatmentWaterSampleStack.qml)	(revision 8a5dbf556a66524fbe4b60ac1573182a0bd27617)
+++ sources/gui/qml/pages/pretreatment/PreTreatmentWaterSampleStack.qml	(.../PreTreatmentWaterSampleStack.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    PreTreatmentSampleStack.qml
- * \author  (last)      Behrouz NematiPour
- * \date    (last)      09-Mar-2021
+ * \file    PreTreatmentWaterSampleStack.qml
+ * \author  (last)      Vy
+ * \date    (last)      17-May-2023
  * \author  (original)  Behrouz NematiPour
- * \date    (original)  09-Mar-2021
+ * \date    (original)  18-Mar-2021
  *
  */
 
@@ -40,15 +40,15 @@
 
     // ----- Screens definitions
     PreTreatmentBase { id: _preTreatmentFilterFlush
-        title.text              : qsTr("Filter Flush")
+        title.text              : qsTr("Flushing Carbon Filters for Water Sample")
         hasTimeCircle           : true
         timeCircleMinimum       : 0
         timeCircleMaximum       : vDGFilterFlush.total
         timeCircleProgressValue : vDGFilterFlush.elapsed
         timeCircleTimeTextValue : vDGFilterFlush.remaining * 60
     }
 
-    PreTreatmentBase     { id: _preTreatmentWaterSample
+    PreTreatmentBase { id: _preTreatmentWaterSample
         header.confirmVisible   : true
         header.confirmText.text : qsTr("NEXT")
         title.text              : qsTr("Water Sample")
@@ -62,7 +62,7 @@
         ]
     }
 
-    PreTreatmentBase    { id: _preTreatmentWaterSampleResult
+    PreTreatmentBase { id: _preTreatmentWaterSampleResult
         header.backVisible      : true
         title.text              : qsTr("Water Sample Result")
         instructionBased        :  true
@@ -74,13 +74,12 @@
             },
             TouchRect {
                 text.text: qsTr("PASS")
-                isDefault: true
                 onClicked: _root.passClicked()
             }
         ]
     }
 
-    PreTreatmentBase    { id: _preTreatmentWaterSampleResultFail
+    PreTreatmentBase { id: _preTreatmentWaterSampleResultFail
         title.text              : qsTr("Water Sample Result Failed")
         instructionBased        :  true
         footer.children: [
@@ -93,17 +92,17 @@
 
     // ----- Screens Navigations
     Connections { target: vPreTreatmentStates
-        onWaterSample_setupChanged  : { page( _preTreatmentFilterFlush      , vwaterSample_setup    )}
-        onWaterSample_runningChanged: { page( _preTreatmentWaterSample      , vwaterSample_running  )}
+        function onWaterSample_setupChanged     ( vValue ) { page( _preTreatmentFilterFlush      , vValue   )}
+        function onWaterSample_runningChanged   ( vValue ) { page( _preTreatmentWaterSample      , vValue   )}
     }
 
     // ----- Screen Actions/Navigations
     Connections { target: _preTreatmentWaterSample
-        onConfirmClicked            : { page( _preTreatmentWaterSampleResult                        )}
+        function onConfirmClicked               ( vValue ) { page( _preTreatmentWaterSampleResult           )}
     }
 
     Connections { target: _preTreatmentWaterSampleResult
-        onBackClicked               : { page( _preTreatmentWaterSample                              )}
+        function onBackClicked                  ( vValue ) { page( _preTreatmentWaterSample                 )}
     }
 
     onSamplePressed                 : { vPreTreatmentAdjustmentWaterSample.doSample( true           )}
@@ -113,7 +112,7 @@
     onOkClicked                     : { vPreTreatmentAdjustmentWaterSample.doResult( false          )}
 
     Connections { target: vPreTreatmentAdjustmentWaterSample
-        onAdjustmentTriggered   : {
+        function onAdjustmentTriggered          ( vValue ) {
             if ( vPreTreatmentAdjustmentWaterSample.adjustment_Accepted ) {
                 _preTreatmentWaterSample.reasonText = ""
             } else {