A lot of work on event related modules. Also a lot of clean up.

This commit is contained in:
Scott Idem
2021-06-08 15:56:00 -04:00
parent b7f6a5ee2a
commit d37234d7d8
10 changed files with 66 additions and 34 deletions

View File

@@ -23,6 +23,8 @@ def load_event_presentation_obj(
event_presentation_id: int|str,
enabled: str = 'enabled', # enabled, disabled, all
limit: int = 1000,
inc_address: bool = False,
inc_contact: bool = False,
inc_event_abstract_list: bool = False,
inc_event_badge: bool = False,
#inc_event_badge_list: bool = False,
@@ -96,7 +98,7 @@ def load_event_presentation_obj(
sql = f"""
SELECT `event_presenter`.id AS 'event_presenter_id', `event_presenter`.id_random AS 'event_presenter_id_random'
FROM `event_presenter` AS `event_presenter`
WHERE `event_presenter`.event_presenter_id = :event_presenter_id
WHERE `event_presenter`.event_presentation_id = :event_presentation_id
{sql_enabled}
ORDER BY `event_presenter`.created_on DESC, `event_presenter`.updated_on DESC;
"""
@@ -111,6 +113,8 @@ def load_event_presentation_obj(
if event_presenter_obj := load_event_presenter_obj(
event_presenter_id=event_presenter_id,
enabled=enabled,
inc_address=inc_address,
inc_contact=inc_contact,
inc_event_abstract_list=inc_event_abstract_list,
inc_event_badge=inc_event_badge,
inc_event_device_list=inc_event_device_list,
@@ -123,10 +127,11 @@ def load_event_presentation_obj(
data = event_presenter_obj.dict(by_alias=True, exclude_unset=True)
event_presenter_obj_li.append(data)
log.debug(event_presenter_obj_li)
event_presenter_obj.event_presenter_list = event_presenter_obj_li
event_presentation_obj.event_presenter_list = event_presenter_obj_li
else:
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(event_presenter_obj_li_result)
event_presentation_obj.event_presenter_list = []
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
#if inc_user: pass
else: