Index: sources/gui/qml/pages/posttreatment/PostTreatmentStack.qml
===================================================================
diff -u -ra26580f1abb9900e91590bf19c78439c24ad6ffc -rab7cddfe742a1c00e265a37effe043f2c3db8bec
--- sources/gui/qml/pages/posttreatment/PostTreatmentStack.qml	(.../PostTreatmentStack.qml)	(revision a26580f1abb9900e91590bf19c78439c24ad6ffc)
+++ sources/gui/qml/pages/posttreatment/PostTreatmentStack.qml	(.../PostTreatmentStack.qml)	(revision ab7cddfe742a1c00e265a37effe043f2c3db8bec)
@@ -48,20 +48,6 @@
     readonly property bool isDisconnect     : _root.stackStepIndex === PostTreatmentStack.StackStep.Disconnect
     readonly property bool isReview         : _root.stackStepIndex === PostTreatmentStack.StackStep.Review
 
-
-//    signal patientDisconnectionConfirm  ()
-//    signal treatmentReviewConfirm       ()
-//    signal disposablesRemovalConfirm    ()
-//    signal disposablesRemovalBack       ()
-
-    // TODO fix in post treatment
-//    onPatientDisconnectionConfirm  : {      vPostTreatmentAdjustmentDisposablesRemovalConfirm      .doConfirm( ) }
-//    /* No wait for Rsp, so navigates => */  page(  _postTreatmentReview                                      )
-//    /* After navigation ask for Tx data */  vPostTreatmentAdjustmentTreatmentLog                   .doRequest( )}
-//    onTreatmentReviewConfirm       : {      vPostTreatmentAdjustmentPatientDisconnectionConfirm    .doConfirm( )}
-//    onDisposablesRemovalConfirm    :        vPostTreatmentAdjustmentDisposablesRemovalConfirm      .doConfirm( )
-//    onDisposablesRemovalBack       :        page(  _postTreatmentReview                                      )
-
     onVisibleChanged: {
         if (visible) {
             _mainMenu.hidden = true
@@ -82,7 +68,7 @@
             vPostTreatmentAdjustmentDisposablesRemovalConfirm.doConfirm()
             break
         case PostTreatmentStack.Review:
-            vPostTreatmentAdjustmentPatientDisconnectionConfirm.doConfirm()
+            page(  _postTreatmentDisinfection )
             break
         case PostTreatmentStack.Disinfection:
              // Skip button - go back to standby -- Finish Treatment
@@ -132,7 +118,6 @@
         default:
             return true
         }
-
     }
 
     StepNavigationTitleBar { id: _titleBar
@@ -207,7 +192,6 @@
 
     PostTreatmentBase { id:  _postTreatmentDisinfection
         objectName          :" _postTreatmentDisinfection"
-        instructionBased    : true
         onVisibleChanged    :  if (visible) { stackStepIndex = PostTreatmentStack.Disinfection }
     }
 
@@ -223,12 +207,24 @@
         function onPostTreatmentChanged         ( vValue ) { page( _postTreatmentDisconnectStack  , vValue   )}
     }
 
-
-    // Disconnect
+    // Disconnect stack
     Connections { target: _postTreatmentDisconnectStack
         function onGoToNextStep ()      { page ( _postTreatmentRemove       )}
     }
 
+    // Confirm Patient Disconnection
+    Connections { target: vPostTreatmentAdjustmentPatientDisconnectionConfirm
+        function onAdjustmentTriggered          ( vValue ) {
+            if ( vPostTreatmentAdjustmentPatientDisconnectionConfirm.adjustment_Accepted ) {
+                _postTreatmentReview.reasonText = ""
+                _postTreatmentDisconnectStack.goToDrain()
+
+            } else {
+                _postTreatmentReview.reasonText = vPostTreatmentAdjustmentPatientDisconnectionConfirm.text()
+            }
+        }
+    }
+
     // Auto - Eject
     Connections { target: vPostTreatmentAdjustmentDisposablesRemovalConfirm
         function onAdjustmentTriggered          ( vValue ) {
@@ -245,25 +241,10 @@
     Connections { target: vPostTreatmentAdjustmentTreatmentLog
         function onAdjustmentTriggered          ( vValue ) {
             if ( vPostTreatmentAdjustmentTreatmentLog.adjustment_Accepted ) {
-                 _postTreatmentReview.reasonText = ""
+                _postTreatmentReview.reasonText = ""
             } else {
-                 _postTreatmentReview.reasonText = vPostTreatmentAdjustmentTreatmentLog.text()
+                _postTreatmentReview.reasonText = vPostTreatmentAdjustmentTreatmentLog.text()
             }
         }
     }
-
-    // keep?
-    Connections { target: vPostTreatmentAdjustmentPatientDisconnectionConfirm
-        function onAdjustmentTriggered          ( vValue ) {
-            if ( vPostTreatmentAdjustmentPatientDisconnectionConfirm.adjustment_Accepted ) {
-                 _postTreatmentReview.reasonText = ""
-                page(  _postTreatmentDisinfection )
-
-            } else {
-                 _postTreatmentReview.reasonText = vPostTreatmentAdjustmentPatientDisconnectionConfirm.text()
-            }
-        }
-    }
-
-
 }