Index: sources/gui/qml/components/StepBullet.qml =================================================================== diff -u -r4a2b83dcb56555861d2c741a8e8894e5b07e24bf -r952d633ac2d84a05dff3355cf864064b21a5ee7e --- sources/gui/qml/components/StepBullet.qml (.../StepBullet.qml) (revision 4a2b83dcb56555861d2c741a8e8894e5b07e24bf) +++ sources/gui/qml/components/StepBullet.qml (.../StepBullet.qml) (revision 952d633ac2d84a05dff3355cf864064b21a5ee7e) @@ -62,7 +62,7 @@ radius : _root.diameter color : _root.current ? colorCurrent : _root.complete ? _root.colorComplete : Colors.transparent border.color: _root.current ? colorComplete : _root.complete ? _root.colorComplete : _root.colorInComplete - border.width: 1 + border.width: 2 } Image { id: _checkComplete Index: sources/gui/qml/pages/posttreatment/PostTreatmentDisconnectStack.qml =================================================================== diff -u -r627062628b60e4d512ee8830c2dbc23eef02fe28 -r952d633ac2d84a05dff3355cf864064b21a5ee7e --- sources/gui/qml/pages/posttreatment/PostTreatmentDisconnectStack.qml (.../PostTreatmentDisconnectStack.qml) (revision 627062628b60e4d512ee8830c2dbc23eef02fe28) +++ sources/gui/qml/pages/posttreatment/PostTreatmentDisconnectStack.qml (.../PostTreatmentDisconnectStack.qml) (revision 952d633ac2d84a05dff3355cf864064b21a5ee7e) @@ -26,6 +26,9 @@ if (visible) { _headerBar.activeStack = stackView } + else { + stackView.initialItem = null + } } signal goToNextStep() @@ -40,6 +43,7 @@ switch ( _root.subStepIndex ) { case PostTreatmentDisconnectStack.Step.DisconnectPatient: vPostTreatmentAdjustmentPatientDisconnectionConfirm.doConfirm() + startNavigationTimer(_postTreatmentDrainConsumables) // TODO remove later with integration break case PostTreatmentDisconnectStack.Step.DrainConsumable: goToNextStep () Index: sources/gui/qml/pages/posttreatment/PostTreatmentStack.qml =================================================================== diff -u -r6825a57fe430253271712f0afbac14d046b44794 -r952d633ac2d84a05dff3355cf864064b21a5ee7e --- sources/gui/qml/pages/posttreatment/PostTreatmentStack.qml (.../PostTreatmentStack.qml) (revision 6825a57fe430253271712f0afbac14d046b44794) +++ sources/gui/qml/pages/posttreatment/PostTreatmentStack.qml (.../PostTreatmentStack.qml) (revision 952d633ac2d84a05dff3355cf864064b21a5ee7e) @@ -58,13 +58,33 @@ } } + ////////////// 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 ) Index: sources/gui/qml/pages/pretreatment/PreTreatmentInstallStack.qml =================================================================== diff -u -r0975a67dd4e4673b9a7b226bfea02cbfa489c418 -r952d633ac2d84a05dff3355cf864064b21a5ee7e --- sources/gui/qml/pages/pretreatment/PreTreatmentInstallStack.qml (.../PreTreatmentInstallStack.qml) (revision 0975a67dd4e4673b9a7b226bfea02cbfa489c418) +++ sources/gui/qml/pages/pretreatment/PreTreatmentInstallStack.qml (.../PreTreatmentInstallStack.qml) (revision 952d633ac2d84a05dff3355cf864064b21a5ee7e) @@ -33,12 +33,32 @@ signal goToNextStep() signal goToPreviousStep() + ////////////// 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 initStack() { page ( _preTreatmentBloodSetTubing ) } function continueClicked() { switch ( _root.subStepIndex ) { case PreTreatmentInstallStack.Step.BloodSetTubing: vPreTreatmentAdjustmentDisposablesConfirm.doConfirm() + startNavigationTimer(_preTreatmentBloodLines) // TODO remove later with integration break case PreTreatmentInstallStack.Step.BloodLines: page ( _preTreatmentPressureLinesAndDialyzer ) Index: sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml =================================================================== diff -u -r0975a67dd4e4673b9a7b226bfea02cbfa489c418 -r952d633ac2d84a05dff3355cf864064b21a5ee7e --- sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml (.../PreTreatmentStack.qml) (revision 0975a67dd4e4673b9a7b226bfea02cbfa489c418) +++ sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml (.../PreTreatmentStack.qml) (revision 952d633ac2d84a05dff3355cf864064b21a5ee7e) @@ -59,6 +59,25 @@ } } + ////////////// 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() + } + ////////////////////////////////////////// + // dynamically rebuild map 🗺️ when entering pretreatment. // { step key (enum) : step name (string) } -- decided to use 2 parallel list for better indexing function rebuildMap() { @@ -100,7 +119,8 @@ page ( _pretreatmentInstallation ) break case PreTreatmentStack.Step.Installation: - if ( vSettings.advancedMode ) { vPreTreatmentAdjustmentDisposablesConfirm.doConfirm() } + if ( vSettings.advancedMode ) { vPreTreatmentAdjustmentDisposablesConfirm.doConfirm() + startNavigationTimer(_pretreatmentSelfTests) }// TODO remove later with integration else { _pretreatmentInstallation.continueClicked() } break case PreTreatmentStack.Step.SelfTests: