Index: leahi.qrc
===================================================================
diff -u -rbd083c017790f073bf4a296e05faf803a240f29f -r14d7345260cdc47d8308da4fff127fbd97837fe4
--- leahi.qrc (.../leahi.qrc) (revision bd083c017790f073bf4a296e05faf803a240f29f)
+++ leahi.qrc (.../leahi.qrc) (revision 14d7345260cdc47d8308da4fff127fbd97837fe4)
@@ -200,7 +200,7 @@
sources/gui/qml/components/SubStepIndicator.qml
sources/gui/qml/components/SDCInfo.qml
sources/gui/qml/components/BaseChart.qml
- sources/gui/qml/components/HelpNotification.qml
+ sources/gui/qml/components/ReviewContainer.qml
sources/gui/qml/compounds/PressureRangeSlider.qml
Index: sources/canbus/MessageGlobals.h
===================================================================
diff -u -r676ec71574416b57c5263b1a4acc66d6904751e7 -r14d7345260cdc47d8308da4fff127fbd97837fe4
--- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 676ec71574416b57c5263b1a4acc66d6904751e7)
+++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 14d7345260cdc47d8308da4fff127fbd97837fe4)
@@ -291,7 +291,7 @@
// ---- Treatment Log
{Gui::GuiActionType::ID_AdjustTreatmentLogReq , 0 * 4 }, // 0 parameter
- {Gui::GuiActionType::ID_AdjustTreatmentLogRsp , 66 * 4 }, // 66 parameter each 4bytes
+ {Gui::GuiActionType::ID_AdjustTreatmentLogRsp , 64 * 4 }, // 64 parameter each 4bytes
{Gui::GuiActionType::ID_TreatmentLogAvrgeData , 5 * 4 }, // 5 parameter each 4bytes
{Gui::GuiActionType::ID_TreatmentLogAlarmData , 3 * 4 }, // 3 parameter each 4bytes
{Gui::GuiActionType::ID_TreatmentLogEventData , 3 * 4 }, // 3 parameter each 4bytes
Fisheye: Tag 14d7345260cdc47d8308da4fff127fbd97837fe4 refers to a dead (removed) revision in file `sources/gui/qml/components/HelpNotification.qml'.
Fisheye: No comparison available. Pass `N' to diff?
Index: sources/gui/qml/components/ReviewContainer.qml
===================================================================
diff -u
--- sources/gui/qml/components/ReviewContainer.qml (revision 0)
+++ sources/gui/qml/components/ReviewContainer.qml (revision 14d7345260cdc47d8308da4fff127fbd97837fe4)
@@ -0,0 +1,110 @@
+// Qt
+import QtQuick 2.15
+
+// Project
+
+// Qml imports
+import "qrc:/compounds"
+import "qrc:/globals"
+
+Rectangle { id: _root
+ property var initial : []
+ property var actual : []
+ property var label : []
+ property var units : []
+ property var precision : Array(label.count).fill(0) // default all 0 precision
+ property string title : ""
+
+ height : _column.implicitHeight + 10
+ width : parent.width
+ radius : 9
+ color : Colors.panelBackgroundColor
+ clip : true
+
+ border {
+ width: 1
+ color: Colors.panelBorderColor
+ }
+
+ Column { id: _column
+ Rectangle { id: _header
+ width : _root.width
+ height : Variables.createRxLabelUnitContainerHeight
+ color : Colors.panelBackgroundColor
+ radius : _root.radius
+
+ border {
+ width: 1
+ color: Colors.panelBorderColor
+ }
+
+ Text { id: _title
+ text : _root.title
+ color : Colors.offWhite
+ font.family : Fonts.fontFamilyFixed
+ font.weight : Font.DemiBold
+ font.pixelSize : Fonts.fontPixelTextRectTitle
+ anchors {
+ left : parent.left
+ leftMargin : Variables.defaultMargin
+ verticalCenter : parent.verticalCenter
+ }
+ }
+ }
+
+ Repeater { id: _repeater
+ model : _root.label
+ height : delegate.implicitHeight
+ width : delegate.implicitWidth
+
+ delegate : LabelUnitContainer { id: _delegate
+ text : modelData
+ color : Colors.transparent
+ width : parent.width
+ unitText : _root.units[index]
+ border.width: 0
+
+ contentItem : Item { id: _contentItem
+ Row { id: _row
+ anchors {
+ right : parent.right
+ rightMargin : Variables.defaultMargin * 2
+ verticalCenter : parent.verticalCenter
+ }
+ spacing : Variables.defaultMargin * 2
+
+ Text { id: _initial
+ text : typeof _root.initial[index] === "number" ? _root.initial[index].toFixed(_root.precision[index]) ?? "" :
+ _root.initial[index]
+ color : Colors.offWhite
+ font.pixelSize : Fonts.fontPixelValueControl
+ verticalAlignment : Text.AlignVCenter
+ visible : _root.initial[index] ?? false
+ }
+
+ Text { id: _actual
+ text : typeof _root.actual[index] === "number" ? _root.actual[index].toFixed(_root.precision[index]) ?? "" :
+ _root.actual[index]
+ color : Colors.ufVolumeGoalText
+ font.pixelSize : Fonts.fontPixelValueControl
+ verticalAlignment : Text.AlignVCenter
+ visible : _root.actual[index] ?? false
+ }
+ }
+ }
+
+ Line { id: _divider
+ color : Colors.panelBorderColor
+ visible : index !== _repeater.count - 1
+ anchors {
+ bottom : parent.bottom
+ left : parent.left
+ leftMargin : Variables.minVGap + Variables.defaultMargin
+ right : parent.right
+ rightMargin : Variables.minVGap + Variables.defaultMargin
+ }
+ }
+ }
+ }
+ }
+}
Index: sources/gui/qml/dialogs/AlarmDialog.qml
===================================================================
diff -u -r3c0010b123fe25246ec7f040965d0a37e8e9a7cc -r14d7345260cdc47d8308da4fff127fbd97837fe4
--- sources/gui/qml/dialogs/AlarmDialog.qml (.../AlarmDialog.qml) (revision 3c0010b123fe25246ec7f040965d0a37e8e9a7cc)
+++ sources/gui/qml/dialogs/AlarmDialog.qml (.../AlarmDialog.qml) (revision 14d7345260cdc47d8308da4fff127fbd97837fe4)
@@ -6,6 +6,7 @@
// Qml imports
import "qrc:/globals"
import "qrc:/components"
+import "qrc:/compounds"
Item { id : _root
@@ -101,18 +102,19 @@
bottom : _timerRect.top
}
- HelpNotification { id: _infoItem
+ AutoStepController { id: _autoStepController
anchors {
left : parent.left
leftMargin : Variables.defaultMargin * 4
top : parent.top
- topMargin : Variables.defaultMargin * 3
+ topMargin : Variables.defaultMargin * 2
}
+ onTriggered : _listView.currentIndex = (_listView.currentIndex + 1) % _listView.count
}
ListView {id: _listView
anchors {
- top : _infoItem.bottom
+ top : _autoStepController.bottom
topMargin : Variables.defaultMargin
bottom : parent.bottom
left : parent.left
Index: sources/gui/qml/pages/posttreatment/PostTreatmentReview.qml
===================================================================
diff -u -r04fd28f30e37a09450ff5877ae2f805a92898b44 -r14d7345260cdc47d8308da4fff127fbd97837fe4
--- sources/gui/qml/pages/posttreatment/PostTreatmentReview.qml (.../PostTreatmentReview.qml) (revision 04fd28f30e37a09450ff5877ae2f805a92898b44)
+++ sources/gui/qml/pages/posttreatment/PostTreatmentReview.qml (.../PostTreatmentReview.qml) (revision 14d7345260cdc47d8308da4fff127fbd97837fe4)
@@ -16,7 +16,6 @@
// Qt
import QtQuick 2.12
-
// Project
// Qml imports
import "qrc:/globals"
@@ -28,98 +27,153 @@
* \brief the post treatment Treatment Log review screen
*/
PostTreatmentBase { id: _root
- signal itemClicked(int vIndex)
+ property int colSpacing: Variables.defaultMargin
- 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
- }
-
- 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
- }
- }
-
- 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
- }
-
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.
+ top : header.bottom
+ topMargin : Variables.defaultMargin * 2
bottom : _root.bottom
bottomMargin : Variables.notificationHeight + Variables.minVGap
- horizontalCenter: parent.horizontalCenter
+ left : parent.left
+ leftMargin : Variables.defaultMargin * 4
+ right : parent.right
+ rightMargin : Variables.defaultMargin * 4
+
}
- 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 )
+ contentWidth : width
+ contentHeight : _row.height
+ clip : true
- 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)
+ 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 ]
+
+
+ }
+
+ }
+
+ Column { id: _rightColumn
+ width : _flickable.width / 2
+ spacing : _root.colSpacing
+
+ }
}
}
+
+ ScrollBar { flickable: _flickable }
+
+
+// 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
+// }
+// }
+// }
+// }
+// }
+
reasonText : vPostTreatmentAdjustmentTreatmentLog.text()
informationText : vPostTreatmentAdjustmentTreatmentLog.notification
}
-
Index: sources/gui/qml/pages/posttreatment/PostTreatmentStack.qml
===================================================================
diff -u -r1286d74bd015276aab604808be2766136091c125 -r14d7345260cdc47d8308da4fff127fbd97837fe4
--- sources/gui/qml/pages/posttreatment/PostTreatmentStack.qml (.../PostTreatmentStack.qml) (revision 1286d74bd015276aab604808be2766136091c125)
+++ sources/gui/qml/pages/posttreatment/PostTreatmentStack.qml (.../PostTreatmentStack.qml) (revision 14d7345260cdc47d8308da4fff127fbd97837fe4)
@@ -31,18 +31,22 @@
stackView.initialItem : null
enum StackStep {
- Disconnection ,
+ Disconnect ,
+ Remove ,
Review ,
Disinfection
}
property var stepNames: [
- qsTr("Disconnection"),
+ qsTr("Disconnect" ),
+ qsTr("Remove" ),
qsTr("Review" ),
qsTr("Disinfection" ),
]
property int stackStepIndex : 0
+ readonly property bool isDisconnect : _root.stackStepIndex === PostTreatmentStack.StackStep.Disconnect
+ readonly property bool isReview : _root.stackStepIndex === PostTreatmentStack.StackStep.Review
signal patientDisconnectionConfirm ()
signal treatmentReviewConfirm ()
@@ -68,14 +72,18 @@
function confirmClicked() {
switch ( _root.stackStepIndex ) {
- case PostTreatmentStack.Disconnection:
- _root.patientDisconnectionConfirm()
+ case PostTreatmentStack.Disconnect:
+// _postTreatmentDisconnectStack.continueClicked()
+ page( _postTreatmentRemove) // TODO REMOVE
break
+ case PostTreatmentStack.Remove:
+ vPostTreatmentAdjustmentDisposablesRemovalConfirm.doConfirm()
+ break
case PostTreatmentStack.Review:
- _root.treatmentReviewConfirm()
+ page( _postTreatmentDisinfection )
break
case PostTreatmentStack.Disinfection:
- _root.disposablesRemovalConfirm()
+ // Skip button - go back to standby -- Finish Treatment
break
default:
break
@@ -84,27 +92,30 @@
function backClicked() {
switch ( _root.stackStepIndex ) {
- case PostTreatmentStack.Disconnection:
+ case PostTreatmentStack.Disconnect:
+// _postTreatmentDisconnectStack.backClicked()
break
- case PostTreatmentStack.Review:
- break
case PostTreatmentStack.Disinfection:
- _root.disposablesRemovalBack ()
+ page( _postTreatmentReview)
break
+ case PostTreatmentStack.Remove:
+ case PostTreatmentStack.Review:
default:
break
}
}
function confirmButtonText() {
switch ( _root.stackStepIndex ) {
- case PostTreatmentStack.Disconnection:
- return qsTr("Auto Eject")
+ case PostTreatmentStack.Disconnect:
case PostTreatmentStack.Review:
- return qsTr("NEXT")
+ return qsTr("Continue")
+ case PostTreatmentStack.Remove:
+ return qsTr("Auto Eject")
case PostTreatmentStack.Disinfection:
+ return qsTr("Skip")
default:
- return qsTr("CONFIRM")
+ return qsTr("Next")
}
}
@@ -124,51 +135,55 @@
stepNames : _root.stepNames
onBackClicked : _root.backClicked()
onConfirmClicked: _root.confirmClicked()
- }
- ExportButton { id: _exportButton
- isSmall : true
- anchors.top : parent.top
- anchors.left : parent.left
- visible : stackStepIndex === PostTreatmentStack.Review
- enabled : vPostTreatmentAdjustmentTreatmentLog.isIdle && _GuiView.usbIsReady && !_GuiView.exportRunning
- onClicked : vPostTreatmentAdjustmentTreatmentLog.doExport()
- }
+ Row { id: _qrRow
+ spacing : Variables.defaultMargin
+ visible : _root.isReview
- USBButton { id: _usbButton
- anchors.top : _exportButton.top
- anchors.left : _exportButton.right
- anchors.leftMargin: Variables.minVGap
- enabled : _GuiView.usbIsReady && !_GuiView.exportRunning
- visible : stackStepIndex === PostTreatmentStack.Review
+ anchors {
+ left : _titleBar.left
+ leftMargin : Variables.defaultMargin * 2
+ top : _titleBar.top
+ topMargin : Variables.defaultMargin * 2
+ }
+
+ QRCode { id: _qrCode
+ anchors.verticalCenter : parent.verticalCenter
+ anchors.verticalCenterOffset: -5
+ qrcode : vPostTreatmentAdjustmentTreatmentLog.txCode
+ clear : ! _root.visible
+ }
+
+ Text { id: _txCodeText
+ anchors.bottom : _qrCode.bottom
+ text : vPostTreatmentAdjustmentTreatmentLog.txCode ? qsTr("Tx Code: ") + vPostTreatmentAdjustmentTreatmentLog.txCode : " "
+ color : "#DBE9FA"
+ font.pixelSize : Fonts.fontPixelButton
+ }
+ }
}
PostTreatmentBase { id: _patientDisconnectionConfirm
objectName :"_patientDisconnectionConfirm"
instructionBased : true
- onVisibleChanged : if (visible) { stackStepIndex = PostTreatmentStack.Disconnection }
+ onVisibleChanged : if (visible) { stackStepIndex = PostTreatmentStack.Disconnect }
}
- PostTreatmentReview { id: _treatmentReviewConfirm
- objectName :"_treatmentReviewConfirm"
- instructionBased : false
- onVisibleChanged : if (visible) { stackStepIndex = PostTreatmentStack.Review }
-
- onItemClicked : {
- _detailTest.title.text = itemsText[vIndex]
- push(_detailTest)
- }
+ PostTreatmentBase { id: _postTreatmentRemove
+ objectName : "_postTreatmentRemove"
+ instructionBased : true
+ onVisibleChanged : if (visible) { stackStepIndex = PostTreatmentStack.Remove; updateModel() }
}
- PostTreatmentBase { id: _detailTest
- objectName :"_detailTest"
- onBackClicked : pop()
+ PostTreatmentReview { id: _postTreatmentReview
+ objectName :"_postTreatmentReview"
+ onVisibleChanged : if (visible) { stackStepIndex = PostTreatmentStack.Review;
+ vPostTreatmentAdjustmentTreatmentLog.doRequest() }
}
- PostTreatmentBase { id: _disposablesRemovalConfirm
- objectName :"_disposablesRemovalConfirm"
- instructionBased : true
- onVisibleChanged : if (visible) { stackStepIndex = PostTreatmentStack.Disinfection }
+ PostTreatmentBase { id: _postTreatmentDisinfection
+ objectName :"_postTreatmentDisinfection"
+ onVisibleChanged : if (visible) { stackStepIndex = PostTreatmentStack.Disinfection }
}
// connections
@@ -183,35 +198,38 @@
function onPostTreatmentChanged ( vValue ) { page( _patientDisconnectionConfirm , vValue )}
}
+ // Confirm Patient Disconnection
Connections { target: vPostTreatmentAdjustmentPatientDisconnectionConfirm
function onAdjustmentTriggered ( vValue ) {
if ( vPostTreatmentAdjustmentPatientDisconnectionConfirm.adjustment_Accepted ) {
- _treatmentReviewConfirm.reasonText = ""
- page( _disposablesRemovalConfirm )
+ _postTreatmentReview.reasonText = ""
+ page( _postTreatmentDisinfection )
} else {
- _treatmentReviewConfirm.reasonText = vPostTreatmentAdjustmentPatientDisconnectionConfirm.text()
+ _postTreatmentReview.reasonText = vPostTreatmentAdjustmentPatientDisconnectionConfirm.text()
}
}
}
+ // Auto - Eject
Connections { target: vPostTreatmentAdjustmentDisposablesRemovalConfirm
function onAdjustmentTriggered ( vValue ) {
if ( vPostTreatmentAdjustmentDisposablesRemovalConfirm.adjustment_Accepted ) {
- _patientDisconnectionConfirm.reasonText = ""
- page( _treatmentReviewConfirm )
+ _postTreatmentRemove.reasonText = ""
+ page( _postTreatmentReview )
} else {
- _patientDisconnectionConfirm.reasonText = vPostTreatmentAdjustmentDisposablesRemovalConfirm.text()
+ _postTreatmentRemove.reasonText = vPostTreatmentAdjustmentDisposablesRemovalConfirm.text()
}
}
}
+ // Treatment Review
Connections { target: vPostTreatmentAdjustmentTreatmentLog
function onAdjustmentTriggered ( vValue ) {
if ( vPostTreatmentAdjustmentTreatmentLog.adjustment_Accepted ) {
- _treatmentReviewConfirm.reasonText = ""
+ _postTreatmentReview.reasonText = ""
} else {
- _treatmentReviewConfirm.reasonText = vPostTreatmentAdjustmentTreatmentLog.text()
+ _postTreatmentReview.reasonText = vPostTreatmentAdjustmentTreatmentLog.text()
}
}
}
Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml
===================================================================
diff -u -r58d24875f4e9c0115a05cae01b4a4e0a26818396 -r14d7345260cdc47d8308da4fff127fbd97837fe4
--- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml (.../PreTreatmentCreateContent.qml) (revision 58d24875f4e9c0115a05cae01b4a4e0a26818396)
+++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml (.../PreTreatmentCreateContent.qml) (revision 14d7345260cdc47d8308da4fff127fbd97837fe4)
@@ -115,8 +115,8 @@
}
function validate () {
- vTreatmentCreate .patientID = _preTreatmentCreateTreatmentSettings.patientID
- vPostTreatmentAdjustmentTreatmentLog.patientID = _preTreatmentCreateTreatmentSettings.patientID // store for the TreatmentLog
+ vTreatmentCreate .patientID = _preTreatmentCreateTreatmentSettings.patientID
+ vPostTreatmentAdjustmentTreatmentLog.patientID = _preTreatmentCreateTreatmentSettings.patientID // store for the TreatmentLog
vTreatmentCreate.doValidation ( )
}
Index: sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.cpp
===================================================================
diff -u -r676ec71574416b57c5263b1a4acc66d6904751e7 -r14d7345260cdc47d8308da4fff127fbd97837fe4
--- sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.cpp (.../MPostTreatmentAdjustTreatmentLogResponse.cpp) (revision 676ec71574416b57c5263b1a4acc66d6904751e7)
+++ sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.cpp (.../MPostTreatmentAdjustTreatmentLogResponse.cpp) (revision 14d7345260cdc47d8308da4fff127fbd97837fe4)
@@ -45,8 +45,6 @@
_data.mTreatmentEndEpoch .value,
_data.mFluidBolusVolume .value,
_data.mFluidBolusVolumeActual .value,
- _data.mPatientID .value,
- _data.mSecondaryPatientID .value,
_data.mHeparinType .value,
_data.mHeparinDeliveryDuration .value,
_data.mHeparinDeliveryDurationActual .value,
@@ -117,8 +115,6 @@
if ( ! GetValue(vByteArray, index, _data.mTreatmentEndEpoch )) goto lError;
if ( ! GetValue(vByteArray, index, _data.mFluidBolusVolume )) goto lError;
if ( ! GetValue(vByteArray, index, _data.mFluidBolusVolumeActual )) goto lError;
- if ( ! GetValue(vByteArray, index, _data.mPatientID )) goto lError;
- if ( ! GetValue(vByteArray, index, _data.mSecondaryPatientID )) goto lError;
if ( ! GetValue(vByteArray, index, _data.mHeparinType )) goto lError;
if ( ! GetValue(vByteArray, index, _data.mHeparinDeliveryDuration )) goto lError;
if ( ! GetValue(vByteArray, index, _data.mHeparinDeliveryDurationActual )) goto lError;
@@ -199,8 +195,6 @@
data.mTreatmentEndEpoch = _data.mTreatmentEndEpoch .value;
data.mFluidBolusVolume = _data.mFluidBolusVolume .value;
data.mFluidBolusVolumeActual = _data.mFluidBolusVolumeActual .value;
- data.mPatientID = _data.mPatientID .value;
- data.mSecondaryPatientID = _data.mSecondaryPatientID .value;
data.mHeparinType = _data.mHeparinType .value;
data.mHeparinDeliveryDuration = _data.mHeparinDeliveryDuration .value;
data.mHeparinDeliveryDurationActual = _data.mHeparinDeliveryDurationActual .value;
Index: sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.h
===================================================================
diff -u -r676ec71574416b57c5263b1a4acc66d6904751e7 -r14d7345260cdc47d8308da4fff127fbd97837fe4
--- sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.h (.../MPostTreatmentAdjustTreatmentLogResponse.h) (revision 676ec71574416b57c5263b1a4acc66d6904751e7)
+++ sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.h (.../MPostTreatmentAdjustTreatmentLogResponse.h) (revision 14d7345260cdc47d8308da4fff127fbd97837fe4)
@@ -63,45 +63,43 @@
* | 25 - (U32) | \ref Data::mTreatmentEndEpoch
* | 26 - (U32) | \ref Data::mFluidBolusVolume
* | 27 - (U32) | \ref Data::mFluidBolusVolumeActual
- * | 28 - (U32) | \ref Data::mPatientID
- * | 29 - (U32) | \ref Data::mSecondaryPatientID
- * | 30 - (U32) | \ref Data::mHeparinType
- * | 31 - (U32) | \ref Data::mHeparinDeliveryDuration
- * | 32 - (U32) | \ref Data::mHeparinDeliveryDurationActual
- * | 33 - (U32) | \ref Data::mTreatmentModality
- * | 34 - (U32) | \ref Data::mTreatmentModalityActual
- * | 35 - (U32) | \ref Data::mHDFOperatingMode
- * | 36 - (U32) | \ref Data::mHDFOperatingModeActual
- * | 37 - (U32) | \ref Data::mHepatitisStatus
- * | 38 - (F32) | \ref Data::mDialysateTemperature
- * | 39 - (F32) | \ref Data::mDialysateTemperatureActual
- * | 40 - (F32) | \ref Data::mDialysateVolumeUsed
- * | 41 - (F32) | \ref Data::mHeparinBolusVolume
- * | 42 - (F32) | \ref Data::mHeparinBolusVolumeActual
- * | 43 - (F32) | \ref Data::mHeparinDispenseRate
- * | 44 - (F32) | \ref Data::mHeparinDispenseRateActual
- * | 45 - (F32) | \ref Data::mHeparinDeliveredVolume
- * | 46 - (F32) | \ref Data::mAverageArterialPressure
- * | 47 - (F32) | \ref Data::mAverageVenousPressure
- * | 48 - (F32) | \ref Data::mUFVolume
- * | 49 - (F32) | \ref Data::mUFVolumeActual
- * | 50 - (F32) | \ref Data::mUFVolumeTarget
- * | 51 - (F32) | \ref Data::mUFRate
- * | 52 - (F32) | \ref Data::mUFRateActual
- * | 53 - (F32) | \ref Data::mUFRateTarget
- * | 54 - (F32) | \ref Data::mSubstitutionVolume
- * | 55 - (F32) | \ref Data::mSubstitutionVolumeActual
- * | 56 - (F32) | \ref Data::mSubstitutionVolumeTarget
- * | 57 - (F32) | \ref Data::mSubstitutionRate
- * | 58 - (F32) | \ref Data::mSubstitutionRateActual
- * | 59 - (F32) | \ref Data::mSubstitutionRateTarget
- * | 60 - (F32) | \ref Data::mIsoUfVolume
- * | 61 - (F32) | \ref Data::mIsoUfVolumeActual
- * | 62 - (F32) | \ref Data::mIsoUfVolumeTarget
- * | 63 - (F32) | \ref Data::mIsoUfRate
- * | 64 - (F32) | \ref Data::mIsoUfRateActual
- * | 65 - (F32) | \ref Data::mIsoUfRateTarget
- * | 66 - (F32) | \ref Data::mWaterSampleTestResult
+ * | 28 - (U32) | \ref Data::mHeparinType
+ * | 29 - (U32) | \ref Data::mHeparinDeliveryDuration
+ * | 30 - (U32) | \ref Data::mHeparinDeliveryDurationActual
+ * | 31 - (U32) | \ref Data::mTreatmentModality
+ * | 32 - (U32) | \ref Data::mTreatmentModalityActual
+ * | 33 - (U32) | \ref Data::mHDFOperatingMode
+ * | 34 - (U32) | \ref Data::mHDFOperatingModeActual
+ * | 35 - (U32) | \ref Data::mHepatitisStatus
+ * | 36 - (F32) | \ref Data::mDialysateTemperature
+ * | 37 - (F32) | \ref Data::mDialysateTemperatureActual
+ * | 38 - (F32) | \ref Data::mDialysateVolumeUsed
+ * | 39 - (F32) | \ref Data::mHeparinBolusVolume
+ * | 40 - (F32) | \ref Data::mHeparinBolusVolumeActual
+ * | 41 - (F32) | \ref Data::mHeparinDispenseRate
+ * | 42 - (F32) | \ref Data::mHeparinDispenseRateActual
+ * | 43 - (F32) | \ref Data::mHeparinDeliveredVolume
+ * | 44 - (F32) | \ref Data::mAverageArterialPressure
+ * | 45 - (F32) | \ref Data::mAverageVenousPressure
+ * | 46 - (F32) | \ref Data::mUFVolume
+ * | 47 - (F32) | \ref Data::mUFVolumeActual
+ * | 48 - (F32) | \ref Data::mUFVolumeTarget
+ * | 49 - (F32) | \ref Data::mUFRate
+ * | 50 - (F32) | \ref Data::mUFRateActual
+ * | 51 - (F32) | \ref Data::mUFRateTarget
+ * | 52 - (F32) | \ref Data::mSubstitutionVolume
+ * | 53 - (F32) | \ref Data::mSubstitutionVolumeActual
+ * | 54 - (F32) | \ref Data::mSubstitutionVolumeTarget
+ * | 55 - (F32) | \ref Data::mSubstitutionRate
+ * | 56 - (F32) | \ref Data::mSubstitutionRateActual
+ * | 57 - (F32) | \ref Data::mSubstitutionRateTarget
+ * | 58 - (F32) | \ref Data::mIsoUfVolume
+ * | 59 - (F32) | \ref Data::mIsoUfVolumeActual
+ * | 60 - (F32) | \ref Data::mIsoUfVolumeTarget
+ * | 61 - (F32) | \ref Data::mIsoUfRate
+ * | 62 - (F32) | \ref Data::mIsoUfRateActual
+ * | 63 - (F32) | \ref Data::mIsoUfRateTarget
+ * | 64 - (F32) | \ref Data::mWaterSampleTestResult
* \sa Data
* \sa MAdjustTreatmentLogReq : TreatmentLog Request
@@ -150,8 +148,6 @@
Types::U32 mTreatmentEndEpoch ;
Types::U32 mFluidBolusVolume ;
Types::U32 mFluidBolusVolumeActual ;
- Types::U32 mPatientID ;
- Types::U32 mSecondaryPatientID ;
Types::U32 mHeparinType ;
Types::U32 mHeparinDeliveryDuration ;
Types::U32 mHeparinDeliveryDurationActual ;
@@ -225,8 +221,6 @@
quint32 mTreatmentEndEpoch = 0;
quint32 mFluidBolusVolume = 0;
quint32 mFluidBolusVolumeActual = 0;
- quint32 mPatientID = 0;
- quint32 mSecondaryPatientID = 0;
quint32 mHeparinType = 0;
quint32 mHeparinDeliveryDuration = 0;
quint32 mHeparinDeliveryDurationActual = 0;
Index: sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.cpp
===================================================================
diff -u -r676ec71574416b57c5263b1a4acc66d6904751e7 -r14d7345260cdc47d8308da4fff127fbd97837fe4
--- sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.cpp (.../VPostTreatmentAdjustTreatmentLog.cpp) (revision 676ec71574416b57c5263b1a4acc66d6904751e7)
+++ sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.cpp (.../VPostTreatmentAdjustTreatmentLog.cpp) (revision 14d7345260cdc47d8308da4fff127fbd97837fe4)
@@ -106,8 +106,6 @@
treatmentEndEpoch ( vData.mTreatmentEndEpoch );
fluidBolusVolume ( vData.mFluidBolusVolume );
fluidBolusVolumeActual ( vData.mFluidBolusVolumeActual );
- patientID ( vData.mPatientID );
- secondaryPatientID ( vData.mSecondaryPatientID );
heparinType ( vData.mHeparinType );
heparinDeliveryDuration ( vData.mHeparinDeliveryDuration );
heparinDeliveryDurationActual ( vData.mHeparinDeliveryDurationActual );
Index: sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.h
===================================================================
diff -u -r676ec71574416b57c5263b1a4acc66d6904751e7 -r14d7345260cdc47d8308da4fff127fbd97837fe4
--- sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.h (.../VPostTreatmentAdjustTreatmentLog.h) (revision 676ec71574416b57c5263b1a4acc66d6904751e7)
+++ sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.h (.../VPostTreatmentAdjustTreatmentLog.h) (revision 14d7345260cdc47d8308da4fff127fbd97837fe4)
@@ -50,6 +50,9 @@
PROPERTY(bool , heparinDispensingRateOff , true)
PROPERTY(bool , heparinBolusVolumeOff , true)
+ PROPERTY(QString , patientID , 0 )
+ PROPERTY(QString , secondaryPatientID , 0 ) // TODO create rx enhancement - edit pencil on create rxs
+
PROPERTY(quint32 , bloodFlowRate , 0 )
PROPERTY(quint32 , bloodFlowRateActual , 0 )
PROPERTY(quint32 , dialysateFlowRate , 0 )
@@ -75,8 +78,6 @@
PROPERTY(quint32 , treatmentEndEpoch , 0 )
PROPERTY(quint32 , fluidBolusVolume , 0 )
PROPERTY(quint32 , fluidBolusVolumeActual , 0 )
- PROPERTY(quint32 , patientID , 0 )
- PROPERTY(quint32 , secondaryPatientID , 0 )
PROPERTY(quint32 , heparinType , 0 )
PROPERTY(quint32 , heparinDeliveryDuration , 0 )
PROPERTY(quint32 , heparinDeliveryDurationActual , 0 )