Index: sources/gui/qml/pages/treatment/sections/TreatmentTime.qml
===================================================================
diff -u -r7b71ec23c53c04a24e3db8ace0ca4825ec57d721 -r1286d74bd015276aab604808be2766136091c125
--- sources/gui/qml/pages/treatment/sections/TreatmentTime.qml	(.../TreatmentTime.qml)	(revision 7b71ec23c53c04a24e3db8ace0ca4825ec57d721)
+++ sources/gui/qml/pages/treatment/sections/TreatmentTime.qml	(.../TreatmentTime.qml)	(revision 1286d74bd015276aab604808be2766136091c125)
@@ -35,24 +35,27 @@
     property bool isRunning     : vTDTreatmentStates.txDialysis &&
                                !( vTDTreatmentStates.sbWaitPump || vTDTreatmentStates.sbRunning )
 
+    property bool isPaused      : vTDTreatmentStates.txStop || ! _root.isRunning
+
+
     property bool isComplete    : ( vTreatmentTime.time_Remaining <= 0 && vTreatmentTime.time_Elapsed > 0 ) ||  vTDTreatmentStates.txEnd
 
     property bool isHDTreatment : vTreatmentCreate.treatmentModality === 0
     property bool isHDFTreatment: vTreatmentCreate.treatmentModality === 1
     property bool isIsoTreatment: vTreatmentCreate.treatmentModality === 2
 
-    property string notificationText:   isComplete      ? qsTr("Treatment Complete")    :
-                                        ! isRunning     ? qsTr("Treatment Paused")      :
-                                        isHDTreatment   ? qsTr("HD Time")               :
-                                        isHDFTreatment  ? qsTr("HDF Time")              :
-                                        isIsoTreatment  ? qsTr("Isolated UF Time")      :
-                                                          ""
+    property string notificationText:   isComplete              ? qsTr("Treatment Complete")    :
+                                        isPaused                ? qsTr("Treatment Paused")      :
+                                        isHDTreatment           ? qsTr("HD Time")               :
+                                        isHDFTreatment          ? qsTr("HDF Time")              :
+                                        isIsoTreatment          ? qsTr("Isolated UF Time")      :
+                                                                ""
 
-    property color notificationColor:   isComplete          ? Colors.statusComplete     :
-                                        ! isRunning         ? Colors.statusTextPaused   :
+    property color notificationColor:   isComplete              ? Colors.statusComplete     :
+                                        isPaused                ? Colors.statusTextPaused   :
                                         isHDTreatment   ||
                                         isHDFTreatment  ||
-                                        isIsoTreatment      ? Colors.statusTextActive   :
+                                        isIsoTreatment          ? Colors.statusTextActive   :
                                                               ""
 
     property bool editEnabled   : ! isTreatmentEnd      // LEAHI-PRS-376
@@ -61,6 +64,8 @@
     width   : _circle.width
     height  : _circle.height
 
+    onIsCompleteChanged: _rinsebackCompleteDialog.isTxCompleted = _root.isComplete
+
     signal clicked()
 
     ProgressCircle { id: _circle
@@ -73,7 +78,7 @@
         thickness           : 35
         circleShadowColor   : Colors.mainTreatmentLighterBlue
         circleFillColor     : Colors.transparent
-        runAnimation        : ! _root.isRunning
+        runAnimation        : _root.isPaused && ! _root.isComplete
 
         MouseArea { id: _mouseArea
             anchors.fill    : parent
@@ -92,7 +97,7 @@
         textWeight              : Font.Normal
         secsPixelSize           : 35
         secondsLeftMargin       : 10
-        textColor               : _root.isRunning || _root.isComplete ? Colors.offWhite : Colors.mainTreatmentOrange
+        textColor               : _root.isPaused && ! _root.isComplete ? Colors.mainTreatmentOrange : Colors.offWhite
     }
 
     Item { id: _timeTitleRect
@@ -148,7 +153,7 @@
         imageDiameter           : 25
         imageTopMargin          : 4
         imageSource             : "qrc:/images/iPauseOrange"
-        imageVisible            : ! _root.isRunning && ! _root.isComplete
+        imageVisible            :  _root.isPaused && ! _root.isComplete
         text                    : _root.notificationText
         textColor               : _root.notificationColor
         textfontSize            : 26