Index: sources/gui/qml/pages/posttreatment/PostTreatmentStack.qml =================================================================== diff -u -rfdddcd8b25b5acc99f8c044c998af0e95752063c -r7fb13d9e1a453a37ab4dea5536e0f19ed6e272d2 --- sources/gui/qml/pages/posttreatment/PostTreatmentStack.qml (.../PostTreatmentStack.qml) (revision fdddcd8b25b5acc99f8c044c998af0e95752063c) +++ sources/gui/qml/pages/posttreatment/PostTreatmentStack.qml (.../PostTreatmentStack.qml) (revision 7fb13d9e1a453a37ab4dea5536e0f19ed6e272d2) @@ -52,40 +52,19 @@ if (visible) { _mainMenu.hidden = true _headerBar.activeStack = stackView - page( _postTreatmentDisconnectStack) //REMOVE FOR DEMO ONLY } else { stackView.initialItem = null } } - ////////////// TODO Test Code Remove for integration///////////// - Timer { id: _navigationTimer - interval: 2000 - repeat : false - onTriggered: { - if (targetPage) { - page(targetPage) - } - } - } - - property var targetPage - - function startNavigationTimer(pageComponent) { - targetPage = pageComponent - _navigationTimer.restart() - } - ////////////////////////////////////////// - function confirmClicked() { switch ( _root.stackStepIndex ) { case PostTreatmentStack.Disconnect: _postTreatmentDisconnectStack.continueClicked() break case PostTreatmentStack.Remove: vPostTreatmentAdjustmentDisposablesRemovalConfirm.doConfirm() - startNavigationTimer(_postTreatmentReview) // TODO remove later with integration break case PostTreatmentStack.Review: page( _postTreatmentDisinfection ) @@ -238,19 +217,6 @@ function onGoToNextStep () { page ( _postTreatmentRemove )} } - // Confirm Patient Disconnection - Connections { target: vPostTreatmentAdjustmentPatientDisconnectionConfirm - function onAdjustmentTriggered ( vValue ) { - if ( vPostTreatmentAdjustmentPatientDisconnectionConfirm.adjustment_Accepted ) { - _postTreatmentReview.reasonText = "" - _postTreatmentDisconnectStack.goToDrain() - - } else { - _postTreatmentReview.reasonText = vPostTreatmentAdjustmentPatientDisconnectionConfirm.text() - } - } - } - // Auto - Eject Connections { target: vPostTreatmentAdjustmentDisposablesRemovalConfirm function onAdjustmentTriggered ( vValue ) {