Index: sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml =================================================================== diff -u -r238262c1ae91d89c2f5bbce80b8e8016e9bbe782 -ra55e0de27d8c427dd4d441f47bb22ca2fe0ca462 --- sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml (.../PreTreatmentStack.qml) (revision 238262c1ae91d89c2f5bbce80b8e8016e9bbe782) +++ sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml (.../PreTreatmentStack.qml) (revision a55e0de27d8c427dd4d441f47bb22ca2fe0ca462) @@ -129,7 +129,6 @@ break case PreTreatmentStack.Step.Prime: if ( _pretreatmentPrime.timeCircleProgressValue === 0 ) { vPreTreatmentAdjustmentDisposablesPrime.doPrime(); } - if ( ! _pretreatmentPrime.isComplete) { _pretreatmentPrime.incrementTest(); return; } // TODO update later only for testing if ( enableWaterSample ) { page ( _pretreatmentWaterSample ) } else { page ( _pretreatmentCreate ) } @@ -200,10 +199,10 @@ function confirmEnabled() { switch ( stepKeys[_root.stackStepIndex] ) { - case PreTreatmentStack.Step.SelfTests: - return _pretreatmentSelfTests.isComplete - case PreTreatmentStack.Step.Prime: - return _pretreatmentPrime.isComplete +// case PreTreatmentStack.Step.SelfTests: +// return _pretreatmentSelfTests.isComplete +// case PreTreatmentStack.Step.Prime: +// return _pretreatmentPrime.isComplete case PreTreatmentStack.Step.WaterSample: return _pretreatmentWaterSample.confirmEnabled case PreTreatmentStack.Step.CreateRx: @@ -248,7 +247,7 @@ } PreTreatmentSelfTests{ id: _pretreatmentSelfTests - onVisibleChanged : if (visible) { _root.stackStepIndex = stepKeys.indexOf(PreTreatmentStack.Step.SelfTests); resetTest() } + onVisibleChanged : if (visible) { _root.stackStepIndex = stepKeys.indexOf(PreTreatmentStack.Step.SelfTests); } } PreTreatmentBase { id: _pretreatmentSaline @@ -257,7 +256,7 @@ } PreTreatmentPrime { id: _pretreatmentPrime - onVisibleChanged : if (visible) { _root.stackStepIndex = stepKeys.indexOf(PreTreatmentStack.Step.Prime); resetTest() } + onVisibleChanged : if (visible) { _root.stackStepIndex = stepKeys.indexOf(PreTreatmentStack.Step.Prime); } } PreTreatmentWaterSample { id: _pretreatmentWaterSample