Index: leahi.qrc
===================================================================
diff -u -r735e9e89a99157992fb1ec6e3f0d2953e564346d -r6825a57fe430253271712f0afbac14d046b44794
--- leahi.qrc (.../leahi.qrc) (revision 735e9e89a99157992fb1ec6e3f0d2953e564346d)
+++ leahi.qrc (.../leahi.qrc) (revision 6825a57fe430253271712f0afbac14d046b44794)
@@ -131,6 +131,7 @@
resources/images/recirculate_main.png
resources/images/bloodpump.png
resources/images/edit_yellow.png
+ resources/images/leahi-console.png
sources/gui/qml/components/MainMenu.qml
Index: sources/gui/qml/pages/posttreatment/PostTreatmentDisinfection.qml
===================================================================
diff -u -r735e9e89a99157992fb1ec6e3f0d2953e564346d -r6825a57fe430253271712f0afbac14d046b44794
--- sources/gui/qml/pages/posttreatment/PostTreatmentDisinfection.qml (.../PostTreatmentDisinfection.qml) (revision 735e9e89a99157992fb1ec6e3f0d2953e564346d)
+++ sources/gui/qml/pages/posttreatment/PostTreatmentDisinfection.qml (.../PostTreatmentDisinfection.qml) (revision 6825a57fe430253271712f0afbac14d046b44794)
@@ -1,5 +1,79 @@
-import QtQuick 2.0
+// Qt
+import QtQuick 2.12
-Item {
+// Project
+// Qml imports
+import "qrc:/globals"
+import "qrc:/components"
+import "qrc:/compounds"
+import "qrc:/pages/posttreatment"
+
+
+PostTreatmentBase { id: _root
+ signal itemClicked(int vIndex)
+
+ Row { id: _row
+ anchors.fill : parent
+ anchors.margins : Variables.defaultMargin * 8
+ width : parent.width
+ height : parent.height
+ spacing : Variables.defaultMargin
+
+ Item { id: _column
+ width : parent.width / 2
+ height : parent.height
+
+ Text { id: _descriptionText
+ anchors {
+ left : parent.left
+ top : parent.top
+ topMargin : Variables.defaultMargin * 5
+ }
+
+ text : qsTr("Disinfect the machine per your clinic's instructions.")
+ color : Colors.offWhite
+ font.pixelSize : Fonts.fontPixelTextRectTitle
+ width : parent.width
+ height : 50
+ }
+
+ TouchGrid { id: _grid
+ anchors {
+ left : parent.left
+ top : _descriptionText.bottom
+ topMargin : Variables.defaultMargin * 2
+ }
+ alignCenter : false
+ onItemClicked : _root.itemClicked(vIndex)
+ rowCount : itemsText.count ?? 0
+ colCount : 1
+ itemWidth : _root.width / 2.5
+ itemHeight : Variables.createRxLabelUnitContainerHeight
+ lineThickness : 0
+ arrowWidth : Variables.iconButtonSize
+ arrowHeight : Variables.iconButtonSize
+ arrowRightMargin : Variables.defaultMargin
+ delegateColor : Colors.panelBackgroundColor
+ delegateBorderWidth : 1
+ delegateBorderColor : Colors.panelBorderColor
+ itemsHasIndent : Array(itemsText.length).fill(true) // sets all to true
+ itemsText : [ qsTr("Rinseback") ,
+ qsTr("Heat Disinfect") ,
+ qsTr("Citric Acid Heat Disinfect") ,
+ qsTr("Substitution Port Disinfect") ]
+ }
+ }
+
+ Item { id: _imageItem
+ width : parent.width / 2
+ height : parent.height
+
+ Image { id: _image
+ anchors.right : parent.right
+ anchors.verticalCenter : parent.verticalCenter
+ source : "qrc:/images/iLeahiConsole"
+ }
+ }
+ }
}
Index: sources/gui/qml/pages/posttreatment/PostTreatmentStack.qml
===================================================================
diff -u -r627062628b60e4d512ee8830c2dbc23eef02fe28 -r6825a57fe430253271712f0afbac14d046b44794
--- sources/gui/qml/pages/posttreatment/PostTreatmentStack.qml (.../PostTreatmentStack.qml) (revision 627062628b60e4d512ee8830c2dbc23eef02fe28)
+++ sources/gui/qml/pages/posttreatment/PostTreatmentStack.qml (.../PostTreatmentStack.qml) (revision 6825a57fe430253271712f0afbac14d046b44794)
@@ -195,7 +195,7 @@
vPostTreatmentAdjustmentTreatmentLog.doRequest() }
}
- PostTreatmentBase { id: _postTreatmentDisinfection
+ PostTreatmentDisinfection { id: _postTreatmentDisinfection
objectName :" _postTreatmentDisinfection"
onVisibleChanged : if (visible) { stackStepIndex = PostTreatmentStack.Disinfection }
}