From 0ec9cbbd0878113e22013e2d21a711e09e6d0544 Mon Sep 17 00:00:00 2001 From: Scott Idem Date: Wed, 14 Aug 2024 16:06:21 -0400 Subject: [PATCH] Renaming standard object functions --- src/lib/ae_events__event_location.ts | 36 +++++++++---------- src/lib/ae_events__event_session.ts | 28 +++++++-------- src/lib/ae_events_functions.ts | 32 ++++++++--------- .../(launcher)/launcher/[slug]/+page.ts | 4 +-- .../launcher/[slug]/+page@(launcher).svelte | 4 +-- .../launcher/[slug]/launcher_menu.svelte | 2 +- .../event/[slug]/+page.svelte | 2 +- .../events_pres_mgmt/event/[slug]/+page.ts | 2 +- .../events_pres_mgmt/session_view.svelte | 6 ++-- 9 files changed, 58 insertions(+), 58 deletions(-) diff --git a/src/lib/ae_events__event_location.ts b/src/lib/ae_events__event_location.ts index 5d916460..aa3ef2ce 100644 --- a/src/lib/ae_events__event_location.ts +++ b/src/lib/ae_events__event_location.ts @@ -4,13 +4,13 @@ import { api } from '$lib/api'; import { db_events } from "$lib/db_events"; import { handle_load_ae_obj_li__event_file } from "$lib/ae_events__event_file"; -import { handle_load_ae_obj_li__event_session } from './ae_events__event_session'; +import { load_ae_obj_li__event_session } from './ae_events__event_session'; let ae_promises: key_val = {}; // Updated 2024-06-10 -export async function handle_load_ae_obj_id__event_location( +export async function load_ae_obj_id__event_location( { api_cfg, event_location_id, @@ -27,7 +27,7 @@ export async function handle_load_ae_obj_id__event_location( log_lvl?: number } ) { - console.log(`*** handle_load_ae_obj_id__event_location() *** event_location_id=${event_location_id}`); + console.log(`*** load_ae_obj_id__event_location() *** event_location_id=${event_location_id}`); let params = {}; @@ -45,7 +45,7 @@ export async function handle_load_ae_obj_id__event_location( if (event_location_obj_get_result) { if (try_cache) { // This is expecting a list - handle_db_save_ae_obj_li__event_location({ + db_save_ae_obj_li__event_location({ obj_type: 'event_location', obj_li: [event_location_obj_get_result] }); @@ -95,7 +95,7 @@ export async function handle_load_ae_obj_id__event_location( if (log_lvl) { console.log(`Need to load the session list for the location now`); } - let load_event_session_obj_li = handle_load_ae_obj_li__event_session({ + let load_event_session_obj_li = load_ae_obj_li__event_session({ api_cfg: api_cfg, for_obj_type: 'event_location', for_obj_id: event_location_id, @@ -111,7 +111,7 @@ export async function handle_load_ae_obj_id__event_location( // console.log(`ae_promises.load__event_session_obj = `, ae_promises.load__event_session_obj); // ae_promises.load__event_session_obj.event_session_li = event_session_obj_li; // // Re-save the session object with the new session list - // handle_db_save_ae_obj_li__event_session({ + // db_save_ae_obj_li__event_session({ // obj_type: 'event_session', // obj_li: [ae_promises.load__event_session_obj] // }); @@ -130,7 +130,7 @@ export async function handle_load_ae_obj_id__event_location( // Updated 2024-05-24 -export async function handle_load_ae_obj_li__event_location( +export async function load_ae_obj_li__event_location( { api_cfg, event_id, @@ -149,7 +149,7 @@ export async function handle_load_ae_obj_li__event_location( log_lvl?: number } ) { - console.log(`*** handle_load_ae_obj_li__event_location() *** event_id=${event_id}`); + console.log(`*** load_ae_obj_li__event_location() *** event_id=${event_id}`); let enabled: string = (params.qry__enabled ?? 'enabled'); // all, disabled, enabled let hidden: string = (params.qry__hidden ?? 'all'); // all, hidden, not_hidden @@ -179,7 +179,7 @@ export async function handle_load_ae_obj_li__event_location( .then(function (event_location_obj_li_get_result) { if (event_location_obj_li_get_result) { if (try_cache) { - handle_db_save_ae_obj_li__event_location({ + db_save_ae_obj_li__event_location({ obj_type: 'event_location', obj_li: event_location_obj_li_get_result }); @@ -236,7 +236,7 @@ export async function handle_load_ae_obj_li__event_location( let event_location_obj = ae_promises.load__event_location_obj_li[i]; let event_location_id = event_location_obj.event_location_id_random; - let load_event_session_obj_li = handle_load_ae_obj_li__event_session({ + let load_event_session_obj_li = load_ae_obj_li__event_session({ api_cfg: api_cfg, for_obj_type: 'event_location', for_obj_id: event_location_id, @@ -261,7 +261,7 @@ export async function handle_load_ae_obj_li__event_location( } -export async function handle_search__event_location( +export async function search__event_location( { api_cfg, event_id, @@ -286,7 +286,7 @@ export async function handle_search__event_location( log_lvl?: number } ) { - console.log(`*** handle_search__event_location() *** event_id=${event_id}`); + console.log(`*** search__event_location() *** event_id=${event_id}`); let enabled: string = (params.qry__enabled ?? 'enabled'); // all, disabled, enabled let hidden: string = (params.qry__hidden ?? 'not_hidden'); // all, hidden, not_hidden @@ -362,7 +362,7 @@ export async function handle_search__event_location( }) .then(function (event_location_obj_li_get_result) { if (event_location_obj_li_get_result) { - handle_db_save_ae_obj_li__event_location({obj_type: 'event_location', obj_li: event_location_obj_li_get_result}); + db_save_ae_obj_li__event_location({obj_type: 'event_location', obj_li: event_location_obj_li_get_result}); return event_location_obj_li_get_result; } else { return []; @@ -382,7 +382,7 @@ export async function handle_search__event_location( // Updated 2024-06-25 -export async function handle_create_ae_obj__event_location( +export async function create_ae_obj__event_location( { api_cfg, event_id, @@ -397,7 +397,7 @@ export async function handle_create_ae_obj__event_location( log_lvl?: number } ) { - console.log(`*** handle_create_ae_obj__event_location() *** event_id=${event_id}`); + console.log(`*** create_ae_obj__event_location() *** event_id=${event_id}`); ae_promises.create__event_location = await api.create_ae_obj_crud({ api_cfg: api_cfg, @@ -413,7 +413,7 @@ export async function handle_create_ae_obj__event_location( }) .then(function (event_location_obj_create_result) { if (event_location_obj_create_result) { - handle_db_save_ae_obj_li__event_location( + db_save_ae_obj_li__event_location( { obj_type: 'event_location', obj_li: [event_location_obj_create_result] @@ -438,7 +438,7 @@ export async function handle_create_ae_obj__event_location( // This function will loop through the event_location_obj_li and save each one to the DB. // Updated 2024-06-25 -export function handle_db_save_ae_obj_li__event_location( +export function db_save_ae_obj_li__event_location( { obj_type, obj_li @@ -447,7 +447,7 @@ export function handle_db_save_ae_obj_li__event_location( obj_li: any } ) { - console.log(`*** handle_db_save_ae_obj_li__event_location() ***`); + console.log(`*** db_save_ae_obj_li__event_location() ***`); if (obj_li && obj_li.length) { obj_li.forEach(async function (obj: any) { diff --git a/src/lib/ae_events__event_session.ts b/src/lib/ae_events__event_session.ts index 7028a54e..581b1c5f 100644 --- a/src/lib/ae_events__event_session.ts +++ b/src/lib/ae_events__event_session.ts @@ -45,7 +45,7 @@ export async function load_ae_obj_id__event_session( if (event_session_obj_get_result) { if (try_cache) { // This is expecting a list - handle_db_save_ae_obj_li__event_session({ + db_save_ae_obj_li__event_session({ obj_type: 'event_session', obj_li: [event_session_obj_get_result] }); @@ -110,7 +110,7 @@ export async function load_ae_obj_id__event_session( // console.log(`ae_promises.load__event_session_obj = `, ae_promises.load__event_session_obj); // ae_promises.load__event_session_obj.event_presentation_li = event_presentation_obj_li; // // Re-save the session object with the new presentation list - // handle_db_save_ae_obj_li__event_session({ + // db_save_ae_obj_li__event_session({ // obj_type: 'event_session', // obj_li: [ae_promises.load__event_session_obj] // }); @@ -129,7 +129,7 @@ export async function load_ae_obj_id__event_session( // Updated 2024-08-09 -export async function handle_load_ae_obj_li__event_session( +export async function load_ae_obj_li__event_session( { api_cfg, for_obj_type, @@ -150,7 +150,7 @@ export async function handle_load_ae_obj_li__event_session( log_lvl?: number } ) { - console.log(`*** handle_load_ae_obj_li__event_session() *** for_obj_type=${for_obj_type} for_obj_id=${for_obj_id}`); + console.log(`*** load_ae_obj_li__event_session() *** for_obj_type=${for_obj_type} for_obj_id=${for_obj_id}`); let enabled: string = (params.qry__enabled ?? 'enabled'); // all, disabled, enabled let hidden: string = (params.qry__hidden ?? 'not_hidden'); // all, hidden, not_hidden @@ -180,7 +180,7 @@ export async function handle_load_ae_obj_li__event_session( .then(function (event_session_obj_li_get_result) { if (event_session_obj_li_get_result) { if (try_cache) { - handle_db_save_ae_obj_li__event_session({ + db_save_ae_obj_li__event_session({ obj_type: 'event_session', obj_li: event_session_obj_li_get_result }); @@ -252,7 +252,7 @@ export async function handle_load_ae_obj_li__event_session( // console.log(`event_session_obj = `, event_session_obj); // event_session_obj.event_presentation_li = event_presentation_obj_li; // // Re-save the session object with the new presentation list - // handle_db_save_ae_obj_li__event_session({ + // db_save_ae_obj_li__event_session({ // obj_type: 'event_session', // obj_li: event_session_obj // }); @@ -370,7 +370,7 @@ export async function qry__event_session( }) .then(function (event_session_obj_li_get_result) { if (event_session_obj_li_get_result) { - handle_db_save_ae_obj_li__event_session({obj_type: 'event_session', obj_li: event_session_obj_li_get_result}); + db_save_ae_obj_li__event_session({obj_type: 'event_session', obj_li: event_session_obj_li_get_result}); return event_session_obj_li_get_result; } else { return []; @@ -384,7 +384,7 @@ export async function qry__event_session( } -export async function handle_search__event_session( +export async function search__event_session( { api_cfg, event_id, @@ -411,7 +411,7 @@ export async function handle_search__event_session( log_lvl?: number } ) { - console.log(`*** handle_search__event_session() *** event_id=${event_id}`); + console.log(`*** search__event_session() *** event_id=${event_id}`); let enabled: string = (params.qry__enabled ?? 'enabled'); // all, disabled, enabled let hidden: string = (params.qry__hidden ?? 'not_hidden'); // all, hidden, not_hidden @@ -487,7 +487,7 @@ export async function handle_search__event_session( }) .then(function (event_session_obj_li_get_result) { if (event_session_obj_li_get_result) { - handle_db_save_ae_obj_li__event_session({obj_type: 'event_session', obj_li: event_session_obj_li_get_result}); + db_save_ae_obj_li__event_session({obj_type: 'event_session', obj_li: event_session_obj_li_get_result}); return event_session_obj_li_get_result; } else { return []; @@ -507,7 +507,7 @@ export async function handle_search__event_session( // This function will loop through the event_session_obj_li and save each one to the DB. -export function handle_db_save_ae_obj_li__event_session( +export function db_save_ae_obj_li__event_session( { obj_type, obj_li @@ -516,7 +516,7 @@ export function handle_db_save_ae_obj_li__event_session( obj_li: any } ) { - console.log(`*** handle_db_save_ae_obj_li__event_session() ***`); + console.log(`*** db_save_ae_obj_li__event_session() ***`); if (obj_li && obj_li.length) { obj_li.forEach(async function (obj: any) { @@ -608,7 +608,7 @@ export function handle_db_save_ae_obj_li__event_session( // This is intended for the Point of Contact (POC) for the session. // Updated 2024-07-01 -export async function handle_email_sign_in__event_session ( +export async function email_sign_in__event_session ( { api_cfg, to_email, @@ -629,7 +629,7 @@ export async function handle_email_sign_in__event_session ( session_name: string, } ) { - console.log(`*** handle_email_sign_in__event_session() *** to_email=${to_email} to_name=${to_name} person_id=${person_id} person_passcode=${person_passcode} session_id=${event_session_id}`); + console.log(`*** email_sign_in__event_session() *** to_email=${to_email} to_name=${to_name} person_id=${person_id} person_passcode=${person_passcode} session_id=${event_session_id}`); let subject = `LCI Congress 2024 - Pres Mgmt Hub Sign In Link for ${session_name} (ID: ${event_session_id})`; diff --git a/src/lib/ae_events_functions.ts b/src/lib/ae_events_functions.ts index 4e108de7..48e3f09c 100644 --- a/src/lib/ae_events_functions.ts +++ b/src/lib/ae_events_functions.ts @@ -28,19 +28,19 @@ import { } from "$lib/ae_events__exhibit"; import { - handle_load_ae_obj_id__event_location, - handle_load_ae_obj_li__event_location, - handle_create_ae_obj__event_location, - handle_db_save_ae_obj_li__event_location, + load_ae_obj_id__event_location, + load_ae_obj_li__event_location, + create_ae_obj__event_location, + db_save_ae_obj_li__event_location, } from "$lib/ae_events__event_location"; import { load_ae_obj_id__event_session, - handle_load_ae_obj_li__event_session, + load_ae_obj_li__event_session, qry__event_session, - handle_search__event_session, - handle_db_save_ae_obj_li__event_session, - handle_email_sign_in__event_session, + search__event_session, + db_save_ae_obj_li__event_session, + email_sign_in__event_session, } from "$lib/ae_events__event_session"; import { @@ -81,17 +81,17 @@ let export_obj = { handle_search__event_file: handle_search__event_file, handle_db_save_ae_obj_li__event_file: handle_db_save_ae_obj_li__event_file, - handle_load_ae_obj_id__event_location: handle_load_ae_obj_id__event_location, - handle_load_ae_obj_li__event_location: handle_load_ae_obj_li__event_location, - handle_create_ae_obj__event_location: handle_create_ae_obj__event_location, - handle_db_save_ae_obj_li__event_location: handle_db_save_ae_obj_li__event_location, + load_ae_obj_id__event_location: load_ae_obj_id__event_location, + load_ae_obj_li__event_location: load_ae_obj_li__event_location, + create_ae_obj__event_location: create_ae_obj__event_location, + db_save_ae_obj_li__event_location: db_save_ae_obj_li__event_location, load_ae_obj_id__event_session: load_ae_obj_id__event_session, - handle_load_ae_obj_li__event_session: handle_load_ae_obj_li__event_session, + load_ae_obj_li__event_session: load_ae_obj_li__event_session, qry__event_session: qry__event_session, - handle_search__event_session: handle_search__event_session, - handle_email_sign_in__event_session: handle_email_sign_in__event_session, - handle_db_save_ae_obj_li__event_session: handle_db_save_ae_obj_li__event_session, + search__event_session: search__event_session, + email_sign_in__event_session: email_sign_in__event_session, + db_save_ae_obj_li__event_session: db_save_ae_obj_li__event_session, handle_load_ae_obj_id__event_presentation: handle_load_ae_obj_id__event_presentation, handle_load_ae_obj_li__event_presentation: handle_load_ae_obj_li__event_presentation, diff --git a/src/routes/events_pres_mgmt/(launcher)/launcher/[slug]/+page.ts b/src/routes/events_pres_mgmt/(launcher)/launcher/[slug]/+page.ts index e48f7af0..23a3cbe2 100644 --- a/src/routes/events_pres_mgmt/(launcher)/launcher/[slug]/+page.ts +++ b/src/routes/events_pres_mgmt/(launcher)/launcher/[slug]/+page.ts @@ -48,7 +48,7 @@ export async function load({ params, parent, url }) { // route if (browser) { ae_acct.trig.event_location_obj_li = false; - let load_event_location_obj_li = await events_func.handle_load_ae_obj_li__event_location({ + let load_event_location_obj_li = await events_func.load_ae_obj_li__event_location({ api_cfg: ae_acct.api, event_id: event_id, inc_file_li: true, @@ -91,7 +91,7 @@ export async function load({ params, parent, url }) { // route // } ae_acct.trig.event_session_obj_li = false; - let load_event_session_obj_li = await events_func.handle_load_ae_obj_li__event_session({ + let load_event_session_obj_li = await events_func.load_ae_obj_li__event_session({ api_cfg: ae_acct.api, for_obj_type: for_obj_type, for_obj_id: for_obj_id, diff --git a/src/routes/events_pres_mgmt/(launcher)/launcher/[slug]/+page@(launcher).svelte b/src/routes/events_pres_mgmt/(launcher)/launcher/[slug]/+page@(launcher).svelte index a52af42f..911db886 100644 --- a/src/routes/events_pres_mgmt/(launcher)/launcher/[slug]/+page@(launcher).svelte +++ b/src/routes/events_pres_mgmt/(launcher)/launcher/[slug]/+page@(launcher).svelte @@ -39,12 +39,12 @@ let ae_acct = data[$slct.account_id]; // if (browser) { // console.log(`Browser: ${browser}`); -// events_func.handle_db_save_ae_obj_li__event_location({ +// events_func.db_save_ae_obj_li__event_location({ // obj_type: 'event_location', // obj_li: ae_acct.slct.event_location_obj_li // }); -// events_func.handle_db_save_ae_obj_li__event_session({ +// events_func.db_save_ae_obj_li__event_session({ // obj_type: 'event_session', // obj_li: ae_acct.slct.event_session_obj_li // }); diff --git a/src/routes/events_pres_mgmt/(launcher)/launcher/[slug]/launcher_menu.svelte b/src/routes/events_pres_mgmt/(launcher)/launcher/[slug]/launcher_menu.svelte index 8dcd1efa..ccc2c68b 100644 --- a/src/routes/events_pres_mgmt/(launcher)/launcher/[slug]/launcher_menu.svelte +++ b/src/routes/events_pres_mgmt/(launcher)/launcher/[slug]/launcher_menu.svelte @@ -140,7 +140,7 @@ let ae_promises: key_val = { $events_slct.id_li__event_session = []; await tick(); - ae_promises[slct_event_location_id] = events_func.handle_load_ae_obj_li__event_session({ + ae_promises[slct_event_location_id] = events_func.load_ae_obj_li__event_session({ api_cfg: $ae_api, for_obj_type: 'event_location', for_obj_id: $events_loc.launcher.slct.event_location_id, diff --git a/src/routes/events_pres_mgmt/event/[slug]/+page.svelte b/src/routes/events_pres_mgmt/event/[slug]/+page.svelte index bf217687..82f68dd5 100644 --- a/src/routes/events_pres_mgmt/event/[slug]/+page.svelte +++ b/src/routes/events_pres_mgmt/event/[slug]/+page.svelte @@ -194,7 +194,7 @@ function process_search_string(search_str: string) { // params['qry__limit'] = 35; // } - handle_search__event_session({ + search__event_session({ api_cfg: $ae_api, event_id: $events_slct.event_id, ft_search_str: ft_search_str_new, diff --git a/src/routes/events_pres_mgmt/event/[slug]/+page.ts b/src/routes/events_pres_mgmt/event/[slug]/+page.ts index 6fdd0173..d5143d24 100644 --- a/src/routes/events_pres_mgmt/event/[slug]/+page.ts +++ b/src/routes/events_pres_mgmt/event/[slug]/+page.ts @@ -37,7 +37,7 @@ export async function load({ params, parent }) { // route // ae_acct.slct.event_obj = await load_event_obj; if (browser) { - let load_event_session_obj_li = events_func.handle_load_ae_obj_li__event_session({ + let load_event_session_obj_li = events_func.load_ae_obj_li__event_session({ api_cfg: ae_acct.api, for_obj_type: 'event', for_obj_id: event_id, diff --git a/src/routes/events_pres_mgmt/session_view.svelte b/src/routes/events_pres_mgmt/session_view.svelte index cc3812e4..182fd12b 100644 --- a/src/routes/events_pres_mgmt/session_view.svelte +++ b/src/routes/events_pres_mgmt/session_view.svelte @@ -335,9 +335,9 @@ $: if ($lq__event_session_obj) { qry__limit: 50, } - // $slct.event_location_obj_li = await core_func.handle_load_ae_obj_li__event_location({api_cfg: $ae_api, account_id: $slct.account_id, params: params}); + // $slct.event_location_obj_li = await core_func.load_ae_obj_li__event_location({api_cfg: $ae_api, account_id: $slct.account_id, params: params}); - $slct.event_location_obj_li = events_func.handle_load_ae_obj_li__event_location({api_cfg: $ae_api, event_id: $slct.event_id, params: params, log_lvl: 1}) + $slct.event_location_obj_li = events_func.load_ae_obj_li__event_location({api_cfg: $ae_api, event_id: $slct.event_id, params: params, log_lvl: 1}) .then(function (load_results) { console.log(`Loaded event_location_obj_li:`, load_results); @@ -560,7 +560,7 @@ $: if ($lq__event_session_obj) { return false; } - events_func.handle_email_sign_in__event_session( + events_func.email_sign_in__event_session( { api_cfg: $ae_api, to_email: $lq__event_session_obj.poc_person_primary_email,