Index: sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml =================================================================== diff -u -rb67c15152e0bd979d3a96f44abcea23d22dcd735 -r9409e95998fd4e181b5c8a5b87c6757fac1ee0f1 --- sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml (.../PreTreatmentStack.qml) (revision b67c15152e0bd979d3a96f44abcea23d22dcd735) +++ sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml (.../PreTreatmentStack.qml) (revision 9409e95998fd4e181b5c8a5b87c6757fac1ee0f1) @@ -115,8 +115,6 @@ setPage ( _pretreatmentPrime ) break case PreTreatmentStack.Step.Prime: - if ( _pretreatmentPrime.timeCircleProgressValue === 0 ) { vPreTreatmentAdjustmentDisposablesPrime.doPrime(); } - setPage ( _pretreatmentCreate ) break case PreTreatmentStack.Step.CreateRx: _pretreatmentCreate.confirmButtonClicked() @@ -179,7 +177,7 @@ // case PreTreatmentStack.Step.SelfTests: // TODO set when implementing self test/ prime // return _pretreatmentSelfTests.isComplete // case PreTreatmentStack.Step.Prime: -// return _pretreatmentPrime.isComplete +// return false case PreTreatmentStack.Step.CreateRx: return _pretreatmentCreate.confirmReady() default: @@ -247,16 +245,16 @@ function onGoToPreviousStep () { setPage ( _pretreatmentConcentrates )} } - // priming - Connections { target: vPreTreatmentAdjustmentDisposablesPrime - function onAdjustmentTriggered ( vValue ) { - if ( vPreTreatmentAdjustmentDisposablesPrime.adjustment_Accepted ) { - _pretreatmentPrime.reasonText = "" - } else { - _pretreatmentPrime.reasonText = vPreTreatmentAdjustmentDisposablesPrime.text() - } - } - } + // priming - TODO check if needed. may not need +// Connections { target: vPreTreatmentAdjustmentDisposablesPrime +// function onAdjustmentTriggered ( vValue ) { +// if ( vPreTreatmentAdjustmentDisposablesPrime.adjustment_Accepted ) { +// _pretreatmentPrime.reasonText = "" +// } else { +// _pretreatmentPrime.reasonText = vPreTreatmentAdjustmentDisposablesPrime.text() +// } +// } +// } // creat rx Connections{ target: vTreatmentCreate