Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml =================================================================== diff -u -ra8c7ca4936378f104565408a48127e9a8a90495f -r52d17dab2211c2e4d9160c55c316ad7a40ce4d6c --- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml (.../PreTreatmentCreate.qml) (revision a8c7ca4936378f104565408a48127e9a8a90495f) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml (.../PreTreatmentCreate.qml) (revision 52d17dab2211c2e4d9160c55c316ad7a40ce4d6c) @@ -28,11 +28,15 @@ */ PreTreatmentBase { id: _root objectName: "_PreTreatmentCreate" // SquishQt testability + readonly property bool isFirstTab : _preTreatmentCreateContent.currentIndex === PreTreatmentCreateContent.PatientPrescription + property int subStepIndex :_preTreatmentCreateContent.currentIndex - function clear( vValue ) { if ( ! vValue ) return; _preTreatmentCreateContent.clear() } - function confirmReady() { return _preTreatmentCreateContent.confirmReady() } - function confirmButtonClicked() { if (vTreatmentCreate.parametersValidated) { _preTreatmentCreateContent.confirm() } - else { _preTreatmentCreateContent.validate() }} + function clear( vValue ) { if ( ! vValue ) return; _preTreatmentCreateContent.clear() } + function confirmReady() { return _root.isFirstTab ? true : _preTreatmentCreateContent.confirmReady() } + function confirmButtonClicked() { if ( _root.isFirstTab ) { _preTreatmentCreateContent.currentIndex = PreTreatmentCreateContent.TreatmentSettings; return; } + if (vTreatmentCreate.parametersValidated) { _preTreatmentCreateContent.confirm() } + else { _preTreatmentCreateContent.validate() }} + function back() { _preTreatmentCreateContent.currentIndex = PreTreatmentCreateContent.PatientPrescription } PreTreatmentCreateContent { id: _preTreatmentCreateContent anchors {