From 06a1d7a77121182b28ad82d5aacf40b604204f9b Mon Sep 17 00:00:00 2001 From: Scott Idem Date: Tue, 13 Aug 2024 20:57:19 -0400 Subject: [PATCH] Cleaning things up. Minor bug fixes. --- .../event/[slug]/+page.svelte | 123 ++++-------------- .../event/[slug]/reports/+page.svelte | 17 ++- .../events_pres_mgmt/event_page_menu.svelte | 6 +- .../event_reports_page_menu.svelte | 6 +- 4 files changed, 37 insertions(+), 115 deletions(-) diff --git a/src/routes/events_pres_mgmt/event/[slug]/+page.svelte b/src/routes/events_pres_mgmt/event/[slug]/+page.svelte index f5db88d9..bf217687 100644 --- a/src/routes/events_pres_mgmt/event/[slug]/+page.svelte +++ b/src/routes/events_pres_mgmt/event/[slug]/+page.svelte @@ -4,15 +4,15 @@ export let data: any; // console.log(`ae_events_pres_mgmt event [slug] +page.svelte data:`, data); import { onMount } from 'svelte'; -import { goto, invalidate, pushState, replaceState } from '$app/navigation'; +// import { goto, invalidate, pushState, replaceState } from '$app/navigation'; -import { clipboard, FileDropzone, getModalStore, localStorageStore, ProgressRadial, RadioGroup, RadioItem, TabGroup, Tab, TabAnchor } from '@skeletonlabs/skeleton'; +// import { clipboard, FileDropzone, getModalStore, localStorageStore, ProgressRadial, RadioGroup, RadioItem, TabGroup, Tab, TabAnchor } from '@skeletonlabs/skeleton'; import type { key_val } from '$lib/ae_stores'; import { ae_util } from '$lib/ae_utils'; import { api } from '$lib/api'; -import Element_ae_crud from '$lib/element_ae_crud.svelte'; -import Element_data_store from '$lib/element_data_store.svelte'; +// import Element_ae_crud from '$lib/element_ae_crud.svelte'; +// import Element_data_store from '$lib/element_data_store.svelte'; import Comp_event_session_obj_li from '../../ae_comp__event_session_obj_li.svelte'; import { liveQuery } from "dexie"; @@ -52,9 +52,7 @@ let lq__event_obj = liveQuery( // .toArray() // ); -let event_session_id_random_li: string[] = ['VSBH-19-41-50']; -// let event_session_id_random_li: string[] = ['VSBH-19-41-51']; -// let event_session_id_random_li: string[] = ['']; +let event_session_id_random_li: string[] = []; // let event_session_id_random_li: string[] = []; // event_session_id_random_li = []; @@ -106,27 +104,6 @@ let ae_tmp: key_val = {}; let ae_triggers: key_val = {}; -// let params = { -// 'qry__enabled': $events_loc.pres_mgmt.qry_enabled ?? 'enabled', -// 'qry__hidden': $events_loc.pres_mgmt.qry_hidden ?? 'not_hidden', -// 'qry__limit': $events_loc.pres_mgmt.qry_limit__session ?? 35, -// } - -// if ($ae_loc.administrator_access) { -// params['qry__enabled'] = 'all'; -// params['qry__hidden'] = 'all'; -// params['qry__limit'] = 150; -// } else if ($ae_loc.trusted_access) { -// params['qry__enabled'] = 'enabled'; -// params['qry__hidden'] = 'not_hidden'; -// params['qry__limit'] = 75; -// } else { -// params['qry__enabled'] = 'enabled'; -// params['qry__hidden'] = 'not_hidden'; -// params['qry__limit'] = 35; -// } - - onMount(() => { console.log('Events Event [slug]: +page.svelte'); @@ -197,11 +174,11 @@ function process_search_string(search_str: string) { console.log(`"${search_str}"`); - let params = { - 'qry__enabled': $events_loc.pres_mgmt.qry_enabled ?? 'enabled', - 'qry__hidden': $events_loc.pres_mgmt.qry_hidden ?? 'not_hidden', - 'qry__limit': $events_loc.pres_mgmt.qry_limit__session ?? 35, - } + // let params = { + // 'qry__enabled': $events_loc.pres_mgmt.qry_enabled ?? 'enabled', + // 'qry__hidden': $events_loc.pres_mgmt.qry_hidden ?? 'not_hidden', + // 'qry__limit': $events_loc.pres_mgmt.qry_limit__sessions ?? 35, + // } // if ($ae_loc.administrator_access) { // params['qry__enabled'] = 'all'; @@ -227,7 +204,7 @@ function process_search_string(search_str: string) { // like_search_qry_str: lk_search_str_new, // like_presentation_search_qry_str: lk_search_str_new, // like_presenter_search_qry_str: lk_search_str_new, - params: params, + // params: params, try_cache: false, log_lvl: 0, }); @@ -243,9 +220,10 @@ async function handle_search__event_session( search_delay = 0, max_tries = 5, params = { - 'qry__enabled': 'enabled', - 'qry__hidden': 'not_hidden', - 'qry__limit': 35,}, + 'qry__enabled': $events_loc.pres_mgmt.qry_enabled ?? 'enabled', + 'qry__hidden': $events_loc.pres_mgmt.qry_hidden ?? 'not_hidden', + 'qry__limit': $events_loc.pres_mgmt.qry_limit__sessions ?? 35, + }, try_cache=false, log_lvl=1, }: { @@ -341,64 +319,7 @@ async function handle_search__event_session( clearInterval(request_loop); } }, search_delay); - - - // if ($events_sess.pres_mgmt.status_qry__search == 'loading') { - // console.log('*** $events_sess.pres_mgmt.status_qry__search == loading ***'); - - // setTimeout(() => { - // console.log("Delayed for X second."); - - // $events_sess.pres_mgmt.status_qry__search = 'loading'; - - // search_submit_results = events_func.handle_search__event_session({ - // api_cfg: api_cfg, - // event_id: event_id, - // // type_code: type_code, - // fulltext_search_qry_str: ft_search_str, - // ft_presenter_search_qry_str: null, - // like_search_qry_str: lk_search_str, - // like_presentation_search_qry_str: lk_search_str, - // like_presenter_search_qry_str: lk_search_str, - // // external_event_id: $events_loc.pres_mgmt.default__external_registration_id, - // params: params, - // try_cache: try_cache, - // log_lvl: log_lvl, - // }) - // .then(function (search_results) { - // $events_slct.event_session_obj_li = search_results; - // console.log(search_results); - // $events_sess.pres_mgmt.status_qry__search = 'done'; - // }) - // .finally(() => { - // console.log('Search done. Pulling out the event_session_id_randoms.'); - // // console.log(`TEST search delay: ${$lq_kv__event_session_obj_li}`); - - // event_session_id_random_li = []; - - // // We need to loop through the array of objects and get the event_session_id_random from each object a new list of event_session_id_randoms. Then we can use this list to get the full objects from the database. - // let tmp_li = []; // This is to prevent the array from constantly updating and triggering the liveQuery. - // for (let i = 0; i < $events_slct.event_session_obj_li.length; i++) { - // tmp_li.push($events_slct.event_session_obj_li[i].event_session_id_random); - // } - // event_session_id_random_li = tmp_li; - - // console.log(`event_session_id_random_li:`, event_session_id_random_li); - // console.log(`TEST search delay live query: ${$lq_kv__event_session_obj_li}`); - // }); - // }, search_delay); - // } else { - // console.log('*** $events_sess.pres_mgmt.status_qry__search != loading ***'); - - - // } - - - - // } // end if search string is valid } - - @@ -413,7 +334,9 @@ async function handle_search__event_session(
{$lq__event_obj?.name} -

Presentation Management Hub

+

Presentations - Session Lookup

{/if} @@ -548,7 +471,7 @@ async function handle_search__event_session( 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 3005014e..130e1ec2 100644 --- a/src/routes/events_pres_mgmt/event/[slug]/reports/+page.svelte +++ b/src/routes/events_pres_mgmt/event/[slug]/reports/+page.svelte @@ -67,9 +67,10 @@ async function handle_search__event_file( ft_search_str = '', lk_search_str = '', params = { - 'qry__enabled': 'enabled', - 'qry__hidden': 'not_hidden', - 'qry__limit': 35,}, + 'qry__enabled': $events_loc.pres_mgmt.qry_enabled ?? 'enabled', + 'qry__hidden': $events_loc.pres_mgmt.qry_hidden ?? 'not_hidden', + 'qry__limit': $events_loc.pres_mgmt.qry_limit__session ?? 35, + }, try_cache=false, log_lvl=0, }: { @@ -264,10 +265,10 @@ async function handle_search__event_presenter( class=" ae_events_pres_mgmt_event h-full mx-auto - flex flex-col + flex flex-col gap-1 + py-1 px-2 pb-16 items-center - space-y-2 pt-0 pb-8 - min-w-fit + min-w-100 w-3/4 max-w-max " @@ -279,12 +280,11 @@ async function handle_search__event_presenter( {#if $lq__event_obj}

{$lq__event_obj?.name}

-

Presentation Management Reports

+

Presentations - Reports

{/if} - -