Index: sources/gui/qml/pages/treatment/sections/TreatmentTime.qml
===================================================================
diff -u -rd27d1a0cd3a0dd7ac8a7dd5cf1a66ca0e038e8dd -r7b71ec23c53c04a24e3db8ace0ca4825ec57d721
--- sources/gui/qml/pages/treatment/sections/TreatmentTime.qml	(.../TreatmentTime.qml)	(revision d27d1a0cd3a0dd7ac8a7dd5cf1a66ca0e038e8dd)
+++ sources/gui/qml/pages/treatment/sections/TreatmentTime.qml	(.../TreatmentTime.qml)	(revision 7b71ec23c53c04a24e3db8ace0ca4825ec57d721)
@@ -35,12 +35,28 @@
     property bool isRunning     : vTDTreatmentStates.txDialysis &&
                                !( vTDTreatmentStates.sbWaitPump || vTDTreatmentStates.sbRunning )
 
-    property bool isComplete    : vTreatmentTime.time_Remaining <= 0 && vTreatmentTime.time_Elapsed > 0
+    property bool isComplete    : ( vTreatmentTime.time_Remaining <= 0 && vTreatmentTime.time_Elapsed > 0 ) ||  vTDTreatmentStates.txEnd
 
-    property string notificationText:   ! isRunning ? qsTr("Treatment Paused")  :
-                                        isComplete  ? qsTr("Treatment Complete"):
-                                                      ""
+    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 color notificationColor:   isComplete          ? Colors.statusComplete     :
+                                        ! isRunning         ? Colors.statusTextPaused   :
+                                        isHDTreatment   ||
+                                        isHDFTreatment  ||
+                                        isIsoTreatment      ? Colors.statusTextActive   :
+                                                              ""
+
+    property bool editEnabled   : ! isTreatmentEnd      // LEAHI-PRS-376
+
     color   : "transparent"
     width   : _circle.width
     height  : _circle.height
@@ -56,12 +72,12 @@
         value               : _root.progressValue
         thickness           : 35
         circleShadowColor   : Colors.mainTreatmentLighterBlue
-        circleFillColor     : Colors.mainTreatmentDarkerBlue
+        circleFillColor     : Colors.transparent
         runAnimation        : ! _root.isRunning
 
         MouseArea { id: _mouseArea
             anchors.fill    : parent
-            onClicked       : _root.clicked()
+            onClicked       : if ( _root.editEnabled ) { _root.clicked() }
         }
     }
 
@@ -76,6 +92,7 @@
         textWeight              : Font.Normal
         secsPixelSize           : 35
         secondsLeftMargin       : 10
+        textColor               : _root.isRunning || _root.isComplete ? Colors.offWhite : Colors.mainTreatmentOrange
     }
 
     Item { id: _timeTitleRect
@@ -109,8 +126,9 @@
                 bottomMargin:  Variables.defaultMargin
                 horizontalCenter: parent.horizontalCenter
             }
+            enabled             : _root.editEnabled
             iconSize            : 30
-            iconImageSource     : "qrc:/images/iEdit"
+            iconImageSource     : enabled ? "qrc:/images/iEdit" : "qrc:/images/iEditDisabled"
             onClicked           : _root.clicked()
         }
     }
@@ -125,15 +143,14 @@
             topMargin   : Variables.defaultMargin * 2
         }
 
-        visible                 : ! _root.isRunning || _root.isComplete
         height                  : 25
         color                   : "transparent"
         imageDiameter           : 25
         imageTopMargin          : 4
         imageSource             : "qrc:/images/iPauseOrange"
-        imageVisible            : ! _root.isComplete
+        imageVisible            : ! _root.isRunning && ! _root.isComplete
         text                    : _root.notificationText
-        textColor               : _root.isComplete ? Colors.mainTreatmentGreen : Colors.mainTreatmentOrange
+        textColor               : _root.notificationColor
         textfontSize            : 26
         textfontWeight          : Font.Medium
     }