Index: sources/gui/qml/dialogs/RinsebackCompleteDialog.qml =================================================================== diff -u -r45cc119e54711893ccc2b9d600412b8f51b7764f -rbb2557d984b23c29426f452968ea797e6559ac3b --- sources/gui/qml/dialogs/RinsebackCompleteDialog.qml (.../RinsebackCompleteDialog.qml) (revision 45cc119e54711893ccc2b9d600412b8f51b7764f) +++ sources/gui/qml/dialogs/RinsebackCompleteDialog.qml (.../RinsebackCompleteDialog.qml) (revision bb2557d984b23c29426f452968ea797e6559ac3b) @@ -9,11 +9,11 @@ extraText : qsTr("Recirculate") extraVisible : vTreatmentRinseback.isRecircAllowed isConfirmDefault: false - + autoClose : false width : Variables.completeDialogWidth height : Variables.completeDialogHeight backgroundColor : Colors.darkDialogColor - footerBottomMargin : Variables.defaultMargin * 3 + footerBottomMargin : Variables.defaultMargin * 4 messageTextVerticalOffset : Variables.defaultMargin * -1 Image { id : _iconImage Index: sources/gui/qml/pages/endtreatment/EndTreatmentRecirculateStack.qml =================================================================== diff -u -rd59edcf7fa2a0f096e22d330012dbaefa4bda374 -rbb2557d984b23c29426f452968ea797e6559ac3b --- sources/gui/qml/pages/endtreatment/EndTreatmentRecirculateStack.qml (.../EndTreatmentRecirculateStack.qml) (revision d59edcf7fa2a0f096e22d330012dbaefa4bda374) +++ sources/gui/qml/pages/endtreatment/EndTreatmentRecirculateStack.qml (.../EndTreatmentRecirculateStack.qml) (revision bb2557d984b23c29426f452968ea797e6559ac3b) @@ -35,12 +35,10 @@ signal reconnectClicked () signal confirmDisconnectClicked () signal confirmReconnectClicked () -// signal recirculateResumeClicked() // enum command not used comment signal treatmentEndClicked () onReconnectClicked : vTreatmentAdjustmentRecirculate.doReconnect () //84.0 ///< User requests to re-connect to system (stop re-circulating, clamp arterial and venous lines) onConfirmReconnectClicked : vTreatmentAdjustmentRecirculate.doConfirmReconnect () //84.1 ///< User confirms patient connected, lines un-shunted to return to treatment -// onRecirculateResumeClicked : vTreatmentAdjustmentRecirculate.doResume () // enum command not used comment ///< User requests to resume re-circulation onTreatmentEndClicked : vTreatmentAdjustmentRecirculate.doTreatmentEnd () //84.3 ///< User requests to end treatment onConfirmDisconnectClicked : vTreatmentAdjustmentRecirculate.doConfirmDisconnect () //84.4 ///< User confirms patient disconnected, lines shunted to begin re-circulation @@ -110,8 +108,6 @@ Connections { target: vTDTreatmentStates function onRcDisconnectChanged ( vValue ) { page( _recirculateDisconnect , vValue )} // set up function onRcStartedChanged ( vValue ) { page( _recirculateProgress , vValue )} // in progress - // TODO: check during integration -// function onRcStoppedChanged ( vValue ) { page( _recirculateStopped , vValue )} // complete function onRcReconnectChanged ( vValue ) { page( _recirculateReconnect , vValue )} // disconnect } Index: sources/gui/qml/pages/endtreatment/EndTreatmentRinsebackStack.qml =================================================================== diff -u -r45cc119e54711893ccc2b9d600412b8f51b7764f -rbb2557d984b23c29426f452968ea797e6559ac3b --- sources/gui/qml/pages/endtreatment/EndTreatmentRinsebackStack.qml (.../EndTreatmentRinsebackStack.qml) (revision 45cc119e54711893ccc2b9d600412b8f51b7764f) +++ sources/gui/qml/pages/endtreatment/EndTreatmentRinsebackStack.qml (.../EndTreatmentRinsebackStack.qml) (revision bb2557d984b23c29426f452968ea797e6559ac3b) @@ -70,12 +70,14 @@ Connections { target: vTreatmentAdjustmentRinseback function onAdjustmentTriggered ( vValue ) { - // there is only one message to handle all the sub pages of rinseback - // since the rejection reason will be cleared by each trasition - // so it's fine to set all at the same time - // and let them cleared for their own message when each get visible. - _endTreatmentRinsebackInit .reasonText = vTreatmentAdjustmentRinseback.text(); - _endTreatmentRinseback .reasonText = vTreatmentAdjustmentRinseback.text(); + if ( vTreatmentAdjustmentRinseback.adjustment_Accepted ) { + _rinsebackCompleteDialog.notificationText ="" + _rinsebackCompleteDialog.close() + } + else { + _rinsebackCompleteDialog.notificationText = vTreatmentAdjustmentRinseback.text() + } + } } } Index: sources/model/hd/data/treatment/MTreatmentRinsebackData.cpp =================================================================== diff -u -r45cc119e54711893ccc2b9d600412b8f51b7764f -rbb2557d984b23c29426f452968ea797e6559ac3b --- sources/model/hd/data/treatment/MTreatmentRinsebackData.cpp (.../MTreatmentRinsebackData.cpp) (revision 45cc119e54711893ccc2b9d600412b8f51b7764f) +++ sources/model/hd/data/treatment/MTreatmentRinsebackData.cpp (.../MTreatmentRinsebackData.cpp) (revision bb2557d984b23c29426f452968ea797e6559ac3b) @@ -36,7 +36,7 @@ if ( ! GetValue(vByteArray, index, _data.mTimeoutTotal )) goto lError; if ( ! GetValue(vByteArray, index, _data.mTimeoutCountDown )) goto lError; if ( ! GetValue(vByteArray, index, _data.mIsCompleted )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mIsRecircAllowed )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mIsRecircAllowed )) goto lError; return true ;