Index: sources/gui/GuiGlobals.h =================================================================== diff -u -r3da801fd23f007886f7fda5e9b45d17d565150d2 -re8d73dd5ebca400248f59bf4c3940ff50dee696a --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 3da801fd23f007886f7fda5e9b45d17d565150d2) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision e8d73dd5ebca400248f59bf4c3940ff50dee696a) @@ -323,8 +323,8 @@ ID_AdjustDisposablesRemovalConfirmRsp = 0x9500, // 149 // Treatment Log Adjs - ID_AdjustTreatmentLogReq = 0x750F, // 117 //// ----- @CRAPIZED: had to change to avoid duplication - ID_AdjustTreatmentLogRsp = 0x760F, // 118 //// ----- @CRAPIZED: had to change to avoid duplication + ID_AdjustTreatmentLogReq = 0xA900, // 166 + ID_AdjustTreatmentLogRsp = 0xAA00, // 167 // Treatment Log Data ID_TreatmentLogAvrgeData = 0x940F, // 148 //// ----- @CRAPIZED: had to change to avoid duplication ID_TreatmentLogAlarmData = 0x6A00, // 106 //// ----- @LEAHIZED Index: sources/gui/qml/components/ReviewContainer.qml =================================================================== diff -u -r14d7345260cdc47d8308da4fff127fbd97837fe4 -re8d73dd5ebca400248f59bf4c3940ff50dee696a --- sources/gui/qml/components/ReviewContainer.qml (.../ReviewContainer.qml) (revision 14d7345260cdc47d8308da4fff127fbd97837fe4) +++ sources/gui/qml/components/ReviewContainer.qml (.../ReviewContainer.qml) (revision e8d73dd5ebca400248f59bf4c3940ff50dee696a) @@ -75,7 +75,7 @@ Text { id: _initial text : typeof _root.initial[index] === "number" ? _root.initial[index].toFixed(_root.precision[index]) ?? "" : - _root.initial[index] + _root.initial[index] ?? "" color : Colors.offWhite font.pixelSize : Fonts.fontPixelValueControl verticalAlignment : Text.AlignVCenter @@ -84,7 +84,7 @@ Text { id: _actual text : typeof _root.actual[index] === "number" ? _root.actual[index].toFixed(_root.precision[index]) ?? "" : - _root.actual[index] + _root.actual[index] ?? "" color : Colors.ufVolumeGoalText font.pixelSize : Fonts.fontPixelValueControl verticalAlignment : Text.AlignVCenter Index: sources/gui/qml/pages/posttreatment/PostTreatmentReview.qml =================================================================== diff -u -r14d7345260cdc47d8308da4fff127fbd97837fe4 -re8d73dd5ebca400248f59bf4c3940ff50dee696a --- sources/gui/qml/pages/posttreatment/PostTreatmentReview.qml (.../PostTreatmentReview.qml) (revision 14d7345260cdc47d8308da4fff127fbd97837fe4) +++ sources/gui/qml/pages/posttreatment/PostTreatmentReview.qml (.../PostTreatmentReview.qml) (revision e8d73dd5ebca400248f59bf4c3940ff50dee696a) @@ -61,8 +61,8 @@ label : [ qsTr("Patient ID") , qsTr("Secondary Patient ID")] - initial : [ "initial 1" , - "initial 2" ] + initial : [ vPostTreatmentAdjustmentTreatmentLog.patientID , + vPostTreatmentAdjustmentTreatmentLog.secondaryPatientID ] actual : [ "" , "" ] units : [ "" , "" ] @@ -77,28 +77,32 @@ qsTr("Dialysate Temperature") , qsTr("Dialysate Volume Used") ] - initial : [ vTreatmentCreate.bloodFlowRate , - vTreatmentCreate.dialysateFlowRate , - "ifabef" , - vTreatmentCreate.dialysateTemp , - "alot " ] + initial : [ vPostTreatmentAdjustmentTreatmentLog.bloodFlowRate , + vPostTreatmentAdjustmentTreatmentLog.dialysateFlowRate , + vPostTreatmentAdjustmentTreatmentLog.dialyzerType , + vPostTreatmentAdjustmentTreatmentLog.dialysateTemp , + vPostTreatmentAdjustmentTreatmentLog.dialysateVolumeUsed ] - actual : [ "BFR 1" , - "DFR 1" , - "" , - "Temp1" , - "" ] - precision : [0,0,0,Variables.dialysateTempPrecision , Variables.ultrafiltrationPrecision] + actual : [ vPostTreatmentAdjustmentTreatmentLog.bloodFlowRateActual , + vPostTreatmentAdjustmentTreatmentLog.dialysateFlowRateActual , + "" , // leave empty + vPostTreatmentAdjustmentTreatmentLog.dialysateTemperatureActual , + "" ] // leave empty + precision : [ 0, + 0, + 0, + Variables.dialysateTempPrecision, + Variables.ultrafiltrationPrecision ] + units : [ Variables.unitTextFlowRate , Variables.unitTextFlowRate , "" , Variables.unitTextTemperature , Variables.unitVolume ] - - } + } Column { id: _rightColumn @@ -111,69 +115,6 @@ ScrollBar { flickable: _flickable } - -// Rectangle { id: _rect -// anchors { -// top : header.bottom -// topMargin : Variables.defaultMargin * 2 -// bottom : _root.bottom -// bottomMargin : Variables.notificationHeight + Variables.minVGap -// left : parent.left -// leftMargin : Variables.defaultMargin * 4 -// right : parent.right -// rightMargin : Variables.defaultMargin * 4 - -// } - -// color : Colors.panelBackgroundColor -// radius : 9 - -// border { -// width : Variables.panelBorderWidth -// color : Colors.panelBorderColor -// } - -// Grid { id: _grid -// property int cellHeight : parent.height / 10 -// property int cellWidth : parent.width / 3 - ( Variables.defaultMargin ) // subtract columnSpacing - -// clip: true -// anchors.fill: parent -// anchors.leftMargin: Variables.defaultMargin -// anchors.rightMargin: Variables.defaultMargin - -// flow : Grid.TopToBottom -// columns : 3 -// rows : _repeater.model.count / columns -// rowSpacing : 0 -// columnSpacing : Variables.defaultMargin - -// Repeater { id: _repeater -// model : vPostTreatmentAdjustmentTreatmentLog.parametersTitle - -// LabelUnitText { id: _container -// height : _grid.cellHeight -// width : _grid.cellWidth -// label : modelData -// unit : vPostTreatmentAdjustmentTreatmentLog.parametersUnit[index] ?? "" -// value : "123" // vPostTreatmentAdjustmentTreatmentLog.parametersText[index] ?? "" -// textAlignment: Text.AlignJustify -// radius : 0 -// color : Colors.transparent -// border.width: 0 - -// Line { -// anchors.bottom: parent.bottom -// anchors.left : parent.left -// anchors.right : parent.right -// visible: index !== 9 && index !== 19 && index !== 29 -// color: Colors.panelBorderColor -// } -// } -// } -// } -// } - reasonText : vPostTreatmentAdjustmentTreatmentLog.text() informationText : vPostTreatmentAdjustmentTreatmentLog.notification } Index: sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.cpp =================================================================== diff -u -r14d7345260cdc47d8308da4fff127fbd97837fe4 -re8d73dd5ebca400248f59bf4c3940ff50dee696a --- sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.cpp (.../MPostTreatmentAdjustTreatmentLogResponse.cpp) (revision 14d7345260cdc47d8308da4fff127fbd97837fe4) +++ sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.cpp (.../MPostTreatmentAdjustTreatmentLogResponse.cpp) (revision e8d73dd5ebca400248f59bf4c3940ff50dee696a) @@ -28,8 +28,8 @@ _data.mTreatmentDurationActual .value, _data.mAcidConcentrateType .value, _data.mAcidConcentrateTypeActual .value, - _data.mBicarbonateConcentrateType .value, - _data.mBicarbonateConcentrateTypeActual .value, + _data.mBicarbonateCartridgeSize .value, + _data.mBicarbonateCartridgeSizeActual .value, _data.mPotassiumConcentration .value, _data.mPotassiumConcentrationActual .value, _data.mCalciumConcentration .value, @@ -98,8 +98,8 @@ if ( ! GetValue(vByteArray, index, _data.mTreatmentDurationActual )) goto lError; if ( ! GetValue(vByteArray, index, _data.mAcidConcentrateType )) goto lError; if ( ! GetValue(vByteArray, index, _data.mAcidConcentrateTypeActual )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mBicarbonateConcentrateType )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mBicarbonateConcentrateTypeActual )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mBicarbonateCartridgeSize )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mBicarbonateCartridgeSizeActual )) goto lError; if ( ! GetValue(vByteArray, index, _data.mPotassiumConcentration )) goto lError; if ( ! GetValue(vByteArray, index, _data.mPotassiumConcentrationActual )) goto lError; if ( ! GetValue(vByteArray, index, _data.mCalciumConcentration )) goto lError; Index: sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.h =================================================================== diff -u -r14d7345260cdc47d8308da4fff127fbd97837fe4 -re8d73dd5ebca400248f59bf4c3940ff50dee696a --- sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.h (.../MPostTreatmentAdjustTreatmentLogResponse.h) (revision 14d7345260cdc47d8308da4fff127fbd97837fe4) +++ sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.h (.../MPostTreatmentAdjustTreatmentLogResponse.h) (revision e8d73dd5ebca400248f59bf4c3940ff50dee696a) @@ -46,8 +46,8 @@ * | 08 - (U32) | \ref Data::mTreatmentDurationActual * | 09 - (U32) | \ref Data::mAcidConcentrateType * | 10 - (U32) | \ref Data::mAcidConcentrateTypeActual - * | 11 - (U32) | \ref Data::mBicarbonateConcentrateType - * | 12 - (U32) | \ref Data::mBicarbonateConcentrateTypeActual + * | 11 - (U32) | \ref Data::mBicarbonateCartridgeSize + * | 12 - (U32) | \ref Data::mBicarbonateCartridgeSizeActual * | 13 - (U32) | \ref Data::mPotassiumConcentration * | 14 - (U32) | \ref Data::mPotassiumConcentrationActual * | 15 - (U32) | \ref Data::mCalciumConcentration @@ -131,8 +131,8 @@ Types::U32 mTreatmentDurationActual ; Types::U32 mAcidConcentrateType ; Types::U32 mAcidConcentrateTypeActual ; - Types::U32 mBicarbonateConcentrateType ; - Types::U32 mBicarbonateConcentrateTypeActual ; + Types::U32 mBicarbonateCartridgeSize ; + Types::U32 mBicarbonateCartridgeSizeActual ; Types::U32 mPotassiumConcentration ; Types::U32 mPotassiumConcentrationActual ; Types::U32 mCalciumConcentration ; @@ -204,8 +204,8 @@ quint32 mTreatmentDurationActual = 0; quint32 mAcidConcentrateType = 0; quint32 mAcidConcentrateTypeActual = 0; - quint32 mBicarbonateConcentrateType = 0; - quint32 mBicarbonateConcentrateTypeActual = 0; + quint32 mBicarbonateCartridgeSize = 0; + quint32 mBicarbonateCartridgeSizeActual = 0; quint32 mPotassiumConcentration = 0; quint32 mPotassiumConcentrationActual = 0; quint32 mCalciumConcentration = 0; Index: sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.cpp =================================================================== diff -u -r14d7345260cdc47d8308da4fff127fbd97837fe4 -re8d73dd5ebca400248f59bf4c3940ff50dee696a --- sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.cpp (.../VPostTreatmentAdjustTreatmentLog.cpp) (revision 14d7345260cdc47d8308da4fff127fbd97837fe4) +++ sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.cpp (.../VPostTreatmentAdjustTreatmentLog.cpp) (revision e8d73dd5ebca400248f59bf4c3940ff50dee696a) @@ -89,8 +89,8 @@ treatmentDurationActual ( vData.mTreatmentDurationActual ); acidConcentrateType ( vData.mAcidConcentrateType ); acidConcentrateTypeActual ( vData.mAcidConcentrateTypeActual ); - bicarbonateConcentrateType ( vData.mBicarbonateConcentrateType ); - bicarbonateConcentrateTypeActual ( vData.mBicarbonateConcentrateTypeActual ); + bicarbonateCartridgeSize ( vData.mBicarbonateCartridgeSize ); + bicarbonateCartridgeSizeActual ( vData.mBicarbonateCartridgeSizeActual ); potassiumConcentration ( vData.mPotassiumConcentration ); potassiumConcentrationActual ( vData.mPotassiumConcentrationActual ); calciumConcentration ( vData.mCalciumConcentration ); Index: sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.h =================================================================== diff -u -r14d7345260cdc47d8308da4fff127fbd97837fe4 -re8d73dd5ebca400248f59bf4c3940ff50dee696a --- sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.h (.../VPostTreatmentAdjustTreatmentLog.h) (revision 14d7345260cdc47d8308da4fff127fbd97837fe4) +++ sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.h (.../VPostTreatmentAdjustTreatmentLog.h) (revision e8d73dd5ebca400248f59bf4c3940ff50dee696a) @@ -61,8 +61,8 @@ PROPERTY(quint32 , treatmentDurationActual , 0 ) PROPERTY(quint32 , acidConcentrateType , 0 ) PROPERTY(quint32 , acidConcentrateTypeActual , 0 ) - PROPERTY(quint32 , bicarbonateConcentrateType , 0 ) - PROPERTY(quint32 , bicarbonateConcentrateTypeActual , 0 ) + PROPERTY(quint32 , bicarbonateCartridgeSize , 0 ) + PROPERTY(quint32 , bicarbonateCartridgeSizeActual , 0 ) PROPERTY(quint32 , potassiumConcentration , 0 ) PROPERTY(quint32 , potassiumConcentrationActual , 0 ) PROPERTY(quint32 , calciumConcentration , 0 )