Index: sources/gui/qml/pages/posttreatment/PostTreatmentReview.qml =================================================================== diff -u -rde9f5f5407ac3500f94b9e077e98dc37b56b8ce7 -r3365ef23a278ef93f2bf6ff10b5637ad4f1b9d83 --- sources/gui/qml/pages/posttreatment/PostTreatmentReview.qml (.../PostTreatmentReview.qml) (revision de9f5f5407ac3500f94b9e077e98dc37b56b8ce7) +++ sources/gui/qml/pages/posttreatment/PostTreatmentReview.qml (.../PostTreatmentReview.qml) (revision 3365ef23a278ef93f2bf6ff10b5637ad4f1b9d83) @@ -30,27 +30,6 @@ property int colSpacing : Variables.defaultMargin property int columnWidth: ( _flickable.width / 2 ) - (colSpacing) - 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 - font.weight : Font.Medium - } - } - Row { id: _topRow spacing : Variables.defaultMargin height : 75 @@ -174,17 +153,17 @@ vPostTreatmentAdjustmentTreatmentLog.dialysateTemperatureActual , "" ] // leave empty - precision : [ 0, - 0, - 0, - Variables.dialysateTempPrecision, - Variables.ultrafiltrationPrecision ] - units : [ Variables.unitTextFlowRate , Variables.unitTextFlowRate , "" , Variables.unitTextTemperature , Variables.unitVolume ] + + precision : [ 0, + 0, + 0, + Variables.dialysateTempPrecision, + Variables.ultrafiltrationPrecision ] } ReviewContainer { id: _concentrateSettings @@ -258,17 +237,17 @@ "" , vPostTreatmentAdjustmentTreatmentLog.heparinDeliveryDurationActual ] - precision : [ 0 , - Variables.heparinPrecision , - Variables.heparinPrecision , - Variables.heparinPrecision , - 0 ] - units : [ Variables.unitHeparinType , Variables.unitTextFluid , Variables.unitTextDispensingRate, Variables.unitTextFluid , Variables.unitTextMins ] + + precision : [ 0 , + Variables.heparinPrecision , + Variables.heparinPrecision , + Variables.heparinPrecision , + 0 ] } } @@ -328,15 +307,15 @@ vPostTreatmentAdjustmentTreatmentLog.uFRateActual , "" ] - precision : [ Variables.ultrafiltrationPrecision , - Variables.ultrafiltrationPrecision , - Variables.ultrafiltrationPrecision , - Variables.ultrafiltrationPrecision ] - units : [ Variables.unitVolume , Variables.unitVolume , Variables.unitTextRate , Variables.unitTextRate ] + + precision : [ Variables.ultrafiltrationPrecision , + Variables.ultrafiltrationPrecision , + Variables.ultrafiltrationPrecision , + Variables.ultrafiltrationPrecision ] } ReviewContainer { id: _substitutionFluid @@ -358,15 +337,15 @@ vPostTreatmentAdjustmentTreatmentLog.substitutionRateActual , "" ] - precision : [ Variables.substitutionPrecision , - Variables.substitutionPrecision , - Variables.substitutionPrecision , - Variables.substitutionPrecision ] - units : [ Variables.unitVolume , Variables.unitVolume , Variables.unitTextFlowRate , Variables.unitTextFlowRate ] + + precision : [ Variables.substitutionPrecision , + Variables.substitutionPrecision , + Variables.substitutionPrecision , + Variables.substitutionPrecision ] } ReviewContainer { id: _isolatedUltrafiltration @@ -388,15 +367,15 @@ vPostTreatmentAdjustmentTreatmentLog.isoUfRateActual , "" ] - precision : [ Variables.ultrafiltrationPrecision , - Variables.ultrafiltrationPrecision , - Variables.ultrafiltrationPrecision , - Variables.ultrafiltrationPrecision ] - units : [ Variables.unitVolume , Variables.unitVolume , Variables.unitTextRate , Variables.unitTextRate ] + + precision : [ Variables.ultrafiltrationPrecision , + Variables.ultrafiltrationPrecision , + Variables.ultrafiltrationPrecision , + Variables.ultrafiltrationPrecision ] } ReviewContainer { id: _additionalSettings @@ -410,10 +389,12 @@ vTreatmentRanges.hepatitisStatus[vPostTreatmentAdjustmentTreatmentLog.hepatitisStatus] ] actual : [ "" , "" ] + + units : [ Variables.unitTextChlorine , + Variables.unitHepatitis ] + precision : [ Variables.waterSamplePrecision , 0 ] - units : [ Variables.unitTextChlorine , - Variables.hepatitis ] } } }