diff --git a/src/lib/ae_events/ae_events__event_device.ts b/src/lib/ae_events/ae_events__event_device.ts index 373a4ea6..655a9ef3 100644 --- a/src/lib/ae_events/ae_events__event_device.ts +++ b/src/lib/ae_events/ae_events__event_device.ts @@ -551,7 +551,9 @@ export async function search__event_device( }) .then(function (event_device_obj_li_get_result) { if (event_device_obj_li_get_result) { - db_save_ae_obj_li__event_device({obj_type: 'event_device', obj_li: event_device_obj_li_get_result}); + if (try_cache) { + db_save_ae_obj_li__event_device({obj_type: 'event_device', obj_li: event_device_obj_li_get_result}); + } return event_device_obj_li_get_result; } else { return []; @@ -760,13 +762,13 @@ export async function process_ae_obj__event_device_props({ if (log_lvl) console.log(`Processing ae_obj event_device:`, obj); let processed_obj = { - id: obj.id, - event_device_id: obj.event_device_id, + id: obj.event_device_id_random, + event_device_id: obj.event_device_id_random, event_device_id_random: obj.event_device_id_random, - event_id: obj.event_id, + event_id: obj.event_id_random, event_id_random: obj.event_id_random, - event_location_id: obj.event_location_id, + event_location_id: obj.event_location_id_random, event_location_id_random: obj.event_location_id_random, code: obj.code, diff --git a/src/lib/ae_events/ae_events__event_file.ts b/src/lib/ae_events/ae_events__event_file.ts index 147f81d3..302fdad6 100644 --- a/src/lib/ae_events/ae_events__event_file.ts +++ b/src/lib/ae_events/ae_events__event_file.ts @@ -387,7 +387,7 @@ export async function qry__event_file( } -// Updated 2024-07-12 +// Updated 2025-05-23 export async function search__event_file( { api_cfg, @@ -499,7 +499,9 @@ export async function search__event_file( }) .then(function (event_file_obj_li_get_result) { if (event_file_obj_li_get_result) { - db_save_ae_obj_li__event_file({obj_type: 'event_file', obj_li: event_file_obj_li_get_result}); + if (try_cache) { + db_save_ae_obj_li__event_file({obj_type: 'event_file', obj_li: event_file_obj_li_get_result}); + } return event_file_obj_li_get_result; } else { return []; @@ -809,7 +811,7 @@ export async function process_ae_obj__event_file_props({ hash_sha256: obj.hash_sha256, for_type: obj.for_type, - for_id: obj.for_id, + for_id: obj.for_id_random, for_id_random: obj.for_id_random, event_id: obj.event_id_random, diff --git a/src/lib/ae_events/ae_events__event_location.ts b/src/lib/ae_events/ae_events__event_location.ts index 80b5ca74..2d0f71f4 100644 --- a/src/lib/ae_events/ae_events__event_location.ts +++ b/src/lib/ae_events/ae_events__event_location.ts @@ -654,7 +654,9 @@ export async function search__event_location( }) .then(function (event_location_obj_li_get_result) { if (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}); + if (try_cache) { + 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 []; diff --git a/src/lib/ae_events/ae_events__event_presentation.ts b/src/lib/ae_events/ae_events__event_presentation.ts index 5ecf7827..d7d55350 100644 --- a/src/lib/ae_events/ae_events__event_presentation.ts +++ b/src/lib/ae_events/ae_events__event_presentation.ts @@ -196,7 +196,7 @@ export async function load_ae_obj_li__event_presentation( for_obj_type: for_obj_type, for_obj_id: for_obj_id, use_alt_tbl: true, // NOTE: This will use the table_name_alt value instead of the table_name value in the API config. - use_alt_mdl: false, // NOTE: This will use the base_name_alt value instead of the base_name value + // use_alt_mdl: false, // NOTE: This will use the base_name_alt value instead of the base_name value enabled: enabled, hidden: hidden, order_by_li: order_by_li, diff --git a/src/lib/ae_events/ae_events__event_presenter.ts b/src/lib/ae_events/ae_events__event_presenter.ts index 3a0604af..c1f96175 100644 --- a/src/lib/ae_events/ae_events__event_presenter.ts +++ b/src/lib/ae_events/ae_events__event_presenter.ts @@ -25,7 +25,9 @@ export async function load_ae_obj_id__event_presenter( log_lvl?: number } ) { - console.log(`*** load_ae_obj_id__event_presenter() *** event_presenter_id=${event_presenter_id}`); + if (log_lvl) { + console.log(`*** load_ae_obj_id__event_presenter() *** event_presenter_id=${event_presenter_id}`); + } let params = {}; @@ -38,14 +40,37 @@ export async function load_ae_obj_id__event_presenter( params: params, log_lvl: log_lvl }) - .then(function (event_presenter_obj_get_result) { + .then(async function (event_presenter_obj_get_result) { if (event_presenter_obj_get_result) { if (try_cache) { - // This is expecting a list - db_save_ae_obj_li__event_presenter({ - obj_type: 'event_presenter', - obj_li: [event_presenter_obj_get_result] + // Process the results first + let processed_obj_li = await process_ae_obj__event_presenter_props({ + obj_li: [event_presenter_obj_get_result], + log_lvl: log_lvl, + }); + if (log_lvl) { + console.log('Processed object list:', processed_obj_li); + } + // Save the updated results list to the database + if (log_lvl) { + console.log('Saving to DB...'); + } + await db_save_ae_obj_li__ae_obj({ + db_instance: db_events, + table_name: 'presenters', + obj_li: processed_obj_li, + properties_to_save: properties_to_save, + log_lvl: log_lvl, }); + if (log_lvl) { + console.log('DB save completed.'); + } + + // // This is expecting a list + // db_save_ae_obj_li__event_presenter({ + // obj_type: 'event_presenter', + // obj_li: [event_presenter_obj_get_result] + // }); } return event_presenter_obj_get_result; } else { @@ -122,13 +147,14 @@ export async function load_ae_obj_li__event_presenter( // console.log('params_json:', params_json); - ae_promises.load__event_presenter_obj_li = await api.get_ae_obj_li_for_obj_id_crud({ + // ae_promises.load__event_presenter_obj_li = await api.get_ae_obj_li_for_obj_id_crud({ + ae_promises.load__event_presenter_obj_li = await api.get_ae_obj_li_for_obj_id_crud_v2({ api_cfg: api_cfg, obj_type: 'event_presenter', for_obj_type: for_obj_type, for_obj_id: for_obj_id, - use_alt_table: true, // NOTE: This will use the table_name_alt value instead of the table_name value in the API config. - use_alt_base: false, // NOTE: This will use the base_name_alt value instead of the base_name value + use_alt_tbl: true, // NOTE: This will use the table_name_alt value instead of the table_name value in the API config. + // use_alt_mdl: false, // NOTE: This will use the base_name_alt value instead of the base_name value enabled: enabled, hidden: hidden, order_by_li: order_by_li, @@ -138,13 +164,36 @@ export async function load_ae_obj_li__event_presenter( params: params, log_lvl: log_lvl }) - .then(function (event_presenter_obj_li_get_result) { + .then(async function (event_presenter_obj_li_get_result) { if (event_presenter_obj_li_get_result) { if (try_cache) { - db_save_ae_obj_li__event_presenter({ - obj_type: 'event_presenter', - obj_li: event_presenter_obj_li_get_result + // Process the results first + let processed_obj_li = await process_ae_obj__event_presenter_props({ + obj_li: event_presenter_obj_li_get_result, + log_lvl: log_lvl, + }); + if (log_lvl) { + console.log('Processed object list:', processed_obj_li); + } + // Save the updated results list to the database + if (log_lvl) { + console.log('Saving to DB...'); + } + await db_save_ae_obj_li__ae_obj({ + db_instance: db_events, + table_name: 'presenters', + obj_li: processed_obj_li, + properties_to_save: properties_to_save, + log_lvl: log_lvl, }); + if (log_lvl) { + console.log('DB save completed.'); + } + + // db_save_ae_obj_li__event_presenter({ + // obj_type: 'event_presenter', + // obj_li: event_presenter_obj_li_get_result + // }); } return event_presenter_obj_li_get_result; } else { @@ -194,7 +243,7 @@ export async function load_ae_obj_li__event_presenter( } -// Updated 2024-06-24 +// Updated 2025-05-23 export async function create_ae_obj__event_presenter( { api_cfg, @@ -234,13 +283,36 @@ export async function create_ae_obj__event_presenter( return_obj: true, log_lvl: log_lvl }) - .then(function (event_presenter_obj_create_result) { + .then(async function (event_presenter_obj_create_result) { if (event_presenter_obj_create_result) { if (try_cache) { - db_save_ae_obj_li__event_presenter( - { - obj_type: 'event_presenter', obj_li: [event_presenter_obj_create_result] + // Process the results first + let processed_obj_li = await process_ae_obj__event_presenter_props({ + obj_li: [event_presenter_obj_create_result], + log_lvl: log_lvl, }); + if (log_lvl) { + console.log('Processed object list:', processed_obj_li); + } + // Save the updated results list to the database + if (log_lvl) { + console.log('Saving to DB...'); + } + db_save_ae_obj_li__ae_obj({ + db_instance: db_events, + table_name: 'presenters', + obj_li: processed_obj_li, + properties_to_save: properties_to_save, + log_lvl: log_lvl, + }); + if (log_lvl) { + console.log('DB save completed.'); + } + + // db_save_ae_obj_li__event_presenter( + // { + // obj_type: 'event_presenter', obj_li: [event_presenter_obj_create_result] + // }); } return event_presenter_obj_create_result; } else { @@ -260,7 +332,7 @@ export async function create_ae_obj__event_presenter( } -// Updated 2024-11-08 +// Updated 2025-05-23 export async function delete_ae_obj_id__event_presenter( { api_cfg, @@ -291,14 +363,6 @@ export async function delete_ae_obj_id__event_presenter( method: method, log_lvl: log_lvl }) - .then(function (event_presenter_obj_delete_result) { - // if (event_presenter_obj_delete_result) { - // // db_save_ae_obj_li__event_presenter({obj_type: 'event_presenter', obj_li: [event_presenter_obj_delete_result]}); - // return event_presenter_obj_delete_result; - // } else { - // return null; - // } - }) .catch(function (error) { console.log('No results returned or failed.', error); }) @@ -319,7 +383,7 @@ export async function delete_ae_obj_id__event_presenter( } -// Updated 2024-09-13 +// Updated 2025-05-23 export async function update_ae_obj__event_presenter( { api_cfg, @@ -351,13 +415,36 @@ export async function update_ae_obj__event_presenter( return_obj: true, log_lvl: log_lvl }) - .then(function (event_presenter_obj_update_result) { + .then(async function (event_presenter_obj_update_result) { if (event_presenter_obj_update_result) { if (try_cache) { - db_save_ae_obj_li__event_presenter({ - obj_type: 'event_presenter', - obj_li: [event_presenter_obj_update_result] + // Process the results first + let processed_obj_li = await process_ae_obj__event_presenter_props({ + obj_li: [event_presenter_obj_update_result], + log_lvl: log_lvl, + }); + if (log_lvl) { + console.log('Processed object list:', processed_obj_li); + } + // Save the updated results list to the database + if (log_lvl) { + console.log('Saving to DB...'); + } + db_save_ae_obj_li__ae_obj({ + db_instance: db_events, + table_name: 'presenters', + obj_li: processed_obj_li, + properties_to_save: properties_to_save, + log_lvl: log_lvl, }); + if (log_lvl) { + console.log('DB save completed.'); + } + + // db_save_ae_obj_li__event_presenter({ + // obj_type: 'event_presenter', + // obj_li: [event_presenter_obj_update_result] + // }); } return event_presenter_obj_update_result; } else { @@ -377,7 +464,7 @@ export async function update_ae_obj__event_presenter( } -// Updated 2024-07-11 +// Updated 2025-05-23 export async function search__event_presenter( { api_cfg, @@ -471,13 +558,14 @@ export async function search__event_presenter( params_json['and_qry']['biography_check'] = biography; } - ae_promises.load__event_presenter_obj_li = await api.get_ae_obj_li_for_obj_id_crud({ + // ae_promises.load__event_presenter_obj_li = await api.get_ae_obj_li_for_obj_id_crud({ + ae_promises.load__event_presenter_obj_li = await api.get_ae_obj_li_for_obj_id_crud_v2({ api_cfg: api_cfg, obj_type: 'event_presenter', for_obj_type: 'event', for_obj_id: event_id, - use_alt_table: true, // NOTE: We want to use the alt table for session searching - use_alt_base: false, + use_alt_tbl: true, // NOTE: We want to use the alt table for session searching + // use_alt_mdl: false, enabled: enabled, hidden: hidden, order_by_li: order_by_li, @@ -495,7 +583,7 @@ export async function search__event_presenter( obj_li: event_presenter_obj_li_get_result }); } - db_save_ae_obj_li__event_presenter({obj_type: 'event_presenter', obj_li: event_presenter_obj_li_get_result}); + // db_save_ae_obj_li__event_presenter({obj_type: 'event_presenter', obj_li: event_presenter_obj_li_get_result}); return event_presenter_obj_li_get_result; } else { return []; diff --git a/src/routes/events/[event_id]/reports/+page.svelte b/src/routes/events/[event_id]/reports/+page.svelte index 57580690..a2c874c8 100644 --- a/src/routes/events/[event_id]/reports/+page.svelte +++ b/src/routes/events/[event_id]/reports/+page.svelte @@ -892,6 +892,7 @@ async function handle_qry__event_session( +