Scott.Idem/OSIT-AE-API-FastAPI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor clean up

Browse Source
This commit is contained in:
Scott Idem
2022-03-31 13:48:30 -04:00
parent db475ddef1
commit 14caad33e4
6 changed files with 51 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/methods/event_exhibit_methods.py
View File

@@ -247,7 +247,7 @@ def get_event_exhibit_rec_list(
{sql_select_event_exhibit_id}
{sql_select_event_person_id}
{sql_enabled}
ORDER BY `event_exhibit`.created_on DESC, `event_exhibit`.updated_on DESC
ORDER BY `event_exhibit`.priority DESC, `event_exhibit`.sort ASC, `event_exhibit`.name ASC, `event_exhibit`.created_on DESC, `event_exhibit`.updated_on DESC
{sql_limit};
"""

27
app/methods/event_methods.py
View File

@@ -177,7 +177,32 @@ def load_event_obj(
else: event_obj.event_cfg = {} # None
if inc_event_device_list: pass
if inc_event_exhibit_list: pass
# Updated 2022-03-30
if inc_event_exhibit_list:
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.info('Need to include event exhibit list...')
from app.methods.event_exhibit_methods import get_event_exhibit_rec_list, load_event_exhibit_obj
if event_exhibit_rec_list_result := get_event_exhibit_rec_list(
event_id = event_id,
enabled = enabled,
):
event_exhibit_result_list = []
for event_exhibit_rec in event_exhibit_rec_list_result:
if load_event_exhibit_result := load_event_exhibit_obj(
event_exhibit_id = event_exhibit_rec.get('event_exhibit_id', None),
enabled = enabled,
):
event_exhibit_result_list.append(load_event_exhibit_result)
else:
event_exhibit_result_list.append(None)
log.debug(event_exhibit_result_list)
event_obj.event_exhibit_list = event_exhibit_result_list
elif isinstance(event_exhibit_rec_list_result, list):
event_obj.event_exhibit_list = []
else:
event_obj.event_exhibit_list = None
# Updated 2021-10-21
if inc_event_file_list: