Index: sources/gui/qml/pages/posttreatment/PostTreatmentReview.qml =================================================================== diff -u -rab7cddfe742a1c00e265a37effe043f2c3db8bec -r627062628b60e4d512ee8830c2dbc23eef02fe28 --- sources/gui/qml/pages/posttreatment/PostTreatmentReview.qml (.../PostTreatmentReview.qml) (revision ab7cddfe742a1c00e265a37effe043f2c3db8bec) +++ sources/gui/qml/pages/posttreatment/PostTreatmentReview.qml (.../PostTreatmentReview.qml) (revision 627062628b60e4d512ee8830c2dbc23eef02fe28) @@ -27,7 +27,9 @@ * \brief the post treatment Treatment Log review screen */ PostTreatmentBase { id: _root - Rectangle { id: _rect + property int colSpacing: Variables.defaultMargin + + Flickable { id: _flickable anchors { top : header.bottom topMargin : Variables.defaultMargin * 2 @@ -40,55 +42,138 @@ } - color : Colors.panelBackgroundColor - radius : 9 + contentWidth : width + contentHeight : _row.height + clip : true - border { - width : Variables.panelBorderWidth - color : Colors.panelBorderColor - } + Row { id: _row + width : _flickable.width + spacing : Variables.defaultMargin - Grid { id: _grid - property int cellHeight : parent.height / 10 - property int cellWidth : parent.width / 3 - ( Variables.defaultMargin ) // subtract columnSpacing + Column { id: _leftColumn + width : _flickable.width / 2 + spacing : _root.colSpacing - clip: true - anchors.fill: parent - anchors.leftMargin: Variables.defaultMargin - anchors.rightMargin: Variables.defaultMargin + ReviewContainer { id: _patientInfo + title : qsTr("Patient Information") + width : parent.width - flow : Grid.TopToBottom - columns : 3 - rows : _repeater.model.count / columns - rowSpacing : 0 - columnSpacing : Variables.defaultMargin + label : [ qsTr("Patient ID") , + qsTr("Secondary Patient ID")] - Repeater { id: _repeater - model : vPostTreatmentAdjustmentTreatmentLog.parametersTitle + initial : [ "initial 1" , + "initial 2" ] - 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 + actual : [ "" , "" ] + units : [ "" , "" ] + } - Line { - anchors.bottom: parent.bottom - anchors.left : parent.left - anchors.right : parent.right - visible: index !== 9 && index !== 19 && index !== 29 - color: Colors.panelBorderColor - } + ReviewContainer { id: _bloodFlowDiaysate + title : qsTr("Blood Flow Rate and Dialysate Settings") + width : parent.width + label : [ qsTr("Blood Flow Rate") , + qsTr("Dialysis Flow Rate") , + qsTr("Dialyzer Type") , + qsTr("Dialysate Temperature") , + qsTr("Dialysate Volume Used") ] + + initial : [ vTreatmentCreate.bloodFlowRate , + vTreatmentCreate.dialysateFlowRate , + "ifabef" , + vTreatmentCreate.dialysateTemp , + "alot " ] + + actual : [ "BFR 1" , + "DFR 1" , + "" , + "Temp1" , + "" ] + precision : [0,0,0,Variables.dialysateTempPrecision , Variables.ultrafiltrationPrecision] + + units : [ Variables.unitTextFlowRate , + Variables.unitTextFlowRate , + "" , + Variables.unitTextTemperature , + Variables.unitVolume ] + + } + } + + Column { id: _rightColumn + width : _flickable.width / 2 + spacing : _root.colSpacing + + } } } + 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 }