Index: sources/gui/qml/pages/treatment/sections/TreatmentHeparin.qml
===================================================================
diff -u -r07e0c7bd409782cab96a4ae761ee3f819bdb8639 -r583d1953c783940c93f22c37b23daadb1ff3a09c
--- sources/gui/qml/pages/treatment/sections/TreatmentHeparin.qml	(.../TreatmentHeparin.qml)	(revision 07e0c7bd409782cab96a4ae761ee3f819bdb8639)
+++ sources/gui/qml/pages/treatment/sections/TreatmentHeparin.qml	(.../TreatmentHeparin.qml)	(revision 583d1953c783940c93f22c37b23daadb1ff3a09c)
@@ -28,6 +28,7 @@
  */
 TreatmentFluid { id: _root
     readonly property bool isOff            : vHDTreatmentStates.hpOff
+    readonly property bool isStopped        : vHDTreatmentStates.hpStopped
     readonly property bool isPaused         : vHDTreatmentStates.hpPaused
     readonly property bool isBolus          : vHDTreatmentStates.hpInitial_bolus
     readonly property bool isDispensing     : vHDTreatmentStates.hpDispensing
@@ -41,40 +42,47 @@
         readonly property string textPause          : qsTr("PAUSE DELIVERY")
         readonly property string textResume         : qsTr("RESUME DELIVERY")
         readonly property string textVolumeTarget   : "(" + valueTarget + unit + ")"
-        readonly property string mesgBolus          : qsTr("Heparin bolus is active")
-        readonly property string mesgCompleted      : qsTr("Maximum cumulative heparin volume delivered")
-        readonly property string mesgEmpty          : qsTr("Heparin syringe empty")
-        readonly property string mesgOff            : qsTr("Heparin delivery Off")
+        readonly property string mesgBolus          : qsTr("Heparin Bolus Active")
+        readonly property string mesgCompleted      : qsTr("Maximum Cumulative Heparin Volume Delivered")
+        readonly property string mesgEmpty          : qsTr("Heparin Syringe Empty")
+        readonly property string mesgOff            : qsTr("Heparin Delivery Off")
+        readonly property string mesgStopped        : qsTr("Heparin Delivery Stopped")
         readonly property string mesgRejectReason   : vTreatmentAdjustmentHeparin.adjustment_ReasonText
     }
 
     title   : qsTr("HEPARIN")
-    cumulativeVisible: false
+    cumulativeVisible   : false
+    targetVisible       : false
+    progressBarVisible  : false
 
-    hasArrow    : false
-    targetVisible: false
-    progressBarVisible: false
+    hasArrow        : false
+    isTouchable     : false
+    buttonEnabled   :  ! (isOff || isStopped || isBolus || isEmpty
+                                || isCompleted                          // decided to not to enable user to resume the heparin while completed (1/Apr/2021 - I,Sean,Nick)
+                         )      && ! isSBInProgress && isTxRunning
+    buttonText      : ! isTxRunning   ? _private.textHeparin  :
+                        isDispensing  ? _private.textPause    :
+                        isPaused      ? _private.textResume   :
+                        isCompleted   ? _private.textHeparin  :             // decided to not to enable user to resume the heparin while completed (1/Apr/2021 - I,Sean,Nick)
+                     // isCompleted   ? _private.textResume   :
+                                        _private.textHeparin
+    unit            : Variables.unitTextSaline
 
-    isTouchable : ! (isOff || isBolus || isEmpty) && ! isSBInProgress && isTxRunning
-    buttonText  : ! isTxRunning   ? _private.textHeparin  :
-                    isDispensing  ? _private.textPause    :
-                    isPaused      ? _private.textResume   :
-                    isCompleted   ? _private.textResume   :
-                                    _private.textHeparin
-    unit        : Variables.unitTextSaline
-
     valueDelivered: vTreatmentHeparin.cumulative.toFixed(1) // this is the cumulative volume of the Heparin bolus and despensing.
 
     VTreatmentHeparin  { id: vTreatmentHeparin }
 
     onClicked: {
-        vTreatmentAdjustmentHeparin.doAdjustment()
+        // if ( isCompleted  ) vTreatmentAdjustmentHeparin.doResume()   // decided to not to enable user to resume the heparin while completed (1/Apr/2021 - I,Sean,Nick)
+        if ( isPaused     ) vTreatmentAdjustmentHeparin.doResume()
+        if ( isDispensing ) vTreatmentAdjustmentHeparin.doPause ()
     }
 
     notification {
         visible : true
         text    : isBolus       ? _private.mesgBolus        :
                   isOff         ? _private.mesgOff          :
+                  isStopped     ? _private.mesgStopped      :
                   isCompleted   ? _private.mesgCompleted    :
                   isEmpty       ? _private.mesgEmpty        :
                                   _private.mesgRejectReason