From e97e8e56e869eb2929f36ea4b0232718c17566cc Mon Sep 17 00:00:00 2001 From: Scott Idem Date: Mon, 8 Nov 2021 17:00:51 -0500 Subject: [PATCH] Work on event stuff --- app/methods/event_presentation_methods.py | 4 ++-- app/methods/event_presenter_methods.py | 2 +- app/methods/event_session_methods.py | 4 ++-- app/routers/event_session.py | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/methods/event_presentation_methods.py b/app/methods/event_presentation_methods.py index 08e2027..81778f7 100644 --- a/app/methods/event_presentation_methods.py +++ b/app/methods/event_presentation_methods.py @@ -164,7 +164,7 @@ def load_event_presentation_obj( WHERE `event_presenter`.event_presentation_id = :event_presentation_id {sql_hidden} {sql_enabled} - ORDER BY `event_presenter`.created_on DESC, `event_presenter`.updated_on DESC; + ORDER BY `event_presenter`.priority DESC, `event_presenter`.sort ASC, `event_presenter`.family_name ASC, `event_presenter`.given_name ASC, `event_presenter`.display_name ASC, `event_presenter`.full_name ASC, `event_presenter`.created_on DESC, `event_presenter`.updated_on DESC; """ log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL @@ -293,7 +293,7 @@ def get_event_presentation_rec_list( {sql_where_event_session_id} {sql_hidden} {sql_enabled} - ORDER BY `event_presentation`.start_datetime ASC, `event_presentation`.sort ASC, `event_presentation`.name ASC, `event_presentation`.created_on DESC, `event_presentation`.updated_on DESC + ORDER BY `event_presentation`.priority DESC, `event_presentation`.sort ASC, `event_presentation`.start_datetime ASC, `event_presentation`.sort ASC, `event_presentation`.name ASC, `event_presentation`.created_on DESC, `event_presentation`.updated_on DESC {sql_limit}; """ diff --git a/app/methods/event_presenter_methods.py b/app/methods/event_presenter_methods.py index 644af42..ae1ab4b 100644 --- a/app/methods/event_presenter_methods.py +++ b/app/methods/event_presenter_methods.py @@ -245,7 +245,7 @@ def get_event_presenter_rec_list( {sql_where_event_presentation_id} {sql_hidden} {sql_enabled} - ORDER BY `event_presenter`.created_on DESC, `event_presenter`.updated_on DESC + ORDER BY `event_presenter`.priority DESC, `event_presenter`.sort ASC, `event_presenter`.family_name ASC, `event_presenter`.given_name ASC, `event_presenter`.display_name ASC, `event_presenter`.full_name ASC, `event_presenter`.created_on DESC, `event_presenter`.updated_on DESC {sql_limit}; """ diff --git a/app/methods/event_session_methods.py b/app/methods/event_session_methods.py index 15695c1..fb9c1af 100644 --- a/app/methods/event_session_methods.py +++ b/app/methods/event_session_methods.py @@ -189,7 +189,7 @@ def load_event_session_obj( WHERE `event_presentation`.event_session_id = :event_session_id {sql_hidden} {sql_enabled} - ORDER BY `event_presentation`.priority DESC, `event_presentation`.created_on DESC, `event_presentation`.updated_on DESC; + ORDER BY `event_presentation`.priority DESC, `event_presentation`.sort ASC, `event_presentation`.start_datetime ASC, `event_presentation`.sort ASC, `event_presentation`.name ASC, `event_presentation`.created_on DESC, `event_presentation`.updated_on DESC; """ #log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL @@ -354,7 +354,7 @@ def get_event_session_rec_list( {sql_approved} {sql_hidden} {sql_enabled} - ORDER BY `event_session`.start_datetime ASC, `event_session`.sort ASC, `event_session`.name ASC, `event_session`.created_on DESC, `event_session`.updated_on DESC + ORDER BY `event_session`.priority DESC, `event_session`.sort ASC, `event_session`.start_datetime ASC, `event_session`.name ASC, `event_session`.created_on DESC, `event_session`.updated_on DESC {sql_limit}; """ diff --git a/app/routers/event_session.py b/app/routers/event_session.py index e6a28d5..9efe17c 100644 --- a/app/routers/event_session.py +++ b/app/routers/event_session.py @@ -37,7 +37,7 @@ async def post_event_session_obj_new_v4( exclude_unset: bool = True, response: Response = Response, ): - log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL + log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.debug(locals()) # There should probably be a check for the event ID before calling the create function? @@ -92,7 +92,7 @@ async def patch_event_session_obj_exist_v4( exclude_none: Optional[bool] = True, response: Response = Response, ): - log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL + log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.debug(locals()) if event_session_id := redis_lookup_id_random(record_id_random=event_session_id, table_name='event_session'): pass