diff --git a/src/lib/ae_events_stores.ts b/src/lib/ae_events_stores.ts index 60731148..ebb52742 100644 --- a/src/lib/ae_events_stores.ts +++ b/src/lib/ae_events_stores.ts @@ -372,6 +372,11 @@ let events_session_data_struct: key_val = { loading__session_li_status: null, loading__session_id_status: null, + + trigger_reload__event_session_obj_id: null, + trigger_reload__event_session_obj_li: null, + trigger_reload__event_location_obj_id: null, + trigger_reload__event_location_obj_li: null, }, // Lead Retrievals (Exhibit) diff --git a/src/lib/element_data_store_v2.svelte b/src/lib/element_data_store_v2.svelte index aa753d1b..66d81aed 100644 --- a/src/lib/element_data_store_v2.svelte +++ b/src/lib/element_data_store_v2.svelte @@ -10,7 +10,7 @@ import { ae_util } from '$lib/ae_utils/ae_utils'; import type { key_val } from '$lib/ae_stores'; export let log_lvl: number = 0; -export let expire_minutes: number = 10; +export let expire_minutes: number = 15; export let mount_reload_sec: number = 0; export let ds_code: string; diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index be258747..26762a23 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -714,7 +714,7 @@ $effect(() => { gap-1 items-center justify-start p-2 bg-neutral-500/50 - z-10 + z-40 transition-all " > @@ -733,7 +733,13 @@ $effect(() => { rounded-lg p-2 preset-outlined-surface-600-400 preset-filled-surface-200-800 - opacity-70 md:opacity-50 + + shadow-lg + + opacity-40 md:opacity-20 hover:opacity-100 focus:opacity-100 active:opacity-100 + transition-delay-500 transition-duration-1000 transition-timing-function-ease-out + + transition-all " > @@ -742,7 +748,7 @@ $effect(() => { class="flex flex-row items-center justify-between w-full" > - App loading + App Loading diff --git a/src/routes/+layout.ts b/src/routes/+layout.ts index 30087c3f..5674bc5f 100644 --- a/src/routes/+layout.ts +++ b/src/routes/+layout.ts @@ -252,8 +252,8 @@ export async function load({ fetch, params, parent, route, url }) { // params, r } }) - .catch(function (error) { - console.log('API GET Object *fetch* request was aborted or failed in an unexpected way.', error); + .catch((err) => { + console.log('API GET Object *fetch* request was aborted or failed in an unexpected way.', err); error(500, { message: 'Site lookup aborted or failed! Check the network connection, domain name, and API.' }); @@ -272,19 +272,15 @@ export async function load({ fetch, params, parent, route, url }) { // params, r }); } - + // log_lvl = 0; if (log_lvl > 1) { console.log(`root +layout.ts: Using account_id = `, account_id); console.log(`root +layout.ts: ae_loc_init = `, ae_loc_init); } - // log_lvl = 0; - if (!account_id) { - console.log(`root +layout.ts: The account_id was not found!!!`); - error(500, { - message: 'The account ID was not found!' + message: 'The account ID was not found! Check the API.' }); } diff --git a/src/routes/events/+layout.svelte b/src/routes/events/+layout.svelte index fcf2de91..b83717b3 100644 --- a/src/routes/events/+layout.svelte +++ b/src/routes/events/+layout.svelte @@ -96,7 +96,10 @@ function scroll_container() { - Presentation Management - {$events_loc.title ?? 'Æ loading...'} + + Æ: + Events - {$events_loc.title ?? 'Æ loading...'} + diff --git a/src/routes/events/+layout.ts b/src/routes/events/+layout.ts index b873210d..e7ab25bd 100644 --- a/src/routes/events/+layout.ts +++ b/src/routes/events/+layout.ts @@ -23,45 +23,6 @@ export async function load({ parent }) { console.log(`ae_acct = `, ae_acct); } - // let event_id = ae_acct.slct.event_id; // From root +layout.ts - // if (!event_id) { - // console.log(`ERROR: events_pres_mgmt +layout.ts: The event_id was not found in the parent_data!!!`); - // return false; - // } - - // if (browser) { - // if (log_lvl) { - // console.log(`ae_events_pres_mgmt +layout.ts parent_data:`, parent_data); - // } - - // // Should we limit these to event.conference = true? - // let load_event_obj_li = events_func.load_ae_obj_li__event({ - // api_cfg: ae_acct.api, - // for_obj_type: 'account', - // for_obj_id: account_id, - // params: {qry__enabled: 'enabled', qry__limit: 25}, - // try_cache: true, - // log_lvl: log_lvl - // }); - // ae_acct.slct.event_obj_li = load_event_obj_li; - // } - - // let load_event_obj = events_func.load_ae_obj_id__event({ - // api_cfg: ae_acct.api, - // event_id: event_id, - // try_cache: false - // }); - - // ae_acct.slct.event_obj = load_event_obj; - - - // let submenu = { - // main: {name: 'Main', href: '/events', access: false}, - // // manage: {name: 'Manage', href: '/events/${event_id}/manage', access: 'administrator', disable: true, hide: true}, - // locations: {name: 'Locations', href: `/events/${event_id}/locations`, access: false, disable: false, hide: false}, - // }; - // parent_data.submenu = submenu - // WARNING: Precaution against shared parent_data between sites and sessions. parent_data[account_id] = ae_acct; diff --git a/src/routes/events/+page.ts b/src/routes/events/+page.ts index feda6b40..ae6e9210 100644 --- a/src/routes/events/+page.ts +++ b/src/routes/events/+page.ts @@ -28,9 +28,6 @@ export async function load({ parent }) { let load_event_obj_li = await events_func.load_ae_obj_id__event({ api_cfg: ae_acct.api, event_id: event_id, - hidden: 'all', // 'not_hidden' to load only visible entries - // params: ae_params, - try_cache: true, log_lvl: log_lvl }); ae_acct.slct.event_obj_li = load_event_obj_li; diff --git a/src/routes/events/[event_id]/(launcher)/launcher/+layout.svelte b/src/routes/events/[event_id]/(launcher)/launcher/+layout.svelte index 55ecd687..faddc657 100644 --- a/src/routes/events/[event_id]/(launcher)/launcher/+layout.svelte +++ b/src/routes/events/[event_id]/(launcher)/launcher/+layout.svelte @@ -219,21 +219,21 @@ let lq__event_session_obj_li = $derived(liveQuery(async () => { let results; if ($events_sess?.session_li && $events_sess?.session_li?.length) { - if (log_lvl) { - console.log(`LQ - Using $events_sess.session_li to get event sessions.`); - } - // $events_sess.session_li_trigger = false; - let event_session_id_random_li = []; // This is to prevent the array from constantly updating and triggering the liveQuery. + // if (log_lvl) { + // console.log(`LQ - Using $events_sess.session_li to get event sessions.`); + // } + // // $events_sess.session_li_trigger = false; + // let event_session_id_random_li = []; // This is to prevent the array from constantly updating and triggering the liveQuery. - for (let i = 0; i < $events_sess?.session_li.length; i++) { - let event_session_obj = $events_sess?.session_li[i]; - let event_session_id_random = event_session_obj.event_session_id_random; - event_session_id_random_li.push(event_session_id_random); - } - // let event_session_id_random_li = tmp_li; + // for (let i = 0; i < $events_sess?.session_li.length; i++) { + // let event_session_obj = $events_sess?.session_li[i]; + // let event_session_id_random = event_session_obj.event_session_id_random; + // event_session_id_random_li.push(event_session_id_random); + // } + // // let event_session_id_random_li = tmp_li; - results = await db_events.sessions - .bulkGet(event_session_id_random_li); + // results = await db_events.sessions + // .bulkGet(event_session_id_random_li); // } else if ($lq__event_obj?.cfg_json?.session_group_sort === 'DESC') { // if (log_lvl) { @@ -259,7 +259,7 @@ let lq__event_session_obj_li = $derived(liveQuery(async () => { // .reverse() // .sortBy('tmp_sort_1'); - } else { + } else if ($events_slct.event_location_id) { if (log_lvl) { // console.log(`$lq__event_obj.cfg_json = `, $lq__event_obj?.cfg_json); console.log(`LQ - Using default sort for Event Session list event_id: ${$events_slct?.event_id}`); @@ -648,10 +648,11 @@ $effect(() => { + - Launcher: - {ae_util.shorten_string({ string: $lq__event_obj?.name ?? '', max_length: 20, begin_length: 10, end_length: 4 })} - ({$lq__event_obj?.event_id ?? 'loading...'}) - Pres Mgmt - {$ae_loc?.title} + Æ: + {$lq__event_location_obj?.name ?? '-- not set --'} + ({$lq__event_session_obj?.name ?? 'Æ loading...'}) - Launcher - {$events_loc?.title} @@ -790,7 +791,12 @@ $effect(() => { lq__event_session_obj_li={lq__event_session_obj_li} bind:loading__session_id_status={$events_sess.launcher.loading__session_id_status} lq__event_session_obj={lq__event_session_obj} - slct__event_session_id={$events_slct.event_session_id} + bind:slct__event_session_id={$events_slct.event_session_id} + + bind:trigger_reload__event_session_obj_id={$events_sess.launcher.trigger_reload__event_session_obj_id} + bind:trigger_reload__event_session_obj_li={$events_sess.launcher.trigger_reload__event_session_obj_li} + bind:trigger_reload__event_location_obj_li={$events_sess.launcher.trigger_reload__event_location_obj_li} + > + {#if $events_slct.event_session_id && $lq__event_session_obj && !$events_sess.launcher.loading__session_id_status} {/if} diff --git a/src/routes/events/[event_id]/(launcher)/launcher/[event_location_id]/+page.svelte b/src/routes/events/[event_id]/(launcher)/launcher/[event_location_id]/+page.svelte index 6292d47c..3e5a9d1c 100644 --- a/src/routes/events/[event_id]/(launcher)/launcher/[event_location_id]/+page.svelte +++ b/src/routes/events/[event_id]/(launcher)/launcher/[event_location_id]/+page.svelte @@ -59,7 +59,7 @@ $events_slct.event_location_obj_li = ae_acct.slct.event_location_obj_li ?? ['']; $events_slct.id_li__event_location = ae_acct.slct.id_li__event_location ?? ['']; console.log(`$events_slct.event_location_obj_li:`, $events_slct.event_location_obj_li); $events_slct.event_session_obj_li = ae_acct.slct.event_session_obj_li ?? ['']; -$events_slct.id_li__event_session = ae_acct.slct.id_li__event_session ?? ['']; +// $events_slct.id_li__event_session = ae_acct.slct.id_li__event_session ?? ['']; // $events_trig = ae_acct.trig; // $events_trig.event_location_li = true; diff --git a/src/routes/events/[event_id]/(launcher)/launcher/[event_location_id]/+page.ts b/src/routes/events/[event_id]/(launcher)/launcher/[event_location_id]/+page.ts index f6f53a3a..2139a209 100644 --- a/src/routes/events/[event_id]/(launcher)/launcher/[event_location_id]/+page.ts +++ b/src/routes/events/[event_id]/(launcher)/launcher/[event_location_id]/+page.ts @@ -6,7 +6,7 @@ import { browser } from '$app/environment'; import { events_func } from '$lib/ae_events_functions'; export async function load({ params, parent, url }) { // route - let log_lvl: number = 0; + let log_lvl: number = 1; let data = await parent(); // console.log(`ae events_pres_mgmt event [event_location_id] +page.ts data:`, data); @@ -14,25 +14,22 @@ export async function load({ params, parent, url }) { // route let account_id = data.account_id; let ae_acct = data[account_id]; - console.log(`ae_acct = `, ae_acct); let event_location_id = params.event_location_id; if (!event_location_id) { console.log(`ae Events - [event_id] launcher [event_location_id] +page.ts: The event_location_id was not found in the params.event_location_id!!!`); error(404, { - message: 'Event Location ID not found' + message: 'Events Pres Mgmt - Event Location ID not found' }); } - if (log_lvl) { - console.log(`ae_events launcher [event_location_id] +page.ts: event_location_id = `, event_location_id); - } if (browser) { if (log_lvl) { console.log(`ae_events launcher [event_location_id] +page.ts: event_location_id = `, event_location_id); } // Load event_session object - let load_event_session_obj_li = await events_func.load_ae_obj_li__event_session({ + // let load_event_session_obj_li = await events_func.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_location', for_obj_id: event_location_id, @@ -52,18 +49,18 @@ export async function load({ params, parent, url }) { // route ae_acct.slct.event_session_obj_li = load_event_session_obj_li; // console.log(`ae_acct.slct.event_session_obj_li = `, ae_acct.slct.event_session_obj_li); - let id_li__event_session = []; + // let id_li__event_session = []; - let tmp_li = []; // This is to prevent the array from constantly updating and triggering the liveQuery. + // let tmp_li = []; // This is to prevent the array from constantly updating and triggering the liveQuery. - for (let i = 0; i < load_event_session_obj_li.length; i++) { - let event_session_obj = load_event_session_obj_li[i]; - let event_session_id_random = event_session_obj.event_session_id_random; - tmp_li.push(event_session_id_random); - } - id_li__event_session = tmp_li; - console.log(`id_li__event_session:`, id_li__event_session); - ae_acct.slct.id_li__event_session = id_li__event_session; + // for (let i = 0; i < load_event_session_obj_li.length; i++) { + // let event_session_obj = load_event_session_obj_li[i]; + // let event_session_id_random = event_session_obj.event_session_id_random; + // tmp_li.push(event_session_id_random); + // } + // id_li__event_session = tmp_li; + // console.log(`id_li__event_session:`, id_li__event_session); + // ae_acct.slct.id_li__event_session = id_li__event_session; // This should only be needed if the session ID passed is not part of the location sessions. // let event_session_id = url.searchParams.get('session_id'); diff --git a/src/routes/events/[event_id]/(launcher)/launcher_menu.svelte b/src/routes/events/[event_id]/(launcher)/launcher_menu.svelte index c3a4a81d..ada8ca79 100644 --- a/src/routes/events/[event_id]/(launcher)/launcher_menu.svelte +++ b/src/routes/events/[event_id]/(launcher)/launcher_menu.svelte @@ -18,6 +18,10 @@ interface Props { lq__event_session_obj?: any; slct__event_session_id?: string|null; + trigger_reload__event_session_obj_id?: boolean|null|string; + trigger_reload__event_session_obj_li?: boolean; + trigger_reload__event_location_obj_li?: boolean; + log_lvl?: number; } @@ -40,6 +44,10 @@ let { lq__event_session_obj, slct__event_session_id = $bindable(null), + trigger_reload__event_session_obj_id = $bindable(false), + trigger_reload__event_session_obj_li = $bindable(false), + trigger_reload__event_location_obj_li = $bindable(false), + log_lvl = $bindable(0), }: Props = $props(); @@ -233,9 +241,10 @@ let ae_promises: key_val = $state({ {#if $lq__event_session_obj_li} {/if} diff --git a/src/routes/events/[event_id]/(launcher)/launcher_session_view.svelte b/src/routes/events/[event_id]/(launcher)/launcher_session_view.svelte index bedf2e08..cb062f2a 100644 --- a/src/routes/events/[event_id]/(launcher)/launcher_session_view.svelte +++ b/src/routes/events/[event_id]/(launcher)/launcher_session_view.svelte @@ -1,16 +1,23 @@ @@ -164,10 +236,10 @@ ae_promises[$events_slct.event_session_id] = events_func.load_ae_obj_li__event_p {#if $lq__event_session_obj && $lq__event_session_obj.event_session_id_random} -
+

-

+ +

{$lq__event_session_obj?.name} - {#if $lq__event_session_obj?.code} +

+ {#if $lq__event_session_obj?.code} {$lq__event_session_obj?.code} - {/if} - -

+ {/if} +
@@ -257,54 +333,16 @@ ae_promises[$events_slct.event_session_id] = events_func.load_ae_obj_li__event_p class="flex flex-row justify-center gap-1" class:hidden={!$events_loc.launcher.show_content__hidden_files && event_file_obj.hide} > - @@ -335,7 +373,7 @@ ae_promises[$events_slct.event_session_id] = events_func.load_ae_obj_li__event_p {#if $lq__event_presentation_obj_li}
- {#if $lq__event_session_obj.type_code == 'poster'} + {#if type_code == 'poster'} Posters: {:else} @@ -378,7 +416,7 @@ ae_promises[$events_slct.event_session_id] = events_func.load_ae_obj_li__event_p transition-all " > - {#if $lq__event_session_obj.type_code == 'poster'} + {#if type_code == 'poster'} diff --git a/src/routes/events/[event_id]/(launcher)/menu_location_list.svelte b/src/routes/events/[event_id]/(launcher)/menu_location_list.svelte index 58a518d7..391de5af 100644 --- a/src/routes/events/[event_id]/(launcher)/menu_location_list.svelte +++ b/src/routes/events/[event_id]/(launcher)/menu_location_list.svelte @@ -5,6 +5,9 @@ interface Props { lq__event_location_obj_li: any; slct_event_location_id: string|null; + trigger_reload__event_session_obj_li?: boolean; + trigger_reload__event_location_obj_li?: boolean; + log_lvl?: number; } @@ -14,6 +17,9 @@ let { lq__event_location_obj_li, slct_event_location_id = null, + trigger_reload__event_session_obj_li = $bindable(false), + trigger_reload__event_location_obj_li = $bindable(false), + log_lvl = $bindable(0), }: Props = $props(); @@ -43,6 +49,55 @@ let ae_promises: key_val = $state({ // let hover_timer_wait = 1000; // let hover_timer: any = $state(null); +function handle_load_ae_obj_li__event_session(event_location_id: string) { + if (log_lvl) { + console.log(`handle_load_ae_obj_li__event_session: event_location_id = ${event_location_id}`); + } + if (!event_location_id) { + console.warn(`handle_load_ae_obj_li__event_session: No event_location_id provided.`); + return; + } + + loading__session_li_status = true; + + ae_promises[event_location_id] = events_func.load_ae_obj_li__event_session({ + api_cfg: $ae_api, + for_obj_type: 'event_location', + for_obj_id: event_location_id, + inc_file_li: true, // Only include files directly under the session? + inc_all_file_li: false, // Also include files under presentations and presenters as well? + inc_presentation_li: true, + inc_presenter_li: true, + enabled: $events_loc.launcher.show_content__enabled_sessions ? 'all' : 'enabled', + hidden: $events_loc.launcher.show_content__hidden_sessions ? 'all' : 'not_hidden', + limit: 49, + try_cache: true, + log_lvl: 1, + }) + .then(async function (load_results) { + console.log(`load_results = `, load_results); + + let event_session_id_li = []; + + let tmp_li = []; // This is to prevent the array from constantly updating and triggering the liveQuery. + + for (let i = 0; i < load_results.length; i++) { + let event_session_obj = load_results[i]; + let event_session_id_random = event_session_obj.event_session_id_random; + tmp_li.push(event_session_id_random); + } + event_session_id_li = tmp_li; + console.log(`event_session_id_li:`, event_session_id_li); + // $events_slct.id_li__event_session = event_session_id_li; + + loading__session_li_status = false; + + return load_results; + }); + + return ae_promises[event_location_id]; +} + @@ -94,40 +149,10 @@ let ae_promises: key_val = $state({ $events_loc.launcher.slct.event_location_id = slct_event_location_id; $events_slct.event_location_id = slct_event_location_id; - $events_slct.id_li__event_session = []; + // Load the sessions for this location + await handle_load_ae_obj_li__event_session(slct_event_location_id); - 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_slct.event_location_id, - inc_file_li: true, // Only include files directly under the session? - inc_all_file_li: false, // Also include files under presentations and presenters as well? - inc_presentation_li: true, - inc_presenter_li: true, - enabled: $events_loc.launcher.show_content__enabled_sessions ? 'all' : 'enabled', - hidden: $events_loc.launcher.show_content__hidden_sessions ? 'all' : 'not_hidden', - limit: 49, - try_cache: true, - log_lvl: 1, - }) - .then(async function (load_results) { - console.log(`load_results = `, load_results); - let event_session_id_li = []; - - let tmp_li = []; // This is to prevent the array from constantly updating and triggering the liveQuery. - - for (let i = 0; i < load_results.length; i++) { - let event_session_obj = load_results[i]; - let event_session_id_random = event_session_obj.event_session_id_random; - tmp_li.push(event_session_id_random); - } - event_session_id_li = tmp_li; - console.log(`event_session_id_li:`, event_session_id_li); - $events_slct.id_li__event_session = event_session_id_li; - - return load_results; - }); new_url = `/events/${$events_slct.event_id}/launcher/${slct_event_location_id}`; loading__session_li_status = 'finished'; diff --git a/src/routes/events/[event_id]/(launcher)/menu_session_list.svelte b/src/routes/events/[event_id]/(launcher)/menu_session_list.svelte index 3bbc1259..71ac4f02 100644 --- a/src/routes/events/[event_id]/(launcher)/menu_session_list.svelte +++ b/src/routes/events/[event_id]/(launcher)/menu_session_list.svelte @@ -1,25 +1,32 @@ @@ -61,7 +148,7 @@ let hover_timer: any = $state(null); - {#await ae_promises.slct_event_session_id} + {#await ae_promises.slct__event_session_id} {:then result} @@ -92,88 +179,99 @@ let hover_timer: any = $state(null); onmouseenter={() => { // Start a 750 ms timer to prevent changing the session too quickly. hover_timer = setTimeout(async () => { - loading__session_id_status = true; + // Only run if the session ID has changed + if (slct__event_session_id === event_session_obj?.id) { + return; + } + trigger_reload__event_session_obj_id = event_session_obj?.id; + // handle_load_ae_obj_id__event_session(event_session_obj?.id); - // $events_slct.event_session_id = null; - // await tick(); + // loading__session_id_status = true; - slct_event_session_id = event_session_obj?.id; - $events_slct.event_session_id = event_session_obj?.id; - data_url.searchParams.set('session_id', event_session_obj?.id); + // slct__event_session_id = null; - let new_url = data_url.toString(); - console.log(new_url); - loading__session_id_status = false; - // goto(new_url, {replaceState: true}); // Updates the URL without reloading the page - goto(new_url, {replaceState: false}); // Updates the URL history without reloading the page - loading__session_id_status = 'loading'; + // slct__event_session_id = event_session_obj?.id; + // // $events_slct.event_session_id = event_session_obj?.id; + // data_url.searchParams.set('session_id', event_session_obj?.id); - $events_slct.event_session_obj = event_session_obj; + // let new_url = data_url.toString(); + // console.log(new_url); + // loading__session_id_status = false; + // // goto(new_url, {replaceState: true}); // Updates the URL without reloading the page + // // goto(new_url, {replaceState: false}); // Updates the URL history without reloading the page + // loading__session_id_status = 'loading'; - ae_promises.slct_event_session_id = events_func.load_ae_obj_id__event_session({ - api_cfg: $ae_api, - event_session_id: event_session_obj?.id, - inc_file_li: true, - inc_presentation_li: true, - inc_presenter_li: true, - log_lvl: log_lvl - }) - .then(async (load_results) => { - console.log(`load_results = `, load_results); + // $events_slct.event_session_obj = event_session_obj; - // let new_url = data_url.toString(); - // console.log(new_url); - loading__session_id_status = false; - // // goto(new_url, {replaceState: true}); // Updates the URL without reloading the page - // goto(new_url, {replaceState: false}); // Updates the URL history without reloading the page - }); + // ae_promises.slct__event_session_id = events_func.load_ae_obj_id__event_session({ + // api_cfg: $ae_api, + // event_session_id: event_session_obj?.id, + // inc_file_li: true, + // inc_presentation_li: true, + // inc_presenter_li: true, + // log_lvl: log_lvl + // }) + // .then(async (load_results) => { + // console.log(`load_results = `, load_results); + + // // let new_url = data_url.toString(); + // // console.log(new_url); + // loading__session_id_status = false; + // // // goto(new_url, {replaceState: true}); // Updates the URL without reloading the page + // // goto(new_url, {replaceState: false}); // Updates the URL history without reloading the page + // }); }, hover_timer_wait); }} onmouseleave={() => { clearTimeout(hover_timer); }} onclick={async () => { - loading__session_id_status = true; + trigger_reload__event_session_obj_id = event_session_obj?.id; - // $events_slct.event_session_id = null; - // await tick(); + // handle_load_ae_obj_id__event_session(event_session_obj?.id); - $events_slct.event_session_id = event_session_obj?.id; - data_url.searchParams.set('session_id', event_session_obj?.id); + // loading__session_id_status = true; - let new_url = data_url.toString(); - console.log(new_url); - // goto(new_url, {replaceState: true}); // Updates the URL without reloading the page - goto(new_url, {replaceState: false}); // Updates the URL history without reloading the page - loading__session_id_status = 'loading'; + // slct__event_session_id = null; + // // await tick(); - // $events_slct.event_session_id = event_session_obj?.id; - $events_slct.event_session_obj = event_session_obj; + // slct__event_session_id = event_session_obj?.id; + // // $events_slct.event_session_id = event_session_obj?.id; + // data_url.searchParams.set('session_id', event_session_obj?.id); - ae_promises.slct_event_session_id = events_func.load_ae_obj_id__event_session({ - api_cfg: $ae_api, - event_session_id: event_session_obj?.id, - inc_file_li: true, - inc_presentation_li: true, - inc_presenter_li: true, - log_lvl: log_lvl - }) - .then(async (load_results) => { - console.log(`load_results = `, load_results); + // let new_url = data_url.toString(); + // console.log(new_url); + // // goto(new_url, {replaceState: true}); // Updates the URL without reloading the page + // // goto(new_url, {replaceState: false}); // Updates the URL history without reloading the page + // loading__session_id_status = 'loading'; - // let new_url = data_url.toString(); - // console.log(new_url); - loading__session_id_status = false; - // // goto(new_url, {replaceState: true}); // Updates the URL history without reloading the page - // goto(new_url, {replaceState: false}); - }); + // // $events_slct.event_session_id = event_session_obj?.id; + // $events_slct.event_session_obj = event_session_obj; + + // ae_promises.slct__event_session_id = events_func.load_ae_obj_id__event_session({ + // api_cfg: $ae_api, + // event_session_id: event_session_obj?.id, + // inc_file_li: true, + // inc_presentation_li: true, + // inc_presenter_li: true, + // log_lvl: log_lvl + // }) + // .then(async (load_results) => { + // console.log(`load_results = `, load_results); + + // // let new_url = data_url.toString(); + // // console.log(new_url); + // loading__session_id_status = false; + // // // goto(new_url, {replaceState: true}); // Updates the URL history without reloading the page + // // goto(new_url, {replaceState: false}); + // }); - if ($events_loc.launcher.controller == 'local_push') { - console.log(`Local Push Controller Command: ae_load:event_session=${event_session_obj?.id}`); - $events_sess.launcher.controller_cmd = `ae_load:event_session=${event_session_obj?.id}`; - $events_sess.launcher.controller_trigger_send = true; - } + // if ($events_loc.launcher.controller == 'local_push') { + // console.log(`Local Push Controller Command: ae_load:event_session=${event_session_obj?.id}`); + // $events_sess.launcher.controller_cmd = `ae_load:event_session=${event_session_obj?.id}`; + // $events_sess.launcher.controller_trigger_send = true; + // } }} class=" btn btn-sm hover:preset-filled-primary-500 @@ -190,10 +288,10 @@ let hover_timer: any = $state(null); flex flex-row items-center justify-start transition-all " - class:preset-filled-primary-500={$events_slct.event_session_id === event_session_obj?.id} - class:preset-tonal-secondary={$events_slct.event_session_id != event_session_obj?.id} - class:border-secondary-500={$events_slct.event_session_id != event_session_obj?.id} - class:font-bold={$events_slct.event_session_id === event_session_obj?.id} + class:preset-filled-primary-500={slct__event_session_id === event_session_obj?.id} + class:preset-tonal-secondary={slct__event_session_id != event_session_obj?.id} + class:border-secondary-500={slct__event_session_id != event_session_obj?.id} + class:font-bold={slct__event_session_id === event_session_obj?.id} class:hidden={!$events_loc.launcher.show_content__hidden_sessions && event_session_obj?.hide} class:dim={event_session_obj?.hide} @@ -205,14 +303,14 @@ let hover_timer: any = $state(null); - {#if $events_slct.event_session_id === event_session_obj?.id} + {#if slct__event_session_id === event_session_obj?.id} {:else} {/if} {ae_util.iso_datetime_formatter(event_session_obj?.start_datetime, 'week_medium')} diff --git a/src/routes/events/[event_id]/+layout.ts b/src/routes/events/[event_id]/+layout.ts index fec64f50..da057e03 100644 --- a/src/routes/events/[event_id]/+layout.ts +++ b/src/routes/events/[event_id]/+layout.ts @@ -15,14 +15,6 @@ export async function load({ params, parent }) { // route let account_id = data.account_id; let ae_acct = data[account_id]; - // console.log(`ae_acct = `, ae_acct); - - // if (!account_id) { - // console.log(`events_pres_mgmt_event [event_id] +page.ts: The account_id was not found in the data!!!`); - // return false; - // } - - // data.ae_events_pres_mgmt_event_event_id_page_ts = true; let event_id = params.event_id; if (!event_id) { @@ -34,12 +26,6 @@ export async function load({ params, parent }) { // route ae_acct.slct.event_id = event_id; - // let load_event_obj = events_func.handle_load_ae_obj_id__event({ - // api_cfg: ae_acct.api, event_id: event_id, try_cache: true - // }); - - // ae_acct.slct.event_obj = await load_event_obj; - if (browser) { let load_event_obj = await events_func.load_ae_obj_id__event({ api_cfg: ae_acct.api, @@ -66,31 +52,9 @@ export async function load({ params, parent }) { // route } console.log(`load_event_obj = `, load_event_obj); ae_acct.slct.event_obj = load_event_obj; - ae_acct.slct.event_device_obj_li = load_event_obj.event_device_obj_li; + // ae_acct.slct.event_device_obj_li = load_event_obj.event_device_obj_li; ae_acct.slct.event_location_obj_li = load_event_obj.event_location_obj_li; ae_acct.slct.event_session_obj_li = load_event_obj.event_session_obj_li; - - // 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, - // params: {qry__enabled: 'enabled', qry__hidden: 'all', qry__limit: 200}, - // try_cache: true, - // log_lvl: log_lvl - // }); - // console.log(`load_event_session_obj_li = `, load_event_session_obj_li); - // ae_acct.slct.event_session_obj_li = load_event_session_obj_li; - - // let load_event_location_obj_li = events_func.load_ae_obj_li__event_location({ - // api_cfg: ae_acct.api, - // for_obj_type: 'event', - // for_obj_id: event_id, - // params: {qry__enabled: 'enabled', qry__hidden: 'all', qry__limit: 200}, - // try_cache: true, - // log_lvl: log_lvl - // }); - // console.log(`load_event_location_obj_li = `, load_event_location_obj_li); - // ae_acct.slct.event_location_obj_li = load_event_location_obj_li; } // WARNING: Precaution against shared data between sites and sessions. diff --git a/src/routes/events/[event_id]/+page.svelte b/src/routes/events/[event_id]/+page.svelte index 5a6c8c4c..c0399ffb 100644 --- a/src/routes/events/[event_id]/+page.svelte +++ b/src/routes/events/[event_id]/+page.svelte @@ -392,8 +392,9 @@ async function handle_search__event_session( - Event: {ae_util.shorten_string({string: $lq__event_obj?.name, max_length: 12})} - ({$lq__event_obj?.event_id}) - Pres Mgmt - {$events_loc?.title} + Æ: + {ae_util.shorten_string({string: $lq__event_obj?.name, max_length: 12})} + - Pres Mgmt - {$events_loc?.title} diff --git a/src/routes/journals/+page.svelte b/src/routes/journals/+page.svelte index 50590246..f75cf0a5 100644 --- a/src/routes/journals/+page.svelte +++ b/src/routes/journals/+page.svelte @@ -44,17 +44,17 @@ let ae_acct = data[$slct.account_id]; let lq__journal_obj_li = $derived(liveQuery(async () => { let results = await db_journals.journal - .where('person_id') - .equals($ae_loc.person_id) - // .sortBy('group') - // .sortBy('priority') - // .sortBy('sort') - .reverse() - .sortBy('tmp_sort_3') + .where('person_id') + .equals($ae_loc.person_id) + // .sortBy('group') + // .sortBy('priority') + // .sortBy('sort') + .reverse() + .sortBy('tmp_sort_3') - // .orderBy('tmp_sort_3') - // .reverse() - // .toArray() + // .orderBy('tmp_sort_3') + // .reverse() + // .toArray() // .sortBy('start_datetime')