Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml
===================================================================
diff -u -r0be698733fd4570240a91703978fee7d53a76121 -rb12853c86ef9e517667516dc3e47bca07349cedf
--- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml	(.../TreatmentAdjustmentVitals.qml)	(revision 0be698733fd4570240a91703978fee7d53a76121)
+++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml	(.../TreatmentAdjustmentVitals.qml)	(revision b12853c86ef9e517667516dc3e47bca07349cedf)
@@ -31,7 +31,7 @@
                                             Math.round((Variables.applicationWidth - width) / 2)
     notification.textfontSize   : 20
     notification.visible        : vTreatmentVitals.lastRead || vTreatmentAdjustmentVitals.adjustment_ReasonText
-    notification.anchors.rightMargin: numPad.isOpened ? 10 : 0
+    notification.anchors.rightMargin: numPad.isOpened ? 10 : 0 // fix margins when numpad is open and notifiction is displayed
 
     backgroundItemZ             :  numPad.isOpened ? 0 : -1
     backgroundItem  : [ NumPad  { id: _numPad
@@ -73,7 +73,9 @@
         vTreatmentVitals.doTimerStop()
     }
 
-    onClosed: vTreatmentVitals.doTimerStart()
+    onClosed: {
+        vTreatmentVitals.doTimerStart()
+    }
 
     onCloseClicked: {
         numPad.hide()
@@ -156,7 +158,7 @@
             text    {
                 text            : qsTr("Measure Vitals")
                 font.pixelSize  : Fonts.fontPixelConfirm
-                font.weight : Font.Medium
+                font.weight     : Font.Medium
             }
 
             onClicked:  vTreatmentAdjustmentVitals.doRequest()
@@ -166,14 +168,22 @@
     }
 
     Connections { target: vTreatmentVitals
-        // Vitals Request
+        // On Timeout - Vitals Request
         function onDidTimeout () {
-            vTreatmentAdjustmentVitals.doRequest()
-            vTreatmentVitals.doTimerStart()
+            if ( vTreatmentVitals.enableBPCuff ) {
+                vTreatmentAdjustmentVitals.doRequest()
+                vTreatmentVitals.doTimerStart()
+            }
+            else {
+                _root.open ()
+                _bphrEntry.systolic  = ""
+                _bphrEntry.diastolic = ""
+                _bphrEntry.heartRate = ""
+            }
         }
 
         // Vitals Reading Ready
-        function onDidTrigger() {
+        function onAdjustmentTriggered  ( vValue ) {
             _root.update  ( vTreatmentVitals.systolic__rt, vTreatmentVitals.diastolic_rt, vTreatmentVitals.heartRate_rt )
             _root.confirm()
         }
@@ -184,7 +194,7 @@
         function onAdjustmentTriggered  ( vValue ) {
             // on rejected prompt user to enter vitals manually
             if ( ! vTreatmentAdjustmentVitals.adjustment_Accepted ) {
-                 _root.open ()
+                _root.open ()
                 _bphrEntry.systolic  = ""
                 _bphrEntry.diastolic = ""
                 _bphrEntry.heartRate = ""