Index: leahi.qrc
===================================================================
diff -u -r0ce9ad2246ce63e9fcb706c0025ccf2a6ee88199 -r456da384df52c20ce45b2bec4317806ee11af1f6
--- leahi.qrc (.../leahi.qrc) (revision 0ce9ad2246ce63e9fcb706c0025ccf2a6ee88199)
+++ leahi.qrc (.../leahi.qrc) (revision 456da384df52c20ce45b2bec4317806ee11af1f6)
@@ -43,7 +43,6 @@
sources/gui/qml/dialogs/UfVolumeAdjustment.qml
sources/gui/qml/dialogs/HeparinRxAdjustment.qml
sources/gui/qml/dialogs/AlarmDialog.qml
- sources/gui/qml/dialogs/PatientIdEntry.qml
sources/gui/qml/dialogs/DryDemoDialog.qml
sources/gui/qml/dialogs/ConfirmPasswordDialog.qml
Fisheye: Tag 456da384df52c20ce45b2bec4317806ee11af1f6 refers to a dead (removed) revision in file `sources/gui/qml/dialogs/PatientIdEntry.qml'.
Fisheye: No comparison available. Pass `N' to diff?
Index: sources/gui/qml/globals/Colors.qml
===================================================================
diff -u -r320972a712c31e94413056591634859b4b3d564e -r456da384df52c20ce45b2bec4317806ee11af1f6
--- sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision 320972a712c31e94413056591634859b4b3d564e)
+++ sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision 456da384df52c20ce45b2bec4317806ee11af1f6)
@@ -141,7 +141,7 @@
readonly property color textNotificationNoneBg : white
readonly property color textNotificationNoneFg : "#1b2b3e"
- readonly property color textNotificationLowBg : "#f5a623" // ?
+ readonly property color textNotificationLowBg : "#01C8C8" // ?
readonly property color textNotificationLowFg : white // ?
readonly property color textNotificationMedBg : "#f5a623" // ?
@@ -156,7 +156,7 @@
readonly property color alarmTopBarMedBg : "#db8f00"
readonly property color alarmTopBarMedFg : white
- readonly property color alarmTopBarLowBg : "#db8f00"
+ readonly property color alarmTopBarLowBg : "#01C8C8"
readonly property color alarmTopBarLowFg : white
readonly property color alarmTopBarNoneBg : "#db8f00"
Index: sources/gui/qml/pages/posttreatment/PostTreatmentReview.qml
===================================================================
diff -u -ref7ded49d368a1002b73819d7d71673519b1ae29 -r456da384df52c20ce45b2bec4317806ee11af1f6
--- sources/gui/qml/pages/posttreatment/PostTreatmentReview.qml (.../PostTreatmentReview.qml) (revision ef7ded49d368a1002b73819d7d71673519b1ae29)
+++ sources/gui/qml/pages/posttreatment/PostTreatmentReview.qml (.../PostTreatmentReview.qml) (revision 456da384df52c20ce45b2bec4317806ee11af1f6)
@@ -121,14 +121,12 @@
title : qsTr("Patient Information")
width : parent.width
- label : [ qsTr("Patient ID") ,
- qsTr("Secondary Patient ID")]
+ label : [ qsTr("Patient ID") ]
- initial : [ vPostTreatmentAdjustmentTreatmentLog.patientID ,
- vPostTreatmentAdjustmentTreatmentLog.secondaryPatientID ]
+ initial : [ vPostTreatmentAdjustmentTreatmentLog.patientID ]
- actual : [ "" , "" ]
- units : [ "" , "" ]
+ actual : [ "" ]
+ units : [ "" ]
}
ReviewContainer { id: _bloodFlowDiaysate
Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml
===================================================================
diff -u -rdc8969f6c7bbdb46d2de22622e58e457ceb37df4 -r456da384df52c20ce45b2bec4317806ee11af1f6
--- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml (.../PreTreatmentCreateContent.qml) (revision dc8969f6c7bbdb46d2de22622e58e457ceb37df4)
+++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml (.../PreTreatmentCreateContent.qml) (revision 456da384df52c20ce45b2bec4317806ee11af1f6)
@@ -117,7 +117,6 @@
function validate (vFinalConfirmation) {
// store for the TreatmentLog
vPostTreatmentAdjustmentTreatmentLog.patientID = vTreatmentCreate.patientID
- vPostTreatmentAdjustmentTreatmentLog.secondaryPatientID = vTreatmentCreate.secondaryPatientID
vTreatmentCreate.finalConfirmation = vFinalConfirmation ? 1 : 0
vTreatmentCreate.doValidation ( )
}
@@ -151,7 +150,6 @@
HeparinRxAdjustment { id: _heparinRxAdjustment; editingEnabled: _root.editingEnabled }
UfVolumeAdjustment { id: _ufVolumeAdjustment; editingEnabled: _root.editingEnabled }
- PatientIdEntry { id: _patientIdEntry; editingEnabled: _root.editingEnabled }
MouseArea { // click outside to remove active focus and lower keyboard
anchors.fill : parent
Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreatePatientPrescription.qml
===================================================================
diff -u -radf593e5ad91c1e689564298bf8d411d7847b158 -r456da384df52c20ce45b2bec4317806ee11af1f6
--- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreatePatientPrescription.qml (.../PreTreatmentCreatePatientPrescription.qml) (revision adf593e5ad91c1e689564298bf8d411d7847b158)
+++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreatePatientPrescription.qml (.../PreTreatmentCreatePatientPrescription.qml) (revision 456da384df52c20ce45b2bec4317806ee11af1f6)
@@ -80,7 +80,6 @@
function clear () {
vTreatmentCreate.patientID = ""
- vTreatmentCreate.secondaryPatientID = ""
_hdfTreatmentModeControl .clear()
_subFluidVolume .clear()
_bloodFlowRate .clear()
@@ -113,15 +112,31 @@
LabelUnitContainer { id: _patientID
text : qsTr("Patient ID")
- showEdit : true
- onEditClicked : _patientIdEntry.open()
- contentItem : Text { id: _patientIDText
- anchors.centerIn : parent
- horizontalAlignment : Text.AlignRight
- font.pixelSize : Fonts.fontPixelValueControl
- color : Colors.offWhite
- text : vTreatmentCreate.patientID !== "" ? vTreatmentCreate.patientID : Variables.emptyEntry
+ contentItem : TextEntry { id: _pretreatmentPatientIDEntry
+ clip : true
+ textInput.width : parent.width - Variables.defaultMargin * 4
+ text : vTreatmentCreate.patientID
+ anchors.centerIn : parent
+ textInput.maximumLength : 20 // LEAHI-PRS-236
+ textInput.rightPadding : Variables.defaultMargin
+ textInput.leftPadding : Variables.defaultMargin * 14
+ textInput.inputMethodHints : Qt.ImhPreferLowercase
+ textInput.echoMode : TextInput.Normal
+ textInput.validator : RegExpValidator { regExp: Variables.regExp_PatientID }
+ line.visible : false
+ enabled : _root.editingEnabled
+
+ Text { id: _patientIDPlaceHolderText
+ text : Variables.emptyEntry
+ anchors.fill : parent
+ rightPadding : 125
+ horizontalAlignment : Text.AlignRight
+ font.pixelSize : Fonts.fontPixelValueControl
+ color : Colors.offWhite
+ visible : _pretreatmentPatientIDEntry.textInput.text.length === 0 &&
+ ! _pretreatmentPatientIDEntry.textInput.activeFocus
+ }
}
}
Index: sources/storage/TreatmentLog.cpp
===================================================================
diff -u -r277c22276bf6f02a2fe28107b48ffe4b6995e734 -r456da384df52c20ce45b2bec4317806ee11af1f6
--- sources/storage/TreatmentLog.cpp (.../TreatmentLog.cpp) (revision 277c22276bf6f02a2fe28107b48ffe4b6995e734)
+++ sources/storage/TreatmentLog.cpp (.../TreatmentLog.cpp) (revision 456da384df52c20ce45b2bec4317806ee11af1f6)
@@ -218,7 +218,7 @@
* Initializing the model for the constant values.
* \param vData - the response model data.
*/
-void TreatmentLog::initModel(const AdjustTreatmentLogResponseData &vData, const QString &vPatientID, const QString &vSecondaryPatientID)
+void TreatmentLog::initModel(const AdjustTreatmentLogResponseData &vData, const QString &vPatientID)
{
// Formatted values
QString mStrText = "%1";
@@ -245,7 +245,6 @@
// TODO in treatment log story LDT-2500 or LDT-2506
// LEAHI-PRS-143
_values[ePatientID ] = vPatientID.trimmed() ;
- _values[eSecondaryPatientID ] = vSecondaryPatientID.trimmed() ;
_values[eBloodFlowRate ] = mStrText.arg(vData.mBloodFlowRate );
_values[eDialysateFlowRate ] = mStrText.arg(vData.mDialysateFlowRate );
_values[eTreatmentDuration ] = mTreatmentDuration ;
@@ -367,7 +366,6 @@
ADDALINE(txCode
.arg(_txCodeKey).arg(_gTxCode) );
ADDTOLOG_MT( ePatientID, _emptyPatinetID );
- ADDTOLOG_MT( eSecondaryPatientID, _emptyPatinetID );
ADDTITLE("Treatment Prescription" );
ADDTOLOG( eTreatmentDuration );
Index: sources/storage/TreatmentLog.h
===================================================================
diff -u -r1eedad37ea1cad5c9aa41ac082614d082f525a7f -r456da384df52c20ce45b2bec4317806ee11af1f6
--- sources/storage/TreatmentLog.h (.../TreatmentLog.h) (revision 1eedad37ea1cad5c9aa41ac082614d082f525a7f)
+++ sources/storage/TreatmentLog.h (.../TreatmentLog.h) (revision 456da384df52c20ce45b2bec4317806ee11af1f6)
@@ -104,7 +104,6 @@
enum TreatmentLogIndex {
ePatientID ,
- eSecondaryPatientID ,
eBloodFlowRate ,
eDialysateFlowRate ,
eTreatmentDuration ,
@@ -138,7 +137,6 @@
const QStringList _titles {
tr("Patient ID" ), // ePatientID
- tr("Secondary Patient ID" ), // eSecondaryPatientID
tr("Blood Flow Rate" ), // eBloodFlowRate
tr("Dialysate Flow Rate" ), // eDialysateFlowRate
tr("Treatment Duration" ), // eTreatmentDuration
@@ -171,7 +169,6 @@
const QStringList _units {
"" , // ePatientID
- "" , // eSecondaryPatientID
_unitTextFlowRate , // eBloodFlowRate
_unitTextFlowRate , // eDialysateFlowRate
_unitTextDurationMin , // eTreatmentDuration
@@ -253,7 +250,7 @@
void timerEvent(QTimerEvent *) override;
public:
- void initModel(const AdjustTreatmentLogResponseData &vData, const QString &vPatientID, const QString &vSecondaryPatientID);
+ void initModel(const AdjustTreatmentLogResponseData &vData, const QString &vPatientID);
void clearModel() {
_values.clear();
for (int i = 0; i < eTreatmentLogIndexCount; i++) _values << "";
Index: sources/view/VTreatmentCreate.h
===================================================================
diff -u -r98f1043b23038c234374c04416e538cd6a749df0 -r456da384df52c20ce45b2bec4317806ee11af1f6
--- sources/view/VTreatmentCreate.h (.../VTreatmentCreate.h) (revision 98f1043b23038c234374c04416e538cd6a749df0)
+++ sources/view/VTreatmentCreate.h (.../VTreatmentCreate.h) (revision 456da384df52c20ce45b2bec4317806ee11af1f6)
@@ -102,7 +102,6 @@
VALUESET(float , ultrafiltrationVolume , 0)
VALUESET(QString , patientID ,"")
- VALUESET(QString , secondaryPatientID ,"")
VALUESET(bool , parametersValidated , 0)
PROPERTY(QString , txCode ,"")
Index: sources/view/td/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.cpp
===================================================================
diff -u -ref7ded49d368a1002b73819d7d71673519b1ae29 -r456da384df52c20ce45b2bec4317806ee11af1f6
--- sources/view/td/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.cpp (.../VPostTreatmentAdjustTreatmentLog.cpp) (revision ef7ded49d368a1002b73819d7d71673519b1ae29)
+++ sources/view/td/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.cpp (.../VPostTreatmentAdjustTreatmentLog.cpp) (revision 456da384df52c20ce45b2bec4317806ee11af1f6)
@@ -66,7 +66,7 @@
adjustment_Reason ( vData.mReason );
// init the TreatmentLog model
- _TreatmentLog.initModel ( vData, _patientID.trimmed(), _secondaryPatientID.trimmed());
+ _TreatmentLog.initModel ( vData, _patientID.trimmed());
// raw values
bloodFlowRate ( vData.mBloodFlowRate );
Index: sources/view/td/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.h
===================================================================
diff -u -ref7ded49d368a1002b73819d7d71673519b1ae29 -r456da384df52c20ce45b2bec4317806ee11af1f6
--- sources/view/td/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.h (.../VPostTreatmentAdjustTreatmentLog.h) (revision ef7ded49d368a1002b73819d7d71673519b1ae29)
+++ sources/view/td/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.h (.../VPostTreatmentAdjustTreatmentLog.h) (revision 456da384df52c20ce45b2bec4317806ee11af1f6)
@@ -48,7 +48,6 @@
TRIGGER( bool , adjustment , 0)
PROPERTY(QString , patientID , 0 )
- PROPERTY(QString , secondaryPatientID , 0 ) // TODO create rx enhancement - edit pencil on create rxs
PROPERTY(quint32 , bloodFlowRate , 0 )
PROPERTY(quint32 , bloodFlowRateActual , 0 )