Index: leahi.qrc
===================================================================
diff -u -rdfb5f7070961fd2a34c2cb8d897ecc43c4f46598 -r7c12b8ce1964a37e856ebcae205f8b4ed19f3c6a
--- leahi.qrc (.../leahi.qrc) (revision dfb5f7070961fd2a34c2cb8d897ecc43c4f46598)
+++ leahi.qrc (.../leahi.qrc) (revision 7c12b8ce1964a37e856ebcae205f8b4ed19f3c6a)
@@ -326,5 +326,6 @@
sources/gui/qml/pages/posttreatment/PostTreatmentBase.qml
sources/gui/qml/pages/posttreatment/PostTreatmentStack.qml
sources/gui/qml/pages/posttreatment/PostTreatmentReview.qml
+ sources/gui/qml/pages/posttreatment/PostTreatmentDisconnectStack.qml
Index: sources/gui/GuiGlobals.h
===================================================================
diff -u -r6d7a81af8acbaaf3ee3f722ccace021634507cb4 -r7c12b8ce1964a37e856ebcae205f8b4ed19f3c6a
--- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 6d7a81af8acbaaf3ee3f722ccace021634507cb4)
+++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 7c12b8ce1964a37e856ebcae205f8b4ed19f3c6a)
@@ -323,8 +323,9 @@
ID_AdjustDisposablesRemovalConfirmRsp = 0x9500, // 149
// Treatment Log Adjs
- ID_AdjustTreatmentLogReq = 0x750F, // 117 //// ----- @CRAPIZED: had to change to avoid duplication
- ID_AdjustTreatmentLogRsp = 0x760F, // 118 //// ----- @CRAPIZED: had to change to avoid duplication
+ ID_AdjustTreatmentLogReq = 0xA600, // 166
+ ID_AdjustTreatmentLogRsp = 0xA700, // 167
+
// Treatment Log Data
ID_TreatmentLogAvrgeData = 0x940F, // 148 //// ----- @CRAPIZED: had to change to avoid duplication
ID_TreatmentLogAlarmData = 0x950F, // 149 //// ----- @CRAPIZED: had to change to avoid duplication
Index: sources/gui/qml/pages/posttreatment/PostTreatmentBase.qml
===================================================================
diff -u -reb3bbd3e203463dc3634ecb009b8a1390bb87012 -r7c12b8ce1964a37e856ebcae205f8b4ed19f3c6a
--- sources/gui/qml/pages/posttreatment/PostTreatmentBase.qml (.../PostTreatmentBase.qml) (revision eb3bbd3e203463dc3634ecb009b8a1390bb87012)
+++ sources/gui/qml/pages/posttreatment/PostTreatmentBase.qml (.../PostTreatmentBase.qml) (revision 7c12b8ce1964a37e856ebcae205f8b4ed19f3c6a)
@@ -32,8 +32,11 @@
onVisibleChanged: if (visible) { _root.updateModel() }
function updateModel () {
- let group = stepNames[stackStepIndex]
- if ( group === undefined ) group = ""
+ let stepName = stepNames[stackStepIndex]
+ if ( stepName === undefined ) stepName = ""
+
+ let group = vSettings.groupFormat(stepName, _root.subStepName.length === 0 ? "" : _root.subStepName )
+
let instructionsGroup = vSettings.instructions[group]
if ( instructionsGroup !== undefined ) {
Index: sources/gui/qml/pages/posttreatment/PostTreatmentDisconnectStack.qml
===================================================================
diff -u
--- sources/gui/qml/pages/posttreatment/PostTreatmentDisconnectStack.qml (revision 0)
+++ sources/gui/qml/pages/posttreatment/PostTreatmentDisconnectStack.qml (revision 7c12b8ce1964a37e856ebcae205f8b4ed19f3c6a)
@@ -0,0 +1,69 @@
+
+// Qt
+import QtQuick 2.12
+
+// Project
+// Qml imports
+import "qrc:/globals"
+import "qrc:/components"
+import "qrc:/pages/posttreatment"
+
+/*!
+ * \brief the post treatment disconnect stack screen
+ */
+StackItem { id: _root
+ stackView.initialItem : null
+
+ enum Step {
+ DisconnectPatient ,
+ DrainConsumable ,
+ Count
+ }
+
+ property int subStepIndex: PostTreatmentDisconnectStack.Step.DisconnectPatient
+
+ signal goToNextStep()
+ signal goToPreviousStep()
+
+ function initStack() { page ( _postTreatmentDisconnectPatient ) }
+
+ function continueClicked() {
+ switch ( _root.subStepIndex ) {
+ case PostTreatmentDisconnectStack.Step.DisconnectPatient:
+ page ( _postTreatmentDrainConsumables )
+ break
+ case PostTreatmentDisconnectStack.Step.DrainConsumable:
+ goToNextStep ()
+ break
+ default:
+ break
+ }
+ }
+
+ function backClicked() {
+ switch ( _root.subStepIndex ) {
+ case PostTreatmentDisconnectStack.Step.DisconnectPatient:
+ break
+ case PostTreatmentDisconnectStack.Step.DrainConsumable:
+ page ( _postTreatmentDisconnectPatient )
+ break
+ default:
+ break
+ }
+ }
+
+ function backEnabled() {
+ return _root.subStepIndex === PostTreatmentDisconnectStack.Step.DrainConsumable
+ }
+
+ // ----- Screens definitions
+ PostTreatmentBase { id: _postTreatmentDisconnectPatient
+ instructionBased : true
+ onVisibleChanged : if (visible) { _root.subStepIndex = PostTreatmentDisconnectStack.Step.DisconnectPatient ; updateModel() }
+ subStepName : qsTr("Disconnect Patient BloodLines")
+ }
+
+ PostTreatmentBase { id: _postTreatmentDrainConsumables
+ onVisibleChanged : if (visible) { _root.subStepIndex = PostTreatmentDisconnectStack.Step.DrainConsumable }
+ }
+}
Index: sources/gui/qml/pages/posttreatment/PostTreatmentReview.qml
===================================================================
diff -u -r04fd28f30e37a09450ff5877ae2f805a92898b44 -r7c12b8ce1964a37e856ebcae205f8b4ed19f3c6a
--- sources/gui/qml/pages/posttreatment/PostTreatmentReview.qml (.../PostTreatmentReview.qml) (revision 04fd28f30e37a09450ff5877ae2f805a92898b44)
+++ sources/gui/qml/pages/posttreatment/PostTreatmentReview.qml (.../PostTreatmentReview.qml) (revision 7c12b8ce1964a37e856ebcae205f8b4ed19f3c6a)
@@ -28,97 +28,38 @@
* \brief the post treatment Treatment Log review screen
*/
PostTreatmentBase { id: _root
- signal itemClicked(int vIndex)
- 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
+ Grid { id: _grid
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
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 )
+ flow : Grid.TopToBottom
+ columns : 3
+ rows : _repeater.model.count / columns
+ rowSpacing : 10
+ columnSpacing : Variables.defaultMargin
- 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)
+ Repeater { id: _repeater
+ model : vPostTreatmentAdjustmentTreatmentLog.parametersTitle
+
+ LabelUnitText { id: container
+ height : 65
+ width : 575
+ label : modelData
+ unit : vPostTreatmentAdjustmentTreatmentLog.parametersUnit[index] ?? ""
+ value : "123" // vPostTreatmentAdjustmentTreatmentLog.parametersText[index] ?? ""
+ textAlignment: Text.AlignJustify
+ }
}
}
+
reasonText : vPostTreatmentAdjustmentTreatmentLog.text()
informationText : vPostTreatmentAdjustmentTreatmentLog.notification
}
Index: sources/gui/qml/pages/posttreatment/PostTreatmentStack.qml
===================================================================
diff -u -r4a2b83dcb56555861d2c741a8e8894e5b07e24bf -r7c12b8ce1964a37e856ebcae205f8b4ed19f3c6a
--- sources/gui/qml/pages/posttreatment/PostTreatmentStack.qml (.../PostTreatmentStack.qml) (revision 4a2b83dcb56555861d2c741a8e8894e5b07e24bf)
+++ sources/gui/qml/pages/posttreatment/PostTreatmentStack.qml (.../PostTreatmentStack.qml) (revision 7c12b8ce1964a37e856ebcae205f8b4ed19f3c6a)
@@ -31,31 +31,37 @@
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
+ 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 ()
- signal disposablesRemovalConfirm ()
- signal disposablesRemovalBack ()
+// signal patientDisconnectionConfirm ()
+// signal treatmentReviewConfirm ()
+// signal disposablesRemovalConfirm ()
+// signal disposablesRemovalBack ()
+
// TODO fix in post treatment
- onPatientDisconnectionConfirm : { vPostTreatmentAdjustmentDisposablesRemovalConfirm .doConfirm( ) }
-// /* No wait for Rsp, so navigates => */ page( _treatmentReviewConfirm )
+// onPatientDisconnectionConfirm : { vPostTreatmentAdjustmentDisposablesRemovalConfirm .doConfirm( ) }
+// /* No wait for Rsp, so navigates => */ page( _postTreatmentReview )
// /* After navigation ask for Tx data */ vPostTreatmentAdjustmentTreatmentLog .doRequest( )}
- onTreatmentReviewConfirm : { vPostTreatmentAdjustmentPatientDisconnectionConfirm .doConfirm( )}
+// onTreatmentReviewConfirm : { vPostTreatmentAdjustmentPatientDisconnectionConfirm .doConfirm( )}
// onDisposablesRemovalConfirm : vPostTreatmentAdjustmentDisposablesRemovalConfirm .doConfirm( )
- onDisposablesRemovalBack : page( _treatmentReviewConfirm )
+// onDisposablesRemovalBack : page( _postTreatmentReview )
+
onVisibleChanged: {
if (visible) {
_mainMenu.hidden = true
@@ -69,14 +75,17 @@
function confirmClicked() {
switch ( _root.stackStepIndex ) {
- case PostTreatmentStack.Disconnection:
- _root.patientDisconnectionConfirm()
+ case PostTreatmentStack.Disconnect:
+ _postTreatmentDisconnectStack.continueClicked()
break
+ case PostTreatmentStack.Remove:
+ vPostTreatmentAdjustmentDisposablesRemovalConfirm.doConfirm()
+ break
case PostTreatmentStack.Review:
- _root.treatmentReviewConfirm()
+ vPostTreatmentAdjustmentPatientDisconnectionConfirm.doConfirm()
break
case PostTreatmentStack.Disinfection:
- _root.disposablesRemovalConfirm()
+ // Skip button - go back to standby -- Finish Treatment
break
default:
break
@@ -85,30 +94,47 @@
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")
}
}
+ function backEnabled() {
+ switch ( _root.stackStepIndex ) {
+ case PostTreatmentStack.Disconnect:
+ return _postTreatmentDisconnectStack.backEnabled()
+ case PostTreatmentStack.Remove:
+ case PostTreatmentStack.Review: // fallthrough
+ return false
+ case PostTreatmentStack.Disinfection:
+ default:
+ return true
+ }
+
+ }
+
StepNavigationTitleBar { id: _titleBar
stepIndex : _root.stackStepIndex
anchors {
@@ -120,54 +146,77 @@
}
confirmText.text: confirmButtonText()
confirmVisible : true
- backVisible : stackStepIndex === PostTreatmentStack.Disinfection
+ backVisible : _root.backEnabled()
width : _root.width
stepNames : _root.stepNames
+
+ subStepIndex : isDisconnect ? _postTreatmentDisconnectStack.subStepIndex + 1 : 0
+
+ subSteps : {
+ let arr =Array(stepNames.length).fill(0)
+ arr[ PostTreatmentStack.Disconnect] = PostTreatmentDisconnectStack.Step.Count
+ return arr
+ }
+
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
+
+ anchors {
+ left : _titleBar.left
+ top : _titleBar.top
+ topMargin : Variables.defaultMargin
+ }
+
+ 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
+ }
+ }
+
}
- USBButton { id: _usbButton
- anchors.top : _exportButton.top
- anchors.left : _exportButton.right
- anchors.leftMargin: Variables.minVGap
- enabled : _GuiView.usbIsReady && !_GuiView.exportRunning
- visible : stackStepIndex === PostTreatmentStack.Review
+ PostTreatmentDisconnectStack { id: _postTreatmentDisconnectStack
+ objectName : "_postTreatmentDisconnectStack"
+ onVisibleChanged : if (visible) { stackStepIndex = PostTreatmentStack.Disconnect; initStack() }
}
- PostTreatmentBase { id: _patientDisconnectionConfirm
- objectName :"_patientDisconnectionConfirm"
+ PostTreatmentBase { id: _postTreatmentRemove
+ objectName : "_postTreatmentRemove"
instructionBased : true
- onVisibleChanged : if (visible) { stackStepIndex = PostTreatmentStack.Disconnection }
+ onVisibleChanged : if (visible) { stackStepIndex = PostTreatmentStack.Remove; updateModel() }
}
- PostTreatmentReview { id: _treatmentReviewConfirm
- objectName :"_treatmentReviewConfirm"
- instructionBased : false
- onVisibleChanged : if (visible) { stackStepIndex = PostTreatmentStack.Review }
+ PostTreatmentReview { id: _postTreatmentReview
+ objectName : " _postTreatmentReview"
+ onVisibleChanged : if (visible) { stackStepIndex = PostTreatmentStack.Review;
+ vPostTreatmentAdjustmentTreatmentLog.doRequest() }
- onItemClicked : {
- _detailTest.title.text = itemsText[vIndex]
- push(_detailTest)
- }
+// onItemClicked : {
+// _detailTest.title.text = itemsText[vIndex]
+// push(_detailTest)
+// }
}
- PostTreatmentBase { id: _detailTest
- objectName :"_detailTest"
- onBackClicked : pop()
- }
+// PostTreatmentBase { id: _detailTest
+// objectName :"_detailTest"
+// onBackClicked : pop()
+// }
- PostTreatmentBase { id: _disposablesRemovalConfirm
- objectName :"_disposablesRemovalConfirm"
+ PostTreatmentBase { id: _postTreatmentDisinfection
+ objectName :" _postTreatmentDisinfection"
instructionBased : true
onVisibleChanged : if (visible) { stackStepIndex = PostTreatmentStack.Disinfection }
}
@@ -181,39 +230,50 @@
}
Connections { target: vTDOpMode
- function onPostTreatmentChanged ( vValue ) { page( _patientDisconnectionConfirm , vValue )}
+ function onPostTreatmentChanged ( vValue ) { page( _postTreatmentDisconnectStack , vValue )}
}
- Connections { target: vPostTreatmentAdjustmentPatientDisconnectionConfirm
- function onAdjustmentTriggered ( vValue ) {
- if ( vPostTreatmentAdjustmentPatientDisconnectionConfirm.adjustment_Accepted ) {
- _treatmentReviewConfirm.reasonText = ""
- page( _disposablesRemovalConfirm )
- } else {
- _treatmentReviewConfirm.reasonText = vPostTreatmentAdjustmentPatientDisconnectionConfirm.text()
- }
- }
+ // Disconnect
+ Connections { target: _postTreatmentDisconnectStack
+ function onGoToNextStep () { page ( _postTreatmentRemove )}
}
+ // 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()
}
}
}
+
+ // keep?
+ Connections { target: vPostTreatmentAdjustmentPatientDisconnectionConfirm
+ function onAdjustmentTriggered ( vValue ) {
+ if ( vPostTreatmentAdjustmentPatientDisconnectionConfirm.adjustment_Accepted ) {
+ _postTreatmentReview.reasonText = ""
+ page( _postTreatmentDisinfection )
+
+ } else {
+ _postTreatmentReview.reasonText = vPostTreatmentAdjustmentPatientDisconnectionConfirm.text()
+ }
+ }
+ }
+
+
}
Index: sources/gui/qml/pages/settings/SettingsAdvancedInstitutional.qml
===================================================================
diff -u -r49271f2bd039c9d15586c7c9b2f57f80c801d819 -r7c12b8ce1964a37e856ebcae205f8b4ed19f3c6a
--- sources/gui/qml/pages/settings/SettingsAdvancedInstitutional.qml (.../SettingsAdvancedInstitutional.qml) (revision 49271f2bd039c9d15586c7c9b2f57f80c801d819)
+++ sources/gui/qml/pages/settings/SettingsAdvancedInstitutional.qml (.../SettingsAdvancedInstitutional.qml) (revision 7c12b8ce1964a37e856ebcae205f8b4ed19f3c6a)
@@ -26,8 +26,6 @@
SettingsBase { id: _root
itemIndex : SettingsStack.AdvancedInstitutional
contentArea.anchors.rightMargin : 0
- property var title : vAdvancedInstitutionalRecord.parametersTitle
- property var unit : vAdvancedInstitutionalRecord.parametersUnit
readonly property int min : 0
readonly property int max : 1
Index: sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.cpp
===================================================================
diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r7c12b8ce1964a37e856ebcae205f8b4ed19f3c6a
--- sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.cpp (.../VPostTreatmentAdjustTreatmentLog.cpp) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1)
+++ sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.cpp (.../VPostTreatmentAdjustTreatmentLog.cpp) (revision 7c12b8ce1964a37e856ebcae205f8b4ed19f3c6a)
@@ -37,12 +37,9 @@
ACTION_VIEW_CONNECTION(TreatmentLogAlarmData);
ACTION_VIEW_CONNECTION(TreatmentLogEventData);
- connect(&_TreatmentLog , &TreatmentLog::isIdleNotified,
- [=](bool vIdle) { isIdle(vIdle); } );
+// connect(&_TreatmentLog , &TreatmentLog::didTxCodeReceive,
+// [=](const QString &vTxCode) { txCode( vTxCode ); } );
- connect(&_TreatmentLog , &TreatmentLog::didTxCodeReceive,
- [=](const QString &vTxCode) { txCode( vTxCode ); } );
-
connect(&_TreatmentLog , &TreatmentLog::didNotification,
[=](const QString &vNotification) { notification(vNotification); } );
}
@@ -60,14 +57,6 @@
}
/*!
- * \brief View::VPostTreatmentAdjustmentTreatmentLog::doExport
- * \details the invocable slot to send user's treatment log export request to the controller
- */
-void View::VPostTreatmentAdjustmentTreatmentLog::doExport() {
- _TreatmentLog.doExport();
-}
-
-/*!
* \brief VPostTreatmentAdjustmentUltrafiltrationInit::onActionReceive
* \details received response model data handler
* \param vData - model data
Index: sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.h
===================================================================
diff -u -ra58f91b077c8131bea3dbde0fc338adb113fc9f3 -r7c12b8ce1964a37e856ebcae205f8b4ed19f3c6a
--- sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.h (.../VPostTreatmentAdjustTreatmentLog.h) (revision a58f91b077c8131bea3dbde0fc338adb113fc9f3)
+++ sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.h (.../VPostTreatmentAdjustTreatmentLog.h) (revision 7c12b8ce1964a37e856ebcae205f8b4ed19f3c6a)
@@ -93,7 +93,7 @@
PROPERTY(QStringList , parametersUnit , _TreatmentLog.units ())
PROPERTY(QStringList , parametersText , {})
- PROPERTY(QString , txCode , "")
+ PROPERTY(QString , txCode , "TEST-1231123212")
PROPERTY(QString , notification , "")
PROPERTY(bool , isIdle , true )
@@ -107,7 +107,6 @@
public slots:
void doRequest ();
- void doExport ();
signals:
/*!