Index: sources/gui/qml/pages/treatment/TreatmentStack.qml
===================================================================
diff -u -r7db80dd579054dd4754ae4d135a4a3e647f09b5f -rcb9c48c7c307690dcafcfd16ef412fe660291692
--- sources/gui/qml/pages/treatment/TreatmentStack.qml	(.../TreatmentStack.qml)	(revision 7db80dd579054dd4754ae4d135a4a3e647f09b5f)
+++ sources/gui/qml/pages/treatment/TreatmentStack.qml	(.../TreatmentStack.qml)	(revision cb9c48c7c307690dcafcfd16ef412fe660291692)
@@ -34,7 +34,7 @@
 
     onVisibleChanged        : { // this should never happen by design, but in tests it can easily happen and will block the screen touch.
         _treatmentAdjustmentFlow            .close()
-        _vitalEntry                         .close( true ) // vQuit == true
+        _treatmentAdjustmentVitals          .close()
         _treatmentAdjustmentPressuresLimits .close()
         _treatmentAdjustmentDuration        .close()
         _treatmentUltrafiltrationItem       .close()
@@ -80,7 +80,7 @@
             _treatmentAdjustmentFlow.open()
         }
         function onSectionVitalsClicked             ( vValue ) {
-            _vitalEntry.open()
+            _treatmentAdjustmentVitalsInterval.open()
         }
         function onSectionPressuresClicked          ( vValue ) {
             _treatmentAdjustmentPressuresLimits.open()
@@ -123,50 +123,8 @@
         }
     }
 
-    EntryDialog                 { id:       _vitalEntry
-        function update(vSystolic, vDiastolic ,vHeartRate) {
-            _bphrEntry.systolic   = vSystolic   ? vSystolic  : ""
-            _bphrEntry.diastolic  = vDiastolic  ? vDiastolic : ""
-            _bphrEntry.heartRate  = vHeartRate  ? vHeartRate : ""
-        }
+    TreatmentAdjustmentVitalsInterval { id: _treatmentAdjustmentVitalsInterval  }
 
-        titleText               : qsTr("VITALS")
-        confirmEnabled          : _bphrEntry.isValid
-        onConfirmClicked        : {
-            _vitalEntry.close()
-            vTreatmentVitals.doConfirm(
-                        _bphrEntry.systolic   ,
-                        _bphrEntry.diastolic  ,
-                        _bphrEntry.heartRate
-                        )
-            _treatmentHome.logVitalTime()
-        }
-
-        onCloseClicked          : {
-            vTreatmentVitals.doSkip() // only for logging
-        }
-
-        onOpened                : vTreatmentVitals.doTimerStop() // Can't be moved to C++, and has to be handled here because it can manually being opened by the user
-
-        onClosed                : {
-            if ( ! vQuit )
-                vTreatmentVitals.doTimerStart()
-        }
-
-        BPHREntry { id          : _bphrEntry
-            contentRectHeight   : _vitalEntry.contentRect.height
-        }
-
-        Connections { target: vTreatmentVitals
-            function onDidTrigger       ( vSystolic, vDiastolic, vHeartRate ) {
-                if  ( vTreatmentVitals.enableDialog ) {
-                    _vitalEntry.update  ( vSystolic, vDiastolic, vHeartRate )
-                    _vitalEntry.open    ()
-                }
-            }
-        }
-    }
-
     // ---------- Manages Responses ----------
     Connections { target: vTreatmentAdjustmentDuration
         function onAdjustmentTriggered              ( vValue ) {