Index: sources/gui/qml/pages/ManagerStack.qml =================================================================== diff -u -ra58f91b077c8131bea3dbde0fc338adb113fc9f3 -rb532926372ae9d55831088c7c2ff3d4c95fc552a --- sources/gui/qml/pages/ManagerStack.qml (.../ManagerStack.qml) (revision a58f91b077c8131bea3dbde0fc338adb113fc9f3) +++ sources/gui/qml/pages/ManagerStack.qml (.../ManagerStack.qml) (revision b532926372ae9d55831088c7c2ff3d4c95fc552a) @@ -20,7 +20,12 @@ // Qml imports import "qrc:/globals" import "qrc:/components" +import "qrc:/pages/rxmanager" + +import "qrc:/pages/pretreatment" +import "qrc:/pages/pretreatment/create" + /*! * \brief ManagerStack is the screen * which contains the main stack for all the Trearment Manager screens @@ -29,18 +34,44 @@ */ StackItem { id : _root stackView.initialItem : _managerHome + RxManager { id: _managerHome + onAddProfile:{ + _createProfile.clear(true) + page( _createProfile) + } + onVisibleChanged: { + if (visible){ + _mainMenu.hidden = false + vRxProfiles.doInitRxProfilesList() + } + } + } - ScreenItem { id: _managerHome - PlaceHolderText { screenName: qsTr("Prescriptions") } - onVisibleChanged: if (visible) _mainMenu.hidden = true + PreTreatmentCreate{id: _createProfile + isRxProfile : true + header.stepNames : [] + onConfirmClicked : vTreatmentCreate.parametersValidated + ? _root.confirm() + : _createProfile.validate() + onBackClicked : vTreatmentCreate.parametersValidated + ? vTreatmentCreate.doCancel() + : pop() + } + function confirm(){ + print("confirm") + vTreatmentCreate.doAddRxProfile() + pop() + } onVisibleChanged: { if (visible) { _mainMenu.hidden = false + vRxProfiles.doInitRxProfilesList() } else { stackView.initialItem = null } + } }