Index: sources/gui/qml/pages/posttreatment/PostTreatmentReview.qml =================================================================== diff -u -r627062628b60e4d512ee8830c2dbc23eef02fe28 -r735e9e89a99157992fb1ec6e3f0d2953e564346d --- sources/gui/qml/pages/posttreatment/PostTreatmentReview.qml (.../PostTreatmentReview.qml) (revision 627062628b60e4d512ee8830c2dbc23eef02fe28) +++ sources/gui/qml/pages/posttreatment/PostTreatmentReview.qml (.../PostTreatmentReview.qml) (revision 735e9e89a99157992fb1ec6e3f0d2953e564346d) @@ -16,6 +16,7 @@ // Qt import QtQuick 2.12 + // Project // Qml imports import "qrc:/globals" @@ -27,154 +28,97 @@ * \brief the post treatment Treatment Log review screen */ PostTreatmentBase { id: _root - property int colSpacing: Variables.defaultMargin + signal itemClicked(int vIndex) - Flickable { id: _flickable - 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 + readonly property alias itemsText : _parametersGrid.itemsText + readonly property alias itemsValue: _parametersGrid.itemsValue + readonly property alias itemsUnit : _parametersGrid.itemsUnit - } + ScrollBar { + anchors.fill: _flickable + flickable : _flickable + backColor : Colors.backgroundDialog + } - contentWidth : width - contentHeight : _row.height - clip : true - - Row { id: _row - width : _flickable.width - spacing : Variables.defaultMargin - - Column { id: _leftColumn - width : _flickable.width / 2 - spacing : _root.colSpacing - - ReviewContainer { id: _patientInfo - title : qsTr("Patient Information") - width : parent.width - - label : [ qsTr("Patient ID") , - qsTr("Secondary Patient ID")] - - initial : [ "initial 1" , - "initial 2" ] - - actual : [ "" , "" ] - units : [ "" , "" ] - } - - 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 ] - - - } - + Label { id: _txCode + property string empty : "..." + property string txCode : vPostTreatmentAdjustmentTreatmentLog.txCode + Timer { id: _waitTxCodeTimer + property int count: 0 + interval: 1000 + repeat : true + running : _txCode.visible && ! _txCode.txCode + onTriggered: { + _txCode.empty = ".".repeat( count ++ ) + if ( count == 4 ) count = 0 } + } - Column { id: _rightColumn - width : _flickable.width / 2 - spacing : _root.colSpacing + anchors.bottom : _flickable.top + anchors.left : _flickable.left + width : _flickable.width + text : qsTr("Code: ") + ( txCode ? txCode : empty ) + font.pixelSize : Fonts.fontPixelButton + } - } - } + QRCode { id: _qrCode + // removed for the P1 release, since the code had a big change and cannot be removed entirely + // added for the P1B release + visible : true + anchors.bottom : _flickable.top + anchors.right : _flickable.right + anchors.margins : 15 + qrcode : vPostTreatmentAdjustmentTreatmentLog.txCode + clear : ! _root.visible } - ScrollBar { flickable: _flickable } + Flickable { id: _flickable + clip: true + anchors { + top : _root.title.bottom + topMargin : Variables.minVGap * 2 // * 2 : it was too close to title and also better with rows not half cut. + bottom : _root.bottom + bottomMargin : Variables.notificationHeight + Variables.minVGap + horizontalCenter: parent.horizontalCenter + } + width : parent.width - Variables.minVGap2 * 2 // * 2 : for each side + contentWidth : width + contentHeight: _parametersGrid.height + TouchGrid { id: _parametersGrid + // TODO: fixed only for this list since it has been used other places. + // investigate more to move these readonly properties in the TouchGrid component. + readonly property int _itemCount: vPostTreatmentAdjustmentTreatmentLog.parametersTitle.length + readonly property int _colCount : 2 + readonly property int _rowCount : Math.ceil( _itemCount / _colCount ) -// 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 -// } -// } -// } -// } -// } - + height : _rowCount * ( rowSpacing + itemHeight ) + itemHeight + width : parent.width + colCount : _colCount + rowCount : _rowCount + itemWidth : 575 + rowSpacing : 0 + colSpacing : 50 + lineColor : Colors.backgroundMain + itemsText : vPostTreatmentAdjustmentTreatmentLog.parametersTitle + itemsValue : vPostTreatmentAdjustmentTreatmentLog.parametersText + itemsUnit : vPostTreatmentAdjustmentTreatmentLog.parametersUnit + itemsValueLeftMargin : 350 // if decreased may be covered by title + itemsUnitLeftMargin : 470 // if increased will be covered by chevron if touchable + // Note: to make the item touchable + // set the touchable: true + // and set the index ot the touchable item in the itemsTouchable: [] list to 1 + // like displayed below. + touchable : false + // itemsTouchable : [ + // 0,0,0,0,0,0,0,0,0,0, + // 0,0,0,0,0,0,0,0,0,0, + // 0,0,0,0,0,0,0,0,0,0, + // 0,0,0,0,0,0,0,0,0,0, + // ] + onItemClicked: _root.itemClicked(vIndex) + } + } reasonText : vPostTreatmentAdjustmentTreatmentLog.text() informationText : vPostTreatmentAdjustmentTreatmentLog.notification } -