From aa3033e1f417ca2d3010a9d0cf681b4c215ed8dc Mon Sep 17 00:00:00 2001 From: Scott Idem Date: Mon, 24 Jun 2024 16:31:42 -0400 Subject: [PATCH] Bug fix for event_presenter query with Excel export --- app/ae_obj_types_def.py | 14 ++++++++++++-- app/routers/api_crud_v2.py | 3 +++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/app/ae_obj_types_def.py b/app/ae_obj_types_def.py index aeea3e6..5bbd457 100644 --- a/app/ae_obj_types_def.py +++ b/app/ae_obj_types_def.py @@ -116,8 +116,18 @@ obj_type_kv_li = { 'comments', 'enable', 'hide', 'priority', 'sort', 'group', 'notes', 'created_on', 'updated_on', ], + # WARNING: These must be updated soon! + 'table_name': 'v_event_presenter', + 'table_name_alt': 'v_event_presenter_w_file_count', + 'tbl_name_update': 'event_presenter', + 'base_name': Event_Presenter_Base + # WARNING: These must be updated soon! }, -} # New 2024-04-23 +} +# WARNING: These must be updated soon! + + +# New 2024-04-23 # obj_type_kv_li['example_template'] = {'tbl': 'example_template', 'tbl_default': 'v_example_template', 'tbl_update': 'example_template', 'mdl': Example_Template_Base, 'mdl_in': Example_Template_In_Base, 'mdl_out': Example_Template_Out_Base } # obj_type_kv_li['sponsorship'] = {'tbl': 'sponsorship', 'tbl_default': 'v_sponsorship', 'tbl_update': 'sponsorship', 'mdl': Sponsorship_Base, 'mdl_in': None, 'mdl_out': None } @@ -208,7 +218,7 @@ obj_type_kv_li['event_location'] = {'table_name': 'v_event_location', 'table_nam obj_type_kv_li['event_person'] = {'table_name': 'v_event_person', 'tbl_name_update': 'event_person', 'base_name': Event_Person_Base} obj_type_kv_li['event_person_tracking'] = {'table_name': 'v_event_person_tracking', 'tbl_name_update': 'event_person_tracking', 'base_name': Event_Person_Tracking_Base} obj_type_kv_li['event_presentation'] = {'table_name': 'v_event_presentation', 'table_name_alt': 'v_event_presentation_w_file_count', 'tbl_name_update': 'event_presentation', 'base_name': Event_Presentation_Base} -obj_type_kv_li['event_presenter'] = {'table_name': 'v_event_presenter', 'table_name_alt': 'v_event_presenter_w_file_count', 'tbl_name_update': 'event_presenter', 'base_name': Event_Presenter_Base} +# obj_type_kv_li['event_presenter'] = {'table_name': 'v_event_presenter', 'table_name_alt': 'v_event_presenter_w_file_count', 'tbl_name_update': 'event_presenter', 'base_name': Event_Presenter_Base} obj_type_kv_li['event_registration'] = {'table_name': 'v_event_registration', 'tbl_name_update': 'event_registration', 'base_name': Event_Registration_Base} obj_type_kv_li['event_session'] = {'table_name': 'v_event_session', 'table_name_alt': 'v_event_session_w_file_count', 'tbl_name_update': 'event_session', 'base_name': Event_Session_Base, 'exclude_for_db': {'poc_person_id', 'file_count', 'internal_use_count', 'enable_from', 'enable_to', 'event_name', 'event_start_datetime', 'event_end_datetime', 'event_location_name', 'event_track_name', 'event_abstract_list', 'event_badge_list', 'event_device_list', 'event_file_list', 'event_file_internal_use_list', 'event_location', 'event_location_list', 'event_person_list', 'event_presenter_cat', 'event_presentation_list', 'event_presenter_list', 'event_track', 'poc_event_person'}} obj_type_kv_li['event_track'] = {'table_name': 'v_event_track', 'tbl_name_update': 'event_track', 'base_name': Event_Track_Base} diff --git a/app/routers/api_crud_v2.py b/app/routers/api_crud_v2.py index 64536d1..c0f9405 100644 --- a/app/routers/api_crud_v2.py +++ b/app/routers/api_crud_v2.py @@ -307,6 +307,9 @@ def handle_get_obj_li( # This should be a dict list of fields with a list of values to search for using AND LIKE. and_like_dict_obj = None + # This should be a dict list of fields with a list of values to search for using OR LIKE. + or_like_dict_obj = None + # This should be a dict list of fields with a list of values to search for using AND IN. and_in_dict_li_obj = None