Index: sources/gui/qml/pages/posttreatment/PostTreatmentReview.qml =================================================================== diff -u -ra26580f1abb9900e91590bf19c78439c24ad6ffc -rab7cddfe742a1c00e265a37effe043f2c3db8bec --- sources/gui/qml/pages/posttreatment/PostTreatmentReview.qml (.../PostTreatmentReview.qml) (revision a26580f1abb9900e91590bf19c78439c24ad6ffc) +++ sources/gui/qml/pages/posttreatment/PostTreatmentReview.qml (.../PostTreatmentReview.qml) (revision ab7cddfe742a1c00e265a37effe043f2c3db8bec) @@ -16,7 +16,6 @@ // Qt import QtQuick 2.12 - // Project // Qml imports import "qrc:/globals" @@ -28,34 +27,64 @@ * \brief the post treatment Treatment Log review screen */ PostTreatmentBase { id: _root - - Grid { id: _grid - clip: true - + Rectangle { id: _rect anchors { top : header.bottom topMargin : Variables.defaultMargin * 2 bottom : _root.bottom bottomMargin : Variables.notificationHeight + Variables.minVGap - horizontalCenter: parent.horizontalCenter + left : parent.left + leftMargin : Variables.defaultMargin * 4 + right : parent.right + rightMargin : Variables.defaultMargin * 4 + } - flow : Grid.TopToBottom - columns : 3 - rows : _repeater.model.count / columns - rowSpacing : 10 - columnSpacing : Variables.defaultMargin + color : Colors.panelBackgroundColor + radius : 9 - Repeater { id: _repeater - model : vPostTreatmentAdjustmentTreatmentLog.parametersTitle + border { + width : Variables.panelBorderWidth + color : Colors.panelBorderColor + } - LabelUnitText { id: container - height : 67 - width : 575 - label : modelData - unit : vPostTreatmentAdjustmentTreatmentLog.parametersUnit[index] ?? "" - value : vPostTreatmentAdjustmentTreatmentLog.parametersText[index] ?? "" - textAlignment: Text.AlignJustify + 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 + } + } } } }