Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml =================================================================== diff -u -raacca8cc53f5e4ff5abb6d7df3d5ad48c915645c -r72550dbbd6db8eab40aad38956b32f99416600c8 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml (.../TreatmentAdjustmentVitals.qml) (revision aacca8cc53f5e4ff5abb6d7df3d5ad48c915645c) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml (.../TreatmentAdjustmentVitals.qml) (revision 72550dbbd6db8eab40aad38956b32f99416600c8) @@ -32,7 +32,7 @@ y : Math.round((Variables.applicationHeight - height) / 2) notification.textfontSize : 20 - notification.visible : vTreatmentVitals.lastRead || vTreatmentAdjustmentVitals.adjustment_ReasonText + notification.visible : vTreatmentAdjustmentVitals.adjustment_ReasonText notification.anchors.rightMargin: numPad.isOpened ? 10 : 0 // fix margins when numpad is open and notifiction is displayed backgroundItemZ : numPad.isOpened ? 0 : -1 @@ -44,14 +44,8 @@ property alias numPad : _numPad - readonly property string intervalTextString : qsTr("Interval:" ) - + " " + (vTreatmentVitals.interval ? (vTreatmentVitals.interval + qsTr("min")) : qsTr("OFF")) - + " , " - + qsTr("Last Read:") - + " " + vTreatmentVitals.lastRead - readonly property string rejectionTextString : qsTr("Rejected Reason: %1").arg(vTreatmentAdjustmentVitals.adjustment_ReasonText) - readonly property string notificationTextString : vTreatmentAdjustmentVitals.adjustment_ReasonText ? rejectionTextString : - intervalTextString + readonly property string rejectionTextString : vTreatmentAdjustmentVitals.adjustment_ReasonText ? qsTr("Rejected Reason: %1").arg(vTreatmentAdjustmentVitals.adjustment_ReasonText) : + "" function update(vSystolic, vDiastolic ,vHeartRate) { _bphrEntry.systolic = vSystolic ? vSystolic : "" @@ -75,13 +69,13 @@ _bphrEntry.heartRate ) } - + _bphrEntry.clear() _headerBar.vitalsRecorded() } onOpened: { _bphrEntry.setInitialFocus() - notificationText = notificationTextString + notificationText = rejectionTextString } onCloseClicked: { @@ -90,18 +84,15 @@ } BPHREntry { id: _bphrEntry - anchors { - fill: parent - topMargin: Variables.defaultMargin * 2 - } + anchors.fill: parent } Column { id: _buttonRow - spacing: Variables.defaultMargin * 1.5 + spacing: Variables.defaultMargin anchors { bottom : _root.contentItem.bottom - bottomMargin : Variables.defaultMargin * 5 + bottomMargin : Variables.defaultMargin * 4 horizontalCenter: _root.contentItem.horizontalCenter } @@ -213,7 +204,7 @@ _bphrEntry.diastolic = "" _bphrEntry.heartRate = "" } - notificationText = notificationTextString + notificationText = rejectionTextString } // FW no response timeout