Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml
===================================================================
diff -u -rfd09b0ee6e41d75755e0572008d4f932b0bddf2b -raacca8cc53f5e4ff5abb6d7df3d5ad48c915645c
--- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml	(.../TreatmentAdjustmentVitals.qml)	(revision fd09b0ee6e41d75755e0572008d4f932b0bddf2b)
+++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml	(.../TreatmentAdjustmentVitals.qml)	(revision aacca8cc53f5e4ff5abb6d7df3d5ad48c915645c)
@@ -59,27 +59,31 @@
         _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: {
         _bphrEntry.setInitialFocus()
         notificationText = notificationTextString
-        vTreatmentVitals.doTimerStop()
     }
 
-    onClosed: {
-        vTreatmentVitals.doTimerStart()
-    }
-
     onCloseClicked: {
         numPad.hide()
         vTreatmentVitals.doSkip()
@@ -113,7 +117,7 @@
                 margins         : 0
 
             }
-            onClicked   : _root.confirm()
+            onClicked   : _root.confirm(true)
         }
 
         Item { id: _separator
@@ -173,15 +177,16 @@
     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
+                vTreatmentTrends.onNoVitalsRecord()
                 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 ) {
+                vTreatmentTrends.onIntervalRequestVitals()
                 vTreatmentAdjustmentVitals.doRequest()
-                vTreatmentVitals.doTimerStart()
             }
             else {
                 _root.open ()
@@ -194,7 +199,7 @@
         // Vitals Reading Ready
         function onAdjustmentTriggered  ( vValue ) {
             _root.update  ( vTreatmentVitals.systolic__rt, vTreatmentVitals.diastolic_rt, vTreatmentVitals.heartRate_rt )
-            _root.confirm()
+            _root.confirm(false)
         }
     }
 
@@ -212,7 +217,10 @@
         }
 
         // FW no response timeout
-        function onDidTimeout ( ) { vTreatmentVitals.doSkip(); }
+        function onDidTimeout ( ) {
+            vTreatmentTrends.onIntervalTimeoutVitals()
+            vTreatmentVitals.doSkip()
+        }
     }
 
     Behavior on x               { NumberAnimation { duration: Variables.keybardAnimationDuration } }