Index: sources/gui/qml/dialogs/EndTreatmentDialog.qml
===================================================================
diff -u -r7b71ec23c53c04a24e3db8ace0ca4825ec57d721 -r99e596082b87afd73b06dae039d51e4a67cc5913
--- sources/gui/qml/dialogs/EndTreatmentDialog.qml	(.../EndTreatmentDialog.qml)	(revision 7b71ec23c53c04a24e3db8ace0ca4825ec57d721)
+++ sources/gui/qml/dialogs/EndTreatmentDialog.qml	(.../EndTreatmentDialog.qml)	(revision 99e596082b87afd73b06dae039d51e4a67cc5913)
@@ -4,15 +4,18 @@
 
 ConfirmDialog { id: _root
     messageText     : qsTr("Dialysis Treatment Complete!")
-    confirmText     : qsTr("End Treatment")
-    cancelText      : qsTr("Stay On Treatment")
+    confirmText     : qsTr("Setup Blood Return")
+    cancelText      : qsTr("Remain on Treatment")
 
     width           : Variables.completeDialogWidth
     height          : Variables.completeDialogHeight
     backgroundColor : Colors.darkDialogColor
     messageTextVerticalOffset   : Variables.defaultMargin * -1
-    footerBottomMargin          : Variables.defaultMargin * 3
+    autoClose       : false
 
+    onAccepted      : vTreatmentAdjustmentEnd.doAdjustment ()
+    onRejected      : close()
+
     Image { id  : _iconImage
         objectName:    "iconImage"
 
@@ -39,9 +42,13 @@
 
     Connections            { target : vTreatmentAdjustmentEnd
         function onAdjustmentTriggered          ( vValue ) {
-            if ( ! vTreatmentAdjustmentEnd.adjustment_Accepted ) {
-                // TODO Update to show rejection message here vTreatmentAdjustmentEnd.text()
+            if ( vTreatmentAdjustmentEnd.adjustment_Accepted ) {
+                close()
+                notificationText = ""
             }
+            else {
+                notificationText = vTreatmentAdjustmentEnd.text()
+            }
         }
     }
 }