Index: denali.pro.user =================================================================== diff -u -raa873f8620e3f402bf60827e9c54623b5e09280e -rc4bd7072571428744e11dd24d5da1d1a3e1d1686 --- denali.pro.user (.../denali.pro.user) (revision aa873f8620e3f402bf60827e9c54623b5e09280e) +++ denali.pro.user (.../denali.pro.user) (revision c4bd7072571428744e11dd24d5da1d1a3e1d1686) @@ -1,6 +1,6 @@ - + EnvironmentId @@ -89,7 +89,7 @@ Qt 5.12.5 (iMX8) Qt 5.12.5 (iMX8) {5d6458ef-f917-4aef-a092-c77bbe106149} - 1 + 0 0 0 @@ -373,7 +373,7 @@ 1 false - -u + -u -a 3768 false true Index: sources/canbus/MessageAcknowModel.cpp =================================================================== diff -u -r3e64d98e243484505a44d99b13826097cb6b01eb -rc4bd7072571428744e11dd24d5da1d1a3e1d1686 --- sources/canbus/MessageAcknowModel.cpp (.../MessageAcknowModel.cpp) (revision 3e64d98e243484505a44d99b13826097cb6b01eb) +++ sources/canbus/MessageAcknowModel.cpp (.../MessageAcknowModel.cpp) (revision c4bd7072571428744e11dd24d5da1d1a3e1d1686) @@ -73,6 +73,7 @@ { // coco begin validated: Application termination is not correctly done in coco!!! // it has been tested and works perfectly fine in normal run. + qDeleteAll(_acknowList); quitThread(); // validated } // coco end Index: sources/gui/qml/components/StackItem.qml =================================================================== diff -u -r2dd767833cf0cf706c457951c2d78e7e20aff768 -rc4bd7072571428744e11dd24d5da1d1a3e1d1686 --- sources/gui/qml/components/StackItem.qml (.../StackItem.qml) (revision 2dd767833cf0cf706c457951c2d78e7e20aff768) +++ sources/gui/qml/components/StackItem.qml (.../StackItem.qml) (revision c4bd7072571428744e11dd24d5da1d1a3e1d1686) @@ -37,7 +37,7 @@ */ function info(vInfo) { // DEBUG: - return; + if ( true ) return console.debug('-----') if ( vInfo !== undefined ) console.debug(vInfo) for( var i = 0; i < _stackView.depth; i++ ) { Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateStack.qml =================================================================== diff -u -r821bf955d0ba7e028bccfee7c04ca77cf80a0bd4 -rc4bd7072571428744e11dd24d5da1d1a3e1d1686 --- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateStack.qml (.../PreTreatmentCreateStack.qml) (revision 821bf955d0ba7e028bccfee7c04ca77cf80a0bd4) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateStack.qml (.../PreTreatmentCreateStack.qml) (revision c4bd7072571428744e11dd24d5da1d1a3e1d1686) @@ -20,6 +20,7 @@ // Qml imports import "qrc:/globals" import "qrc:/components" +import "qrc:/pages/pretreatment" import "qrc:/pages/pretreatment/create" /*! * \brief the pre treatment parameters create stack screen @@ -31,6 +32,49 @@ property int stackStepIndex : 0 + property alias patientID: _pretreatmentPtientIDEntry.text + + function setPatientID(vPatientID) { + vTreatmentCreate .patientID = vPatientID // in case it needs to be displayed on Pre-Treatment Confirm Screen + vPostTreatmentAdjustmentTreatmentLog.patientID = vPatientID // store for the TreatmentLog + } + + function pagePatientID( vCondition ) { + if ( vCondition !== undefined && vCondition === false ) return + + patientID = "" + page( _pretreatmentPtientID ) + _pretreatmentPtientID.setFocus() + } + + PreTreatmentBase { id: _pretreatmentPtientID + + function setFocus() { + _pretreatmentPtientIDEntry.textInput.forceActiveFocus() + _keyboard.setVisible(true) + } + + title.text : qsTr("Patient ID") + header.backVisible : true + header.confirmVisible : true + header.confirmEnabled : _pretreatmentPtientIDEntry.text + TextEntry { id : _pretreatmentPtientIDEntry + property int topMarginContent : 200 + + clip : true + hasCarret : true + textInput .width : 450 + text : vTreatmentCreate.patientID + anchors { + top : parent.top + topMargin : topMarginContent + 120 // moved a little down to be more on center and close to keyboard top edge. + horizontalCenter: parent.horizontalCenter + } + textInput.inputMethodHints : Qt.ImhPreferLowercase + textInput.echoMode : TextInput.Normal + } + } + PreTreatmentCreate { id: _pretreatmentCreate header.backVisible : true header.confirmVisible : true @@ -45,18 +89,24 @@ } Connections { target: vHDOperationMode - onValidateParametersChanged : { page( _pretreatmentCreate , vvalidateParameters )} + onValidateParametersChanged : { pagePatientID ( vvalidateParameters )} } - Connections { target: vTreatmentCreate - onFwValidationSuccess : { page( _pretreatmentConfirm )} + Connections { target: _pretreatmentPtientID + onBackClicked : { vPreTreatmentAdjustmentInitTreatment.doCancel ()} + onConfirmClicked : { setPatientID ( patientID ) + page( _pretreatmentCreate )} } Connections { target: _pretreatmentCreate - onBackClicked : { vPreTreatmentAdjustmentInitTreatment.doCancel ()} + onBackClicked : { pageoPatientID ()} onConfirmClicked : { vTreatmentCreate.doValidation ()} } + Connections { target: vTreatmentCreate + onFwValidationSuccess : { page( _pretreatmentConfirm )} + } + Connections { target: _pretreatmentConfirm onBackClicked : { vTreatmentCreate.doCancel () page( _pretreatmentCreate )} Index: sources/storage/TreatmentLog.cpp =================================================================== diff -u -r143bb84e7a23e5dbc9fa5bd29e8aa0407b9a7109 -rc4bd7072571428744e11dd24d5da1d1a3e1d1686 --- sources/storage/TreatmentLog.cpp (.../TreatmentLog.cpp) (revision 143bb84e7a23e5dbc9fa5bd29e8aa0407b9a7109) +++ sources/storage/TreatmentLog.cpp (.../TreatmentLog.cpp) (revision c4bd7072571428744e11dd24d5da1d1a3e1d1686) @@ -59,7 +59,7 @@ * Initializing the model for the constant values. * \param vData - the response model data. */ -void TreatmentLog::initModel(const AdjustTreatmentLogResponseData &vData) +void TreatmentLog::initModel(const AdjustTreatmentLogResponseData &vData, const QString &vPatientID) { // Formatted values QString mStrText = "%1"; @@ -88,6 +88,7 @@ _values.clear(); for (int i = 0; i < eTreatmentLogIndexCount; i++) _values << ""; + _values[ePatientID ] = vPatientID.trimmed() ; _values[eDeviceID ] = mStrText.arg(vData.mDeviceID ); _values[eBloodFlowRate ] = mStrText.arg(vData.mBloodFlowRate ); _values[eDialysateFlowRate ] = mStrText.arg(vData.mDialysateFlowRate ); @@ -207,7 +208,7 @@ uint index = 0 ; ADDTITLE("Title"); - ADDALINE(csv.arg(tr("Patient ID" )) + NONE); + ADDTOLOG( ePatientID ); ADDTOLOG( eDeviceID ); ADDTITLE("Treatment Prescription" ); Index: sources/storage/TreatmentLog.h =================================================================== diff -u -r1f7b6bc9c38aa3bb35a8ce34e6c229f6b124b3df -rc4bd7072571428744e11dd24d5da1d1a3e1d1686 --- sources/storage/TreatmentLog.h (.../TreatmentLog.h) (revision 1f7b6bc9c38aa3bb35a8ce34e6c229f6b124b3df) +++ sources/storage/TreatmentLog.h (.../TreatmentLog.h) (revision c4bd7072571428744e11dd24d5da1d1a3e1d1686) @@ -69,6 +69,7 @@ }; enum TreatmentLogIndex { + ePatientID , eDeviceID , eBloodFlowRate , eDialysateFlowRate , @@ -107,6 +108,7 @@ }; const QStringList _titles { + tr("Patient ID" ), tr("Device ID" ), tr("Blood Flow Rate" ), tr("Dialysate Flow Rate" ), @@ -144,6 +146,7 @@ const QStringList _units { "" , + "" , _unitTextFlowRate , _unitTextFlowRate , _unitTextDurationMin , @@ -209,7 +212,7 @@ SINGLETON(TreatmentLog) public: - void initModel(const AdjustTreatmentLogResponseData &vData); + void initModel(const AdjustTreatmentLogResponseData &vData, const QString &vPatientID); const QStringList titles() const { return _titles; } const QStringList units () const { return _units ; } Index: sources/view/VTreatmentCreate.h =================================================================== diff -u -rfd7107924547c4cdd23283b25446a10752cb53d2 -rc4bd7072571428744e11dd24d5da1d1a3e1d1686 --- sources/view/VTreatmentCreate.h (.../VTreatmentCreate.h) (revision fd7107924547c4cdd23283b25446a10752cb53d2) +++ sources/view/VTreatmentCreate.h (.../VTreatmentCreate.h) (revision c4bd7072571428744e11dd24d5da1d1a3e1d1686) @@ -198,6 +198,7 @@ protected: + PROPERTY(QString , patientID , "" ) PROPERTY(QStringList, acidConcentrateOptions , QStringList() << "08-1251-1" << "08-2251-0" << "08-3251-9") @@ -237,6 +238,7 @@ void doConfirm(); void doCancel(); void doUserModifiedParameters(); + QStringList doGetPrescriptionParameterNames(); QStringList doGetPrescriptionParameterValues(); QStringList doGetOperatingParameterNames(); Index: sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.cpp =================================================================== diff -u -r1c18f738693756ca1f0342c2cc158e32bc28f90b -rc4bd7072571428744e11dd24d5da1d1a3e1d1686 --- sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.cpp (.../VPostTreatmentAdjustTreatmentLog.cpp) (revision 1c18f738693756ca1f0342c2cc158e32bc28f90b) +++ sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.cpp (.../VPostTreatmentAdjustTreatmentLog.cpp) (revision c4bd7072571428744e11dd24d5da1d1a3e1d1686) @@ -68,7 +68,7 @@ adjustment_Accepted ( vData.mAccepted ); adjustment_Reason ( vData.mReason ); - _TreatmentLog.initModel(vData); + _TreatmentLog.initModel (vData, _patientID.trimmed() ); parametersText ( _TreatmentLog.values() ); // raw values Index: sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.h =================================================================== diff -u -rfc329c788fe9453983072bee937ccbc95b4ed6e4 -rc4bd7072571428744e11dd24d5da1d1a3e1d1686 --- sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.h (.../VPostTreatmentAdjustTreatmentLog.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) +++ sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.h (.../VPostTreatmentAdjustTreatmentLog.h) (revision c4bd7072571428744e11dd24d5da1d1a3e1d1686) @@ -50,6 +50,8 @@ TRIGGER( bool , adjustment , 0) // coco end + PROPERTY(QString , patientID , "") + PROPERTY(quint32 , bloodFlowRate , 0 ) PROPERTY(quint32 , dialysateFlowRate , 0 ) PROPERTY(quint32 , treatmentDuration , 0 )