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 }