Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml
===================================================================
diff -u -r80b727733768477975addc967b3d6b04ed39e598 -rc1e50347c78096b626b2cd1ef32a33b439e88bdd
--- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml	(.../TreatmentAdjustmentVitals.qml)	(revision 80b727733768477975addc967b3d6b04ed39e598)
+++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml	(.../TreatmentAdjustmentVitals.qml)	(revision c1e50347c78096b626b2cd1ef32a33b439e88bdd)
@@ -25,8 +25,8 @@
     contentItem.objectName: "TreatmentAdjustmentVitals"
     titleText           : qsTr("Vitals")
     titlePixelSize      : Fonts.fontPixelSection
-    height              : Variables.numPadHeight
-    width               : 1000
+    height              : Variables.smallDialogHeight
+    width               : Variables.smallDialogWidth
     x                   : numPad.isOpened ? Math.round((Variables.applicationWidth - width) / 2) - 200 :
                                             Math.round((Variables.applicationWidth - width) / 2)
     notification.textfontSize   : 20
@@ -57,26 +57,30 @@
         _bphrEntry.heartRate  = vHeartRate  ? vHeartRate : ""
     }
 
-    function confirm() {
+    function confirm(isManual) {
         numPad.hide()
         _root.close()
         vTreatmentVitals.doConfirm(
                     _bphrEntry.systolic   ,
                     _bphrEntry.diastolic  ,
                     _bphrEntry.heartRate
-                    )
+                )
+
+        if (isManual) {
+            vTreatmentTrends.onManualVitals(
+                _bphrEntry.systolic ,
+                _bphrEntry.diastolic,
+                _bphrEntry.heartRate
+            )
+        }
+
         _headerBar.vitalsRecorded()
     }
 
     onOpened: {
         notificationText = notificationTextString
-        vTreatmentVitals.doTimerStop()
     }
 
-    onClosed: {
-        vTreatmentVitals.doTimerStart()
-    }
-
     onCloseClicked: {
         numPad.hide()
         numPad.visible = false
@@ -111,7 +115,7 @@
                 margins         : 0
 
             }
-            onClicked   : _root.confirm()
+            onClicked   : _root.confirm(true)
         }
 
         Item { id: _separator
@@ -154,6 +158,7 @@
             height                  : Variables.defaultButtonHeight
             isDefault               : true
             anchors.horizontalCenter: parent.horizontalCenter
+            enabled                 : vSettings.integratedBPCuff
 
             text    {
                 text            : qsTr("Measure Vitals")
@@ -170,15 +175,14 @@
     Connections { target: vTreatmentVitals
         // On Timeout - Vitals Request
         function onDidTimeout () {
+            // interval set to OFF but 15 min default timer still running
             if ( ! vTreatmentVitals.interval ) {
-                // TODO: interval set to OFF but 15 min default timer still running
                 return
             }
 
-            // On Timeout request vitas if BP cuff is enabled or shjow popup for manual entry
+            // On Timeout request vitals if BP cuff is enabled or show popup for manual entry
             if ( vTreatmentVitals.enableBPCuff ) {
                 vTreatmentAdjustmentVitals.doRequest()
-                vTreatmentVitals.doTimerStart()
             }
             else {
                 _root.open ()
@@ -191,7 +195,7 @@
         // Vitals Reading Ready
         function onAdjustmentTriggered  ( vValue ) {
             _root.update  ( vTreatmentVitals.systolic__rt, vTreatmentVitals.diastolic_rt, vTreatmentVitals.heartRate_rt )
-            _root.confirm()
+            _root.confirm(false)
         }
     }