diff --git a/app/main.py b/app/main.py index 76a9ab8..b7b0007 100644 --- a/app/main.py +++ b/app/main.py @@ -18,7 +18,7 @@ from app.lib_general import * from app.log import log # Import the routers here first: -from app.routers import api_crud, api, account, address, archive, archive_content, contact, event, event_exhibit, event_person, event_person_detail, event_presenter, event_registration, event_session, flask_cfg, hosted_file, journal, journal_entry, lookup, membership, order, order_cart, organization, page, person, post, post_comment, product, site, site_domain, user, user_person, websockets # , items, journals +from app.routers import api_crud, api, account, address, archive, archive_content, contact, event, event_exhibit, event_person, event_person_detail, event_presentation, event_presenter, event_registration, event_session, flask_cfg, hosted_file, journal, journal_entry, lookup, membership, order, order_cart, organization, page, person, post, post_comment, product, site, site_domain, user, user_person, websockets # , items, journals from app.db_sql import db @@ -142,6 +142,14 @@ app.include_router( #dependencies=[Depends(get_account_header)], #responses={404: {'description': 'Not found'}}, ) +app.include_router( + event_presentation.router, + prefix='/event/presentation', + tags=['Event Presenter'], + #dependencies=[DependPresenter(get_token_header)], + #dependencies=[Depends(get_account_header)], + #responses={404: {'description': 'Not found'}}, +) app.include_router( event_presenter.router, prefix='/event/presenter', diff --git a/app/methods/event_presentation_methods.py b/app/methods/event_presentation_methods.py index 7f7e0fd..4ebc035 100644 --- a/app/methods/event_presentation_methods.py +++ b/app/methods/event_presentation_methods.py @@ -24,15 +24,17 @@ def load_event_presentation_obj( enabled: str = 'enabled', # enabled, disabled, all limit: int = 1000, inc_event_abstract_list: bool = False, + inc_event_badge: bool = False, #inc_event_badge_list: bool = False, inc_event_device_list: bool = False, inc_event_file_list: bool = False, + inc_event_person: bool = False, inc_event_person_list: bool = False, inc_event_presenter_list: bool = False, - #inc_event_cfg: bool = False, - #inc_poc_event_person: bool = False, - #inc_poc_person: bool = False, - #inc_user: bool = False, + inc_event_registration: bool = False, + #inc_event_registration_list: bool = False, + inc_person: bool = False, + inc_user: bool = False, ) -> Event_Presentation_Base|bool: log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.debug(locals()) @@ -110,10 +112,13 @@ def load_event_presentation_obj( event_presenter_id=event_presenter_id, enabled=enabled, inc_event_abstract_list=inc_event_abstract_list, + inc_event_badge=inc_event_badge, inc_event_device_list=inc_event_device_list, inc_event_file_list=inc_event_file_list, - inc_event_person_list=inc_event_person_list, - inc_event_presenter_list=inc_event_presenter_list, + inc_event_person=inc_event_person, + inc_event_registration=inc_event_registration, + inc_person=inc_person, + inc_user=inc_user, ): data = event_presenter_obj.dict(by_alias=True, exclude_unset=True) event_presenter_obj_li.append(data) diff --git a/app/routers/account.py b/app/routers/account.py index c923149..f0a3988 100644 --- a/app/routers/account.py +++ b/app/routers/account.py @@ -9,7 +9,7 @@ from app.lib_general import log, logging from app.config import settings from app.db_sql import * -from .api_crud import delete_obj_template, get_obj_template, get_obj_li_template, patch_obj_template, post_obj_template +from app.routers.api_crud import delete_obj_template, get_obj_template, get_obj_li_template, patch_obj_template, post_obj_template from app.methods.account_methods import load_account_cfg_obj diff --git a/app/routers/event_person.py b/app/routers/event_person.py index 534d7f6..b7029ee 100644 --- a/app/routers/event_person.py +++ b/app/routers/event_person.py @@ -9,7 +9,7 @@ from app.lib_general import log, logging from app.config import settings from app.db_sql import * -from .api_crud import delete_obj_template, get_obj_template, get_obj_li_template, patch_obj_template, post_obj_template +from app.routers.api_crud import delete_obj_template, get_obj_template, get_obj_li_template, patch_obj_template, post_obj_template from app.methods.event_person_methods import create_event_person_obj, load_event_person_obj from app.methods.person_methods import create_person_obj, load_person_obj diff --git a/app/routers/event_presenter.py b/app/routers/event_presenter.py index 66fa358..993be1d 100644 --- a/app/routers/event_presenter.py +++ b/app/routers/event_presenter.py @@ -9,7 +9,7 @@ from app.lib_general import log, logging from app.config import settings from app.db_sql import * -from .api_crud import delete_obj_template, get_obj_template, get_obj_li_template, patch_obj_template, post_obj_template +from app.routers.api_crud import delete_obj_template, get_obj_template, get_obj_li_template, patch_obj_template, post_obj_template from app.methods.event_presenter_methods import load_event_presenter_obj diff --git a/app/routers/event_session.py b/app/routers/event_session.py index 677ec89..a1d15a4 100644 --- a/app/routers/event_session.py +++ b/app/routers/event_session.py @@ -9,7 +9,7 @@ from app.lib_general import log, logging from app.config import settings from app.db_sql import * -from .api_crud import delete_obj_template, get_obj_template, get_obj_li_template, patch_obj_template, post_obj_template +from app.routers.api_crud import delete_obj_template, get_obj_template, get_obj_li_template, patch_obj_template, post_obj_template from app.methods.event_session_methods import load_event_session_obj diff --git a/app/routers/order.py b/app/routers/order.py index b9e0f01..79d43e3 100644 --- a/app/routers/order.py +++ b/app/routers/order.py @@ -9,7 +9,7 @@ from ..log import * from app.config import settings from app.db_sql import * -from .api_crud import delete_obj_template, get_obj_template, get_obj_li_template, patch_obj_template, post_obj_template +from app.routers.api_crud import delete_obj_template, get_obj_template, get_obj_li_template, patch_obj_template, post_obj_template from app.methods.order_methods import load_order_obj, save_order_obj diff --git a/app/routers/person.py b/app/routers/person.py index 60c1ffa..951e037 100644 --- a/app/routers/person.py +++ b/app/routers/person.py @@ -9,7 +9,7 @@ from app.lib_general import log, logging from app.config import settings from app.db_sql import * -from .api_crud import delete_obj_template, get_obj_template, get_obj_li_template, patch_obj_template, post_obj_template +from app.routers.api_crud import delete_obj_template, get_obj_template, get_obj_li_template, patch_obj_template, post_obj_template from app.methods.person_methods import load_person_obj diff --git a/app/routers/user.py b/app/routers/user.py index f66342c..34c40b0 100644 --- a/app/routers/user.py +++ b/app/routers/user.py @@ -9,7 +9,7 @@ from app.lib_general import log, logging, secure_hash_string, verify_secure_hash from app.config import settings from app.db_sql import * -from .api_crud import delete_obj_template, get_obj_template, get_obj_li_template, patch_obj_template, post_obj_template +from app.routers.api_crud import delete_obj_template, get_obj_template, get_obj_li_template, patch_obj_template, post_obj_template from app.methods.user_methods import load_user_obj