Index: leahi.qrc
===================================================================
diff -u -r14d7345260cdc47d8308da4fff127fbd97837fe4 -r3365ef23a278ef93f2bf6ff10b5637ad4f1b9d83
--- leahi.qrc (.../leahi.qrc) (revision 14d7345260cdc47d8308da4fff127fbd97837fe4)
+++ leahi.qrc (.../leahi.qrc) (revision 3365ef23a278ef93f2bf6ff10b5637ad4f1b9d83)
@@ -201,6 +201,7 @@
sources/gui/qml/components/SDCInfo.qml
sources/gui/qml/components/BaseChart.qml
sources/gui/qml/components/ReviewContainer.qml
+ sources/gui/qml/components/LegendItem.qml
sources/gui/qml/compounds/PressureRangeSlider.qml
Index: sources/gui/qml/components/LegendItem.qml
===================================================================
diff -u
--- sources/gui/qml/components/LegendItem.qml (revision 0)
+++ sources/gui/qml/components/LegendItem.qml (revision 3365ef23a278ef93f2bf6ff10b5637ad4f1b9d83)
@@ -0,0 +1,26 @@
+// Qt
+import QtQuick 2.15
+
+// Qml imports
+import "qrc:/globals"
+
+Row { id: _root
+ property string color : Colors.offWhite
+ property string text : ""
+ spacing: 10
+
+ Rectangle {
+ anchors.verticalCenter: _root.verticalCenter
+ height : 10
+ width : height
+ radius : height
+ color : _root.color
+ }
+
+ Text {
+ color : _root.color
+ text : _root.text
+ font.pixelSize : Fonts.fontPixelDialogText
+ font.weight : Font.Medium
+ }
+}
Index: sources/gui/qml/globals/Variables.qml
===================================================================
diff -u -re595a959b32e1bd1532b942481230a09496d6f08 -r3365ef23a278ef93f2bf6ff10b5637ad4f1b9d83
--- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision e595a959b32e1bd1532b942481230a09496d6f08)
+++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 3365ef23a278ef93f2bf6ff10b5637ad4f1b9d83)
@@ -344,5 +344,5 @@
readonly property string unitTextConcentration : qsTr("mEq/L")
readonly property string unitTextHeparinConcentration : qsTr("IU/mL")
// - hepatitis
- readonly property string hepatitis : qsTr("HbsAg")
+ readonly property string unitHepatitis : qsTr("HbsAg")
}
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 ]
}
}
}
Index: sources/gui/qml/pages/posttreatment/PostTreatmentStack.qml
===================================================================
diff -u -re158ea655ffbc1208d2f3c837a018b972fac2e8f -r3365ef23a278ef93f2bf6ff10b5637ad4f1b9d83
--- sources/gui/qml/pages/posttreatment/PostTreatmentStack.qml (.../PostTreatmentStack.qml) (revision e158ea655ffbc1208d2f3c837a018b972fac2e8f)
+++ sources/gui/qml/pages/posttreatment/PostTreatmentStack.qml (.../PostTreatmentStack.qml) (revision 3365ef23a278ef93f2bf6ff10b5637ad4f1b9d83)
@@ -150,8 +150,7 @@
PostTreatmentReview { id: _postTreatmentReview
objectName :"_postTreatmentReview"
- onVisibleChanged : if (visible) { stackStepIndex = PostTreatmentStack.Review;
- vPostTreatmentAdjustmentTreatmentLog.doRequest() }
+ onVisibleChanged : if (visible) { stackStepIndex = PostTreatmentStack.Review; }
}
PostTreatmentBase { id: _postTreatmentDisinfection
@@ -189,6 +188,7 @@
function onAdjustmentTriggered ( vValue ) {
if ( vPostTreatmentAdjustmentDisposablesRemovalConfirm.adjustment_Accepted ) {
_postTreatmentRemove.reasonText = ""
+ vPostTreatmentAdjustmentTreatmentLog.doRequest()
page( _postTreatmentReview )
} else {
_postTreatmentRemove.reasonText = vPostTreatmentAdjustmentDisposablesRemovalConfirm.text()
Index: sources/view/td/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.cpp
===================================================================
diff -u -re595a959b32e1bd1532b942481230a09496d6f08 -r3365ef23a278ef93f2bf6ff10b5637ad4f1b9d83
--- sources/view/td/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.cpp (.../VPostTreatmentAdjustTreatmentLog.cpp) (revision e595a959b32e1bd1532b942481230a09496d6f08)
+++ sources/view/td/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.cpp (.../VPostTreatmentAdjustTreatmentLog.cpp) (revision 3365ef23a278ef93f2bf6ff10b5637ad4f1b9d83)
@@ -37,12 +37,8 @@
ACTION_VIEW_CONNECTION(TreatmentLogAlarmData);
ACTION_VIEW_CONNECTION(TreatmentLogEventData);
-// connect(&_TreatmentLog , &TreatmentLog::didTxCodeReceive,
-// [=](const QString &vTxCode) { txCode( vTxCode ); } );
-
connect(&_TreatmentLog , &TreatmentLog::didTxCodeReceive,
- [=](const QString &vTxCode) { txCode( vTxCode + " Test Code 123-456" ); } );
-// [=](const QString &vTxCode) { txCode( vTxCode ); } ); // TODO Update
+ [=](const QString &vTxCode) { txCode( vTxCode ); } );
connect(&_TreatmentLog , &TreatmentLog::didNotification,
[=](const QString &vNotification) { notification(vNotification); } );