Index: sources/gui/qml/pages/posttreatment/PostTreatmentReview.qml =================================================================== diff -u -re8d73dd5ebca400248f59bf4c3940ff50dee696a -re73106aa3e46a036269cb95fadc1010eb1bfe818 --- sources/gui/qml/pages/posttreatment/PostTreatmentReview.qml (.../PostTreatmentReview.qml) (revision e8d73dd5ebca400248f59bf4c3940ff50dee696a) +++ sources/gui/qml/pages/posttreatment/PostTreatmentReview.qml (.../PostTreatmentReview.qml) (revision e73106aa3e46a036269cb95fadc1010eb1bfe818) @@ -79,8 +79,8 @@ initial : [ vPostTreatmentAdjustmentTreatmentLog.bloodFlowRate , vPostTreatmentAdjustmentTreatmentLog.dialysateFlowRate , - vPostTreatmentAdjustmentTreatmentLog.dialyzerType , - vPostTreatmentAdjustmentTreatmentLog.dialysateTemp , + vTreatmentRanges.dialyzerTypeOptions[vPostTreatmentAdjustmentTreatmentLog.dialyzerType] , + vPostTreatmentAdjustmentTreatmentLog.dialysateTemperature , vPostTreatmentAdjustmentTreatmentLog.dialysateVolumeUsed ] actual : [ vPostTreatmentAdjustmentTreatmentLog.bloodFlowRateActual , @@ -102,7 +102,39 @@ Variables.unitVolume ] } + ReviewContainer { id: _concentrateSettings + title : qsTr("Concentrate Settings") + width : parent.width + label : [ qsTr("Acid Concentrate Type") , + qsTr("Bicarbonate Cartridge Size") , + qsTr("Potassium Concentration") , + qsTr("Calcium Concentration") , + qsTr("Bicarbonate Concentration") , + qsTr("Sodium Concentration") ] + initial : [ vTreatmentRanges.acidConcentrateOptions[vPostTreatmentAdjustmentTreatmentLog.acidConcentrateType] , + vTreatmentRanges.dryBicabCartridgeSizeOptions[vPostTreatmentAdjustmentTreatmentLog.bicarbonateCartridgeSize] , + vPostTreatmentAdjustmentTreatmentLog.potassiumConcentration , + vPostTreatmentAdjustmentTreatmentLog.calciumConcentration , + vPostTreatmentAdjustmentTreatmentLog.bicarbonateConcentration , + vPostTreatmentAdjustmentTreatmentLog.sodiumConcentration ] + + actual : [ vTreatmentRanges.acidConcentrateOptions[vPostTreatmentAdjustmentTreatmentLog.acidConcentrateTypeActual] , + vTreatmentRanges.dryBicabCartridgeSizeOptions[vPostTreatmentAdjustmentTreatmentLog.bicarbonateCartridgeSizeActual] , + vPostTreatmentAdjustmentTreatmentLog.potassiumConcentrationActual , + vPostTreatmentAdjustmentTreatmentLog.calciumConcentrationActual , + vPostTreatmentAdjustmentTreatmentLog.bicarbonateConcentrationActual , + vPostTreatmentAdjustmentTreatmentLog.sodiumConcentrationActual ] + + precision : Array(label.count).fill(0) + + units : [ "" , + "" , + Variables.unitTextConcentration , + Variables.unitTextConcentration , + Variables.unitTextConcentration , + Variables.unitTextConcentration ] + } } Column { id: _rightColumn @@ -113,7 +145,16 @@ } } - ScrollBar { flickable: _flickable } + ScrollBar { + flickable : _flickable + anchors { + top : _root.top + topMargin : Variables.defaultMargin * 6 + bottom : _root.bottom + bottomMargin : Variables.notificationHeight + Variables.minVGap + right : _root.right + } + } reasonText : vPostTreatmentAdjustmentTreatmentLog.text() informationText : vPostTreatmentAdjustmentTreatmentLog.notification