Index: sources/gui/qml/pages/posttreatment/PostTreatmentReview.qml =================================================================== diff -u -re595a959b32e1bd1532b942481230a09496d6f08 -re158ea655ffbc1208d2f3c837a018b972fac2e8f --- sources/gui/qml/pages/posttreatment/PostTreatmentReview.qml (.../PostTreatmentReview.qml) (revision e595a959b32e1bd1532b942481230a09496d6f08) +++ sources/gui/qml/pages/posttreatment/PostTreatmentReview.qml (.../PostTreatmentReview.qml) (revision e158ea655ffbc1208d2f3c837a018b972fac2e8f) @@ -30,10 +30,93 @@ property int colSpacing : Variables.defaultMargin property int columnWidth: ( _flickable.width / 2 ) - (colSpacing) - Flickable { id: _flickable + component LegendItem: Row { id: _legendItem + property string color : Colors.offWhite + property string text : "" + spacing: 10 + + Rectangle { + anchors.verticalCenter: parent.verticalCenter + height : 10 + width : height + radius : height + color : _legendItem.color + } + + Text { + color : _legendItem.color + text : _legendItem.text + font.pixelSize : Fonts.fontPixelDialogText + } + } + + Row { id: _topRow + spacing : Variables.defaultMargin + height : 75 + anchors { top : header.bottom - topMargin : Variables.defaultMargin * 2 + topMargin : Variables.defaultMargin / 2 + left : parent.left + leftMargin : Variables.defaultMargin * 4 + right : parent.right + rightMargin : Variables.defaultMargin * 4 + } + + Item { id: _legend + width: _root.columnWidth + height: _topRow.height + + LegendItem { id: _prescribed + anchors { + right : _actual.left + rightMargin : Variables.defaultMargin + bottom : parent.bottom + } + text : qsTr("Prescribed Values") + } + + LegendItem { id: _actual + anchors { + right : parent.right + bottom : parent.bottom + } + text : qsTr("Actual Values") + color : Colors.ufVolumeGoalText + } + } + + + Item { id: _qrContainer + width: _root.columnWidth + height: _topRow.height + + QRCode { id: _qrCode + anchors { + left: parent.left + } + + qrcode : vPostTreatmentAdjustmentTreatmentLog.txCode + clear : ! _root.visible + } + + Text { id: _txCodeText + anchors { + left : _qrCode.right + leftMargin : Variables.defaultMargin / 2 + bottom : _qrCode.bottom + } + text : vPostTreatmentAdjustmentTreatmentLog.txCode ? qsTr("Tx Code: ") + vPostTreatmentAdjustmentTreatmentLog.txCode : " " + color : "#DBE9FA" + font.pixelSize : Fonts.fontPixelButton + } + } + } + + Flickable { id: _flickable + anchors { + top : _topRow.bottom + topMargin : Variables.defaultMargin bottom : _root.bottom bottomMargin : Variables.notificationHeight + Variables.minVGap left : parent.left