diff --git a/src/lib/ae_events/ae_events__event_session.ts b/src/lib/ae_events/ae_events__event_session.ts index c17ceff7..6ecc9e29 100644 --- a/src/lib/ae_events/ae_events__event_session.ts +++ b/src/lib/ae_events/ae_events__event_session.ts @@ -585,8 +585,9 @@ export async function qry__event_session( qry_poc_kv_json, enabled = 'enabled', hidden = 'not_hidden', - limit = 50, + limit = 49, offset = 0, + order_by_li = {'priority': 'DESC', 'sort': 'DESC', 'start_datetime': 'ASC', 'name': 'ASC', 'updated_on': 'DESC', 'created_on': 'DESC'}, params = {}, try_cache = true, log_lvl = 0 @@ -602,6 +603,7 @@ export async function qry__event_session( hidden?: string, // all, hidden, not_hidden limit?: number, offset?: number, + order_by_li?: key_val, params?: any, try_cache?: boolean, log_lvl?: number @@ -611,18 +613,8 @@ export async function qry__event_session( console.log(`*** qry__event_session() *** event_id=${event_id} qry_str=${qry_str}`); } - // let enabled: string = (params.qry__enabled ?? 'enabled'); // all, disabled, enabled - // let hidden: string = (params.qry__hidden ?? 'not_hidden'); // all, hidden, not_hidden - // let limit: number = (params.qry__limit ?? 25); // 99 - // let offset: number = (params.qry__offset ?? 0); // 0 - let params_json: key_val = {}; - // if (qry_str && qry_str.length > 2) { - // params_json['ft_qry'] = {}; - // params_json['ft_qry']['default_qry_str'] = qry_str; - // } - params_json['qry'] = []; if (qry_files === true) { @@ -705,8 +697,6 @@ export async function qry__event_session( params_json['qry'].push(qry_param); } - let order_by_li = {'priority': 'DESC', 'sort': 'DESC', 'start_datetime': 'ASC', 'name': 'ASC', 'updated_on': 'DESC', 'created_on': 'DESC'}; - ae_promises.load__event_session_obj_li = await api.get_ae_obj_li_for_obj_id_crud_v2({ api_cfg: api_cfg, obj_type: 'event_session', @@ -779,14 +769,15 @@ export async function search__event_session( like_search_qry_str = null, like_presentation_search_qry_str = null, like_presenter_search_qry_str = null, + like_poc_name_qry_str = null, file_count = false, // If true then only show those that have a file count location_name = null, - params = { - 'qry__enabled': 'enabled', - 'qry__hidden':'not_hidden', - 'qry__limit': 150, - 'qry__offset': 0 - }, + enabled = 'enabled', + hidden = 'not_hidden', + limit = 49, + offset = 0, + order_by_li = {'priority': 'DESC', 'sort': 'DESC', 'start_datetime': 'ASC', 'name': 'ASC', 'updated_on': 'DESC', 'created_on': 'DESC'}, + params = {}, try_cache = true, log_lvl = 0 }: { @@ -798,21 +789,27 @@ export async function search__event_session( like_search_qry_str?: null|string, like_presentation_search_qry_str?: null|string, like_presenter_search_qry_str?: null|string, + like_poc_name_qry_str?: null|string, file_count?: boolean, location_name?: null|string, - params?: any, + enabled?: string, // all, disabled, enabled + hidden?: string, // all, hidden, not_hidden + limit?: number, + offset?: number, + order_by_li?: key_val, + params?: key_val, try_cache?: boolean, log_lvl?: number } ) { if (log_lvl) { - console.log(`*** search__event_session() *** event_id=${event_id}`); + console.log(`*** search__event_session() *** event_id=${event_id} like_search_qry_str=${like_search_qry_str} location_name=${location_name}`); } - let enabled: string = (params.qry__enabled ?? 'enabled'); // all, disabled, enabled - let hidden: string = (params.qry__hidden ?? 'not_hidden'); // all, hidden, not_hidden - let limit: number = (params.qry__limit ?? 25); // 99 - let offset: number = (params.qry__offset ?? 0); // 0 + // let enabled: string = (params.qry__enabled ?? 'enabled'); // all, disabled, enabled + // let hidden: string = (params.qry__hidden ?? 'not_hidden'); // all, hidden, not_hidden + // let limit: number = (params.qry__limit ?? 25); // 99 + // let offset: number = (params.qry__offset ?? 0); // 0 let params_json: key_val = {}; @@ -844,7 +841,7 @@ export async function search__event_session( // } // Use the AND (OR LIKE) query - if (like_search_qry_str || like_presentation_search_qry_str || like_presenter_search_qry_str) { + if (like_search_qry_str || like_presentation_search_qry_str || like_presenter_search_qry_str || like_poc_name_qry_str) { params_json['or_like'] = {}; if (like_search_qry_str && like_search_qry_str.length > 2) { params_json['or_like']['default_qry_str'] = like_search_qry_str; @@ -855,6 +852,9 @@ export async function search__event_session( if (like_presenter_search_qry_str && like_presenter_search_qry_str.length > 2) { params_json['or_like']['event_presenter_li_qry_str'] = like_presenter_search_qry_str; } + if (like_poc_name_qry_str && like_poc_name_qry_str.length > 2) { + params_json['or_like']['poc_person_full_name'] = like_poc_name_qry_str; + } } params_json['and_qry'] = {}; @@ -872,7 +872,7 @@ export async function search__event_session( params_json['and_qry']['event_location_name'] = location_name; } - let order_by_li = {'priority': 'DESC', 'sort': 'DESC', 'start_datetime': 'ASC', 'name': 'ASC', 'updated_on': 'DESC', 'created_on': 'DESC'}; + // let order_by_li = {'priority': 'DESC', 'sort': 'DESC', 'start_datetime': 'ASC', 'name': 'ASC', 'updated_on': 'DESC', 'created_on': 'DESC'}; // ae_promises.load__event_session_obj_li = await api.get_ae_obj_li_for_obj_id_crud({ ae_promises.load__event_session_obj_li = await api.get_ae_obj_li_for_obj_id_crud_v2({ diff --git a/src/routes/events/[event_id]/+page.svelte b/src/routes/events/[event_id]/+page.svelte index 60e49f2d..e4cd5982 100644 --- a/src/routes/events/[event_id]/+page.svelte +++ b/src/routes/events/[event_id]/+page.svelte @@ -336,6 +336,7 @@ async function handle_search__event_session( like_search_qry_str: lk_search_str, like_presentation_search_qry_str: lk_search_str, like_presenter_search_qry_str: lk_search_str, + like_poc_name_qry_str: lk_search_str, // external_event_id: $events_loc.pres_mgmt.default__external_registration_id, location_name: and_lk_location_name, params: params,