diff --git a/src/lib/ae_events_stores.ts b/src/lib/ae_events_stores.ts index 7fa213ae..362b3c7b 100644 --- a/src/lib/ae_events_stores.ts +++ b/src/lib/ae_events_stores.ts @@ -378,6 +378,12 @@ let events_session_data_struct: key_val = { show_fields__presentation: true, show_fields__session: true, + status_rpt: { + recent_files: null, + presenters_agree: null, + presenters_biography: null, + }, + tmp_val__filename_no_ext: null, // For file rename }, diff --git a/src/routes/events_pres_mgmt/event/[slug]/reports/+page.svelte b/src/routes/events_pres_mgmt/event/[slug]/reports/+page.svelte index 130e1ec2..8a673515 100644 --- a/src/routes/events_pres_mgmt/event/[slug]/reports/+page.svelte +++ b/src/routes/events_pres_mgmt/event/[slug]/reports/+page.svelte @@ -45,6 +45,7 @@ let event_presenter_id_random_li: string[] = [];// ['I245hLQ4aek']; let load_obj_li_results: Promise|key_val; let search_submit_results: Promise|key_val; +let ae_promises: key_val = {}; let ae_tmp: key_val = {}; let ae_triggers: key_val = {}; @@ -87,8 +88,9 @@ async function handle_search__event_file( console.log('handle_search__event_file()'); $events_sess.pres_mgmt.status_qry__search = 'loading'; + $events_sess.pres_mgmt.status_rpt[$events_sess.pres_mgmt.show_report] = 'loading'; - search_submit_results = events_func.handle_search__event_file({ + ae_promises.handle_search__event_file = events_func.handle_search__event_file({ api_cfg: $ae_api, event_id: $events_slct.event_id, created_on: created_on, @@ -102,6 +104,7 @@ async function handle_search__event_file( .then(function (search_results) { // Processing the results from the search. $events_sess.pres_mgmt.status_qry__search = 'processing'; + $events_sess.pres_mgmt.status_rpt[$events_sess.pres_mgmt.show_report] = 'processing'; $events_slct.event_file_obj_li = search_results; console.log(search_results); // $events_sess.pres_mgmt.status_qry__search = 'done'; @@ -125,6 +128,7 @@ async function handle_search__event_file( // Finally done with the search. $events_sess.pres_mgmt.status_qry__search = 'done'; + $events_sess.pres_mgmt.status_rpt[$events_sess.pres_mgmt.show_report] = 'done'; if (log_lvl > 1) { console.log(`TEST SEARCH - event_file_id_random_li:`, event_file_id_random_li); @@ -135,22 +139,6 @@ async function handle_search__event_file( } - -// handle_search__event_file({ -// api_cfg: $ae_api, -// event_id: $events_slct.event_id, -// created_on: null, -// ft_search_str: '', -// lk_search_str: '', -// params: { -// 'qry__enabled': 'enabled', -// 'qry__hidden': 'not_hidden', -// 'qry__limit': 35,}, -// try_cache: false, -// log_lvl: 2, -// }); - - async function handle_search__event_presenter( { api_cfg, @@ -184,8 +172,9 @@ async function handle_search__event_presenter( console.log('handle_search__event_presenter()'); $events_sess.pres_mgmt.status_qry__search = 'loading'; + $events_sess.pres_mgmt.status_rpt[$events_sess.pres_mgmt.show_report] = 'loading'; - search_submit_results = events_func.handle_search__event_presenter({ + ae_promises.handle_search__event_presenter = events_func.handle_search__event_presenter({ api_cfg: $ae_api, event_id: $events_slct.event_id, agree: agree, @@ -203,6 +192,7 @@ async function handle_search__event_presenter( .then(function (search_results) { // Processing the results from the search. $events_sess.pres_mgmt.status_qry__search = 'processing'; + $events_sess.pres_mgmt.status_rpt[$events_sess.pres_mgmt.show_report] = 'processing'; $events_slct.event_presenter_obj_li = search_results; console.log(search_results); // $events_sess.pres_mgmt.status_qry__search = 'done'; @@ -226,6 +216,7 @@ async function handle_search__event_presenter( // Finally done with the search. $events_sess.pres_mgmt.status_qry__search = 'done'; + $events_sess.pres_mgmt.status_rpt[$events_sess.pres_mgmt.show_report] = 'done'; if (log_lvl > 1) { console.log(`TEST SEARCH - event_presenter_id_random_li:`, event_presenter_id_random_li); @@ -233,8 +224,6 @@ async function handle_search__event_presenter( } }); - - } // handle_search__event_presenter({ @@ -297,7 +286,7 @@ async function handle_search__event_presenter( type="button" disabled={!$ae_loc.trusted_access} on:click={() => { - handle_search__event_presenter({ + ae_promises.handle_search__event_presenter = handle_search__event_presenter({ api_cfg: $ae_api, event_id: $events_slct.event_id, agree: true, @@ -310,17 +299,21 @@ async function handle_search__event_presenter( try_cache: false, log_lvl: log_lvl, }); - $events_sess.pres_mgmt.show_report__presenters_agree = !$events_sess.pres_mgmt.show_report__presenters_agree; - $events_sess.pres_mgmt.show_report__presenters_biography = false; - $events_sess.pres_mgmt.show_report__recent_files = false; + $events_sess.pres_mgmt.show_report = 'presenters_agree'; + // $events_sess.pres_mgmt.show_report__presenters_agree = !$events_sess.pres_mgmt.show_report__presenters_agree; + // $events_sess.pres_mgmt.show_report__presenters_biography = false; + // $events_sess.pres_mgmt.show_report__recent_files = false; }} class="btn btn-sm variant-ghost-success hover:variant-filled-success transition-all mx-1" title="Show presenters who have agreed to present." > - {#if $events_sess.pres_mgmt.status_rpt__presenters_agree == 'loading'} + + {#if $events_sess.pres_mgmt?.show_report == 'presenters_agree' && $events_sess.pres_mgmt.status_rpt[$events_sess.pres_mgmt?.show_report] == 'loading'} {/if} - + Presenters Agreed @@ -341,17 +334,18 @@ async function handle_search__event_presenter( try_cache: false, log_lvl: log_lvl, }); - $events_sess.pres_mgmt.show_report__presenters_biography = !$events_sess.pres_mgmt.show_report__presenters_biography; - $events_sess.pres_mgmt.show_report__presenters_agree = false; - $events_sess.pres_mgmt.show_report__recent_files = false; + $events_sess.pres_mgmt.show_report = 'presenters_biography'; + // $events_sess.pres_mgmt.show_report__presenters_biography = !$events_sess.pres_mgmt.show_report__presenters_biography; + // $events_sess.pres_mgmt.show_report__presenters_agree = false; + // $events_sess.pres_mgmt.show_report__recent_files = false; }} class="btn btn-sm variant-ghost-success hover:variant-filled-success transition-all mx-1" title="NOT READY YET: Show presenters with bios." > - {#if $events_sess.pres_mgmt.status_rpt__presenters_biography == 'loading'} + {#if $events_sess.pres_mgmt?.show_report == 'presenters_biography' && $events_sess.pres_mgmt.status_rpt[$events_sess.pres_mgmt?.show_report] == 'loading'} {/if} - + Presenter Bios @@ -373,19 +367,52 @@ async function handle_search__event_presenter( try_cache: false, log_lvl: log_lvl, }); - $events_sess.pres_mgmt.show_report__presenters_agree = false; - $events_sess.pres_mgmt.show_report__presenters_biography = false; - $events_sess.pres_mgmt.show_report__recent_files = !$events_sess.pres_mgmt.show_report__recent_files; + $events_sess.pres_mgmt.show_report = 'recent_files'; + // $events_sess.pres_mgmt.show_report__presenters_agree = false; + // $events_sess.pres_mgmt.show_report__presenters_biography = false; + // $events_sess.pres_mgmt.show_report__recent_files = !$events_sess.pres_mgmt.show_report__recent_files; }} class="btn btn-sm variant-ghost-success hover:variant-filled-success transition-all mx-1" title="Show recent file uploads." > + {#if $events_sess.pres_mgmt?.show_report == 'recent_files' && $events_sess.pres_mgmt.status_rpt[$events_sess.pres_mgmt?.show_report] == 'loading'} + + {/if} + + Recent File Uploads + + + + + @@ -407,7 +434,7 @@ async function handle_search__event_presenter( {/await} --> -{#if $events_sess.pres_mgmt.show_report__presenters_agree && event_presenter_id_random_li?.length > 0} +{#if $events_sess.pres_mgmt.show_report == 'presenters_agree' && event_presenter_id_random_li?.length > 0}

Presenters Agreed