Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -r14d7345260cdc47d8308da4fff127fbd97837fe4 -rc16cfee6212ad1ba9f788c41d4a4c916daa43c9c --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 14d7345260cdc47d8308da4fff127fbd97837fe4) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision c16cfee6212ad1ba9f788c41d4a4c916daa43c9c) @@ -291,7 +291,7 @@ // ---- Treatment Log {Gui::GuiActionType::ID_AdjustTreatmentLogReq , 0 * 4 }, // 0 parameter - {Gui::GuiActionType::ID_AdjustTreatmentLogRsp , 64 * 4 }, // 64 parameter each 4bytes + {Gui::GuiActionType::ID_AdjustTreatmentLogRsp , 62 * 4 }, // 62 parameter each 4bytes {Gui::GuiActionType::ID_TreatmentLogAvrgeData , 5 * 4 }, // 5 parameter each 4bytes {Gui::GuiActionType::ID_TreatmentLogAlarmData , 3 * 4 }, // 3 parameter each 4bytes {Gui::GuiActionType::ID_TreatmentLogEventData , 3 * 4 }, // 3 parameter each 4bytes Index: sources/gui/qml/components/ReviewContainer.qml =================================================================== diff -u -re8d73dd5ebca400248f59bf4c3940ff50dee696a -rc16cfee6212ad1ba9f788c41d4a4c916daa43c9c --- sources/gui/qml/components/ReviewContainer.qml (.../ReviewContainer.qml) (revision e8d73dd5ebca400248f59bf4c3940ff50dee696a) +++ sources/gui/qml/components/ReviewContainer.qml (.../ReviewContainer.qml) (revision c16cfee6212ad1ba9f788c41d4a4c916daa43c9c) @@ -79,7 +79,7 @@ color : Colors.offWhite font.pixelSize : Fonts.fontPixelValueControl verticalAlignment : Text.AlignVCenter - visible : _root.initial[index] ?? false + visible : _root.initial[index] !== "" } Text { id: _actual @@ -88,7 +88,7 @@ color : Colors.ufVolumeGoalText font.pixelSize : Fonts.fontPixelValueControl verticalAlignment : Text.AlignVCenter - visible : _root.actual[index] ?? false + visible : _root.actual[index] !== "" } } } Index: sources/model/td/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.cpp =================================================================== diff -u -rea37bc16ab57586729e332c2a9df3299f91012ca -rc16cfee6212ad1ba9f788c41d4a4c916daa43c9c --- sources/model/td/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.cpp (.../MPostTreatmentAdjustTreatmentLogResponse.cpp) (revision ea37bc16ab57586729e332c2a9df3299f91012ca) +++ sources/model/td/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.cpp (.../MPostTreatmentAdjustTreatmentLogResponse.cpp) (revision c16cfee6212ad1ba9f788c41d4a4c916daa43c9c) @@ -61,8 +61,6 @@ _data.mHeparinDispenseRate .value, _data.mHeparinDispenseRateActual .value, _data.mHeparinDeliveredVolume .value, - _data.mAverageArterialPressure .value, - _data.mAverageVenousPressure .value, _data.mUFVolume .value, _data.mUFVolumeActual .value, _data.mUFVolumeTarget .value, @@ -131,8 +129,6 @@ if ( ! GetValue(vByteArray, index, _data.mHeparinDispenseRate )) goto lError; if ( ! GetValue(vByteArray, index, _data.mHeparinDispenseRateActual )) goto lError; if ( ! GetValue(vByteArray, index, _data.mHeparinDeliveredVolume )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mAverageArterialPressure )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mAverageVenousPressure )) goto lError; if ( ! GetValue(vByteArray, index, _data.mUFVolume )) goto lError; if ( ! GetValue(vByteArray, index, _data.mUFVolumeActual )) goto lError; if ( ! GetValue(vByteArray, index, _data.mUFVolumeTarget )) goto lError; @@ -157,7 +153,7 @@ lError: if(vIndex) { *vIndex = index; } - + return false ; } @@ -211,8 +207,6 @@ data.mHeparinDispenseRate = _data.mHeparinDispenseRate .value; data.mHeparinDispenseRateActual = _data.mHeparinDispenseRateActual .value; data.mHeparinDeliveredVolume = _data.mHeparinDeliveredVolume .value; - data.mAverageArterialPressure = _data.mAverageArterialPressure .value; - data.mAverageVenousPressure = _data.mAverageVenousPressure .value; data.mUFVolume = _data.mUFVolume .value; data.mUFVolumeActual = _data.mUFVolumeActual .value; data.mUFVolumeTarget = _data.mUFVolumeTarget .value; Index: sources/model/td/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.h =================================================================== diff -u -rea37bc16ab57586729e332c2a9df3299f91012ca -rc16cfee6212ad1ba9f788c41d4a4c916daa43c9c --- sources/model/td/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.h (.../MPostTreatmentAdjustTreatmentLogResponse.h) (revision ea37bc16ab57586729e332c2a9df3299f91012ca) +++ sources/model/td/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.h (.../MPostTreatmentAdjustTreatmentLogResponse.h) (revision c16cfee6212ad1ba9f788c41d4a4c916daa43c9c) @@ -79,27 +79,25 @@ * | 41 - (F32) | \ref Data::mHeparinDispenseRate * | 42 - (F32) | \ref Data::mHeparinDispenseRateActual * | 43 - (F32) | \ref Data::mHeparinDeliveredVolume - * | 44 - (F32) | \ref Data::mAverageArterialPressure - * | 45 - (F32) | \ref Data::mAverageVenousPressure - * | 46 - (F32) | \ref Data::mUFVolume - * | 47 - (F32) | \ref Data::mUFVolumeActual - * | 48 - (F32) | \ref Data::mUFVolumeTarget - * | 49 - (F32) | \ref Data::mUFRate - * | 50 - (F32) | \ref Data::mUFRateActual - * | 51 - (F32) | \ref Data::mUFRateTarget - * | 52 - (F32) | \ref Data::mSubstitutionVolume - * | 53 - (F32) | \ref Data::mSubstitutionVolumeActual - * | 54 - (F32) | \ref Data::mSubstitutionVolumeTarget - * | 55 - (F32) | \ref Data::mSubstitutionRate - * | 56 - (F32) | \ref Data::mSubstitutionRateActual - * | 57 - (F32) | \ref Data::mSubstitutionRateTarget - * | 58 - (F32) | \ref Data::mIsoUfVolume - * | 59 - (F32) | \ref Data::mIsoUfVolumeActual - * | 60 - (F32) | \ref Data::mIsoUfVolumeTarget - * | 61 - (F32) | \ref Data::mIsoUfRate - * | 62 - (F32) | \ref Data::mIsoUfRateActual - * | 63 - (F32) | \ref Data::mIsoUfRateTarget - * | 64 - (F32) | \ref Data::mWaterSampleTestResult + * | 44 - (F32) | \ref Data::mUFVolume + * | 45 - (F32) | \ref Data::mUFVolumeActual + * | 46 - (F32) | \ref Data::mUFVolumeTarget + * | 47 - (F32) | \ref Data::mUFRate + * | 48 - (F32) | \ref Data::mUFRateActual + * | 49 - (F32) | \ref Data::mUFRateTarget + * | 50 - (F32) | \ref Data::mSubstitutionVolume + * | 51 - (F32) | \ref Data::mSubstitutionVolumeActual + * | 52 - (F32) | \ref Data::mSubstitutionVolumeTarget + * | 53 - (F32) | \ref Data::mSubstitutionRate + * | 54 - (F32) | \ref Data::mSubstitutionRateActual + * | 55 - (F32) | \ref Data::mSubstitutionRateTarget + * | 56 - (F32) | \ref Data::mIsoUfVolume + * | 57 - (F32) | \ref Data::mIsoUfVolumeActual + * | 58 - (F32) | \ref Data::mIsoUfVolumeTarget + * | 59 - (F32) | \ref Data::mIsoUfRate + * | 60 - (F32) | \ref Data::mIsoUfRateActual + * | 61 - (F32) | \ref Data::mIsoUfRateTarget + * | 62 - (F32) | \ref Data::mWaterSampleTestResult * \sa Data * \sa MAdjustTreatmentLogReq : TreatmentLog Request @@ -109,7 +107,7 @@ * | || * | || * | typeText | Event | - * | unitText | HD | + * | unitText | TD | * | infoText | AdjustTreatmentLog | * */ @@ -164,8 +162,6 @@ Types::F32 mHeparinDispenseRate ; Types::F32 mHeparinDispenseRateActual ; Types::F32 mHeparinDeliveredVolume ; - Types::F32 mAverageArterialPressure ; - Types::F32 mAverageVenousPressure ; Types::F32 mUFVolume ; Types::F32 mUFVolumeActual ; Types::F32 mUFVolumeTarget ; @@ -237,8 +233,6 @@ float mHeparinDispenseRate = 0; float mHeparinDispenseRateActual = 0; float mHeparinDeliveredVolume = 0; - float mAverageArterialPressure = 0; - float mAverageVenousPressure = 0; float mUFVolume = 0; float mUFVolumeActual = 0; float mUFVolumeTarget = 0; Index: sources/storage/TreatmentLog.cpp =================================================================== diff -u -rea37bc16ab57586729e332c2a9df3299f91012ca -rc16cfee6212ad1ba9f788c41d4a4c916daa43c9c --- sources/storage/TreatmentLog.cpp (.../TreatmentLog.cpp) (revision ea37bc16ab57586729e332c2a9df3299f91012ca) +++ sources/storage/TreatmentLog.cpp (.../TreatmentLog.cpp) (revision c16cfee6212ad1ba9f788c41d4a4c916daa43c9c) @@ -226,32 +226,33 @@ // SRSUI910 : PRS178 : Clinical - Data - Order bool isHeparinOff = vHeparinBolusVolumeOff && vHeparinDispensingRateOff; + Q_UNUSED(isHeparinOff); // TODO LDT-2500 or LDT-2506 // QString mTreatmentDurationFmt = QTime (0, 0).addSecs(int(vData.mTreatmentDuration )).toString(_timeFormat); // QString mActualTreatmentDurationFmt = QTime (0, 0).addSecs(int(vData.mActualTreatmentDuration )).toString(_timeFormat); // QString mTreatmentDuration = QString::number(vData.mTreatmentDuration / 60 ); // Converted seconds to minutes. // QString mActualTreatmentDuration = QString::number(vData.mActualTreatmentDuration / 60 ); // Converted seconds to minutes. - QString mTreatmentStartDateTime = Format::fromEpoch( vData.mTreatmentStartEpoch , _datetimeFormat); - QString mTreatmentEndDateTime = Format::fromEpoch( vData.mTreatmentEndEpoch , _datetimeFormat); +// QString mTreatmentStartDateTime = Format::fromEpoch( vData.mTreatmentStartEpoch , _datetimeFormat); +// QString mTreatmentEndDateTime = Format::fromEpoch( vData.mTreatmentEndEpoch , _datetimeFormat); - // TODO : The settings needs modification not only to define the category and groups in a common header but also the settings itself needs some mods. - // - the category shall become as part of the group - // - the structure of the settings should become horizontal which vertical now. - QString mCategory = Storage::Settings_Category_DataList; - QString mAcidConcentrateType = _Settings.key(mCategory, "Acid Concentrate Options" , vData.mAcidConcentrateType ); - QString mBicarbonateConcentrateType = _Settings.key(mCategory, "Bicarbonate Concentrate Options" , vData.mBicarbonateCartridgeSize ); - QString mDialyzerType = _Settings.key(mCategory, "Dialyzer Type Options" , vData.mDialyzerType ); - QString mHeparinType = _Settings.key(mCategory, "Heparin Type Options" , vData.mHeparinType ); - QString mWaterSampleTestResult = _Settings.key(mCategory, "Water Sample Result" , vData.mWaterSampleTestResult ); +// // TODO : The settings needs modification not only to define the category and groups in a common header but also the settings itself needs some mods. +// // - the category shall become as part of the group +// // - the structure of the settings should become horizontal which vertical now. +// QString mCategory = Storage::Settings_Category_DataList; +// QString mAcidConcentrateType = _Settings.key(mCategory, "Acid Concentrate Options" , vData.mAcidConcentrateType ); +// QString mBicarbonateConcentrateType = _Settings.key(mCategory, "Bicarbonate Concentrate Options" , vData.mBicarbonateCartridgeSize ); +// QString mDialyzerType = _Settings.key(mCategory, "Dialyzer Type Options" , vData.mDialyzerType ); +// QString mHeparinType = _Settings.key(mCategory, "Heparin Type Options" , vData.mHeparinType ); +// QString mWaterSampleTestResult = _Settings.key(mCategory, "Water Sample Result" , vData.mWaterSampleTestResult ); // init/fill/clear the _values clearModel(); // TODO in treatment log story LDT-2500 or LDT-2506 _values[ePatientID ] = vPatientID.trimmed() ; -// _values[eBloodFlowRate ] = mStrText.arg(vData.mBloodFlowRate ); + _values[eBloodFlowRate ] = mStrText.arg(vData.mBloodFlowRate ); // _values[eDialysateFlowRate ] = mStrText.arg(vData.mDialysateFlowRate ); // _values[eTreatmentDuration ] = mTreatmentDuration ; // _values[eActualTreatmentDuration ] = mActualTreatmentDuration ; @@ -275,12 +276,12 @@ // _values[eActualUFRate ] = mStrText.arg(vData.mActualUFRate ,FLOAT3 ); // _values[eSalineBolusVolume ] = mStrText.arg(vData.mSalineBolusVolume ); - _values[eHeparinType ] = isHeparinOff ? tr("NONE") : mHeparinType ; -// _values[eHeparinConcentration ] = isHeparinOff ? tr("NONE") : mStrText.arg(vData.mHeparinConcentration ); - _values[eHeparinBolusVolume ] = vHeparinBolusVolumeOff ? tr("OFF" ) : mStrText.arg(vData.mHeparinBolusVolume ,FLOAT3 ); - _values[eHeparinDispenseRate ] = vHeparinDispensingRateOff ? tr("OFF" ) : mStrText.arg(vData.mHeparinDispenseRate ,FLOAT3 ); -// _values[eHeparinStop ] = vHeparinDispensingRateOff ? tr("OFF" ) : mStrText.arg(vData.mHeparinStop ); - _values[eHeparinDeliveredVolume ] = isHeparinOff ? tr("OFF" ) : mStrText.arg(vData.mHeparinDeliveredVolume ,FLOAT3 ); +// _values[eHeparinType ] = isHeparinOff ? tr("NONE") : mHeparinType ; +//// _values[eHeparinConcentration ] = isHeparinOff ? tr("NONE") : mStrText.arg(vData.mHeparinConcentration ); +// _values[eHeparinBolusVolume ] = vHeparinBolusVolumeOff ? tr("OFF" ) : mStrText.arg(vData.mHeparinBolusVolume ,FLOAT3 ); +// _values[eHeparinDispenseRate ] = vHeparinDispensingRateOff ? tr("OFF" ) : mStrText.arg(vData.mHeparinDispenseRate ,FLOAT3 ); +//// _values[eHeparinStop ] = vHeparinDispensingRateOff ? tr("OFF" ) : mStrText.arg(vData.mHeparinStop ); +// _values[eHeparinDeliveredVolume ] = isHeparinOff ? tr("OFF" ) : mStrText.arg(vData.mHeparinDeliveredVolume ,FLOAT3 ); emit didTxCodeReceive(""); } Index: sources/view/td/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.cpp =================================================================== diff -u -rea37bc16ab57586729e332c2a9df3299f91012ca -rc16cfee6212ad1ba9f788c41d4a4c916daa43c9c --- sources/view/td/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.cpp (.../VPostTreatmentAdjustTreatmentLog.cpp) (revision ea37bc16ab57586729e332c2a9df3299f91012ca) +++ sources/view/td/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.cpp (.../VPostTreatmentAdjustTreatmentLog.cpp) (revision c16cfee6212ad1ba9f788c41d4a4c916daa43c9c) @@ -53,21 +53,12 @@ */ void View::VPostTreatmentAdjustmentTreatmentLog::doRequest() { _TreatmentLog.clearModel(); -// parametersText ( {} ); AdjustTreatmentLogRequestData data; emit didAdjustment(data); } /*! - * \brief View::VPostTreatmentAdjustmentTreatmentLog::doExport - * \details the invocable slot to send user's treatment log export request to the controller - */ -void View::VPostTreatmentAdjustmentTreatmentLog::doExport() { - _TreatmentLog.doExport(); -} - -/*! * \brief VPostTreatmentAdjustmentUltrafiltrationInit::onActionReceive * \details received response model data handler * \param vData - model data @@ -122,8 +113,6 @@ heparinDispenseRate ( vData.mHeparinDispenseRate ); heparinDispenseRateActual ( vData.mHeparinDispenseRateActual ); heparinDeliveredVolume ( vData.mHeparinDeliveredVolume ); - averageArterialPressure ( vData.mAverageArterialPressure ); - averageVenousPressure ( vData.mAverageVenousPressure ); uFVolume ( vData.mUFVolume ); uFVolumeActual ( vData.mUFVolumeActual ); uFVolumeTarget ( vData.mUFVolumeTarget ); Index: sources/view/td/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.h =================================================================== diff -u -rea37bc16ab57586729e332c2a9df3299f91012ca -rc16cfee6212ad1ba9f788c41d4a4c916daa43c9c --- sources/view/td/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.h (.../VPostTreatmentAdjustTreatmentLog.h) (revision ea37bc16ab57586729e332c2a9df3299f91012ca) +++ sources/view/td/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.h (.../VPostTreatmentAdjustTreatmentLog.h) (revision c16cfee6212ad1ba9f788c41d4a4c916daa43c9c) @@ -94,8 +94,6 @@ PROPERTY(float , heparinDispenseRate , 0 ) PROPERTY(float , heparinDispenseRateActual , 0 ) PROPERTY(float , heparinDeliveredVolume , 0 ) - PROPERTY(float , averageArterialPressure , 0 ) - PROPERTY(float , averageVenousPressure , 0 ) PROPERTY(float , uFVolume , 0 ) PROPERTY(float , uFVolumeActual , 0 ) PROPERTY(float , uFVolumeTarget , 0 ) @@ -128,7 +126,6 @@ public slots: void doRequest (); - void doExport (); signals: /*!