Index: sources/gui/qml/pages/treatment/sections/TreatmentHeparin.qml =================================================================== diff -u -r93b7d7da5dea9e0392e139b59117eb0315d6c343 -r8ff1852fbcf348761fd30f878f31fa43ffa9e37c --- sources/gui/qml/pages/treatment/sections/TreatmentHeparin.qml (.../TreatmentHeparin.qml) (revision 93b7d7da5dea9e0392e139b59117eb0315d6c343) +++ sources/gui/qml/pages/treatment/sections/TreatmentHeparin.qml (.../TreatmentHeparin.qml) (revision 8ff1852fbcf348761fd30f878f31fa43ffa9e37c) @@ -1,15 +1,15 @@ /*! * - * Copyright (c) 2020-2024 Diality Inc. - All Rights Reserved. + * Copyright (c) 2025-2025 Diality Inc. - All Rights Reserved. * \copyright * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * - * \file TreatmentHeparin.qml - * \author (last) Vy - * \date (last) 17-May-2023 - * \author (original) Behrouz NematiPour - * \date (original) 20-Nov-2020 + * \file BaseComboBox.qml + * \author (last) Nico Ramirez + * \date (last) 2-Dec-2025 + * \author (original) Nico Ramirez + * \date (original) 2-Dec-2025 * */ @@ -36,7 +36,6 @@ readonly property bool isCompleted : vTDTreatmentStates.hpCompleted readonly property bool isEmpty : vTDTreatmentStates.hpEmpty readonly property bool isRejected : vTreatmentAdjustmentHeparin.adjustment_Accepted -// readonly property bool displayReason : _private.displayReason readonly property bool isTxRunning : vTDTreatmentStates.txDialysis readonly property color heparinColor : _root.deliveryOff ? Colors.transparent : @@ -55,10 +54,11 @@ readonly property var units : [ Variables.unitHeparinType, Variables.unitTextDispensingRate, Variables.unitTextDispensingRate, Variables.unitTextDuration ] readonly property var values : [ "Unfractionated 1000", vTreatmentCreate.heparinDispensingRate, vTreatmentCreate.heparinBolusVolume, vTreatmentCreate.heparinStopTime ] - readonly property real cumulative : 0.23 // vTreatmentHeparin.cumulative - readonly property real target : 1.0 // vTreatmentHeparin.target - readonly property string timeRemaining : "01:39" // vTreatmentHeparin.timeRemaining + readonly property real cumulative : vTreatmentHeparin.cumulative + readonly property real target : vTreatmentHeparin.target + readonly property string timeRemaining : vTreatmentHeparin.timeRemaining + signal idleTimeout() onHeparinColorChanged : _headerBar.statusColor = heparinColor @@ -92,8 +92,23 @@ } } + Connections { target: vTreatmentAdjustmentHeparin + function onAdjustmentTriggered ( vValue ) { + _notification.text = vTreatmentAdjustmentHeparin.adjustment_Accepted ? "" : + vTreatmentAdjustmentHeparin.adjustment_ReasonText + } + } + + IdleTimer {id: _idleTimer + anchors.fill : parent + + onIdle: { + _root.idleTimeout() + } + } + Row { id: _row - objectName : "_row" + objectName : "_row" spacing : Variables.defaultMargin * 5 anchors { @@ -181,6 +196,7 @@ onPressed : { if ( _root.isPaused ) vTreatmentAdjustmentHeparin.doResume() if ( _root.isDispensing ) vTreatmentAdjustmentHeparin.doPause () + _idleTimer.reset() } } @@ -241,7 +257,7 @@ left : parent.left leftMargin : 5 } - width : _timeRemaining.contentWidth / 2 + width : 70 text : Variables.unitTextHrs color : Colors.white font.pixelSize : Fonts.fontPixelContainerUnit @@ -326,14 +342,14 @@ } } - Connections { target: vTreatmentAdjustmentHeparin - function onAdjustmentTriggered ( vValue ) { -// _private.displayReason = ! vTreatmentAdjustmentHeparin.adjustment_Accepted - } + NotificationBarSmall { id: _notification + visible : text + color : Colors.transparent + textColor : Colors.white + imageSource : "" + text : "" + anchors.bottomMargin: _root.notificationMargin } - Connections { target: vTDTreatmentStates - function onHeparinChanged ( vValue ) { -// _private.displayReason = false - } - } + + }