From 09dc4718424b5e5cbec1eb5bd9fdf3ae1f1b0a04 Mon Sep 17 00:00:00 2001 From: Scott Idem Date: Thu, 19 Jun 2025 17:09:44 -0400 Subject: [PATCH] More TW related updates. LCI related updates. --- .../ae_events/ae_events__event_presenter.ts | 6 + src/routes/events/+layout.svelte | 4 +- .../presenter/[presenter_id]/+page.svelte | 127 ++++++++++-------- .../events/[event_id]/reports/+page.svelte | 23 ++-- 4 files changed, 93 insertions(+), 67 deletions(-) diff --git a/src/lib/ae_events/ae_events__event_presenter.ts b/src/lib/ae_events/ae_events__event_presenter.ts index d22d75b3..6b8bd06b 100644 --- a/src/lib/ae_events/ae_events__event_presenter.ts +++ b/src/lib/ae_events/ae_events__event_presenter.ts @@ -568,6 +568,12 @@ export async function search__event_presenter( if (agree === true || agree === false) { params_json['and_qry']['agree'] = agree; + // if (!agree) { + // params_json['or_qry']['agree'] = null; + // } + } + if (agree === null) { + params_json['and_qry']['agree'] = agree; } if (biography) { diff --git a/src/routes/events/+layout.svelte b/src/routes/events/+layout.svelte index 35d8f530..0a6eac83 100644 --- a/src/routes/events/+layout.svelte +++ b/src/routes/events/+layout.svelte @@ -165,9 +165,9 @@ if (browser) { size="1.5em" class="mx-1 inline-block text-gray-500" /> - + Æ - IDAA + Events -/** @type {import('./$types').PageData} */ -export let data: any; -export let log_lvl: number = 0; + // Imports (external and then internal) import { browser } from '$app/environment'; @@ -24,6 +22,14 @@ import Presenter_view from './presenter_view.svelte'; import Presenter_page_menu from './presenter_page_menu.svelte'; import MyClipboard from '$lib/e_app_clipboard.svelte'; +interface Props { + /** @type {import('./$types').PageData} */ + data: any; + log_lvl?: number; +} + +let { data, log_lvl = 0 }: Props = $props(); + // Exports // export let display_mode: string = 'default'; // 'default', 'compact', 'minimal', 'launcher' @@ -44,24 +50,27 @@ $events_slct.event_file_obj_li = ae_acct.slct.event_file_obj_li; $events_sess.pres_mgmt.show_modal__presenter_agree = false; $events_sess.pres_mgmt.show_content__presenter_start = false; -let lq__event_obj = liveQuery( - () => db_events.events.get(ae_acct.slct.event_id) -); -let lq__event_presenter_obj = liveQuery( - () => db_events.presenters.get(ae_acct.slct.event_presenter_id) -); +let lq__event_obj = $derived(liveQuery(async () => { + let results = await db_events.events.get(ae_acct.slct.event_id) -let lq__event_presentation_obj = liveQuery( - () => db_events.presentations.get(ae_acct.slct.event_presentation_id) -); + return results; +})); +let lq__event_presenter_obj = $derived(liveQuery(async () => { + let results = await db_events.presenters.get(ae_acct.slct.event_presenter_id) -let lq__auth__event_presenter_obj = liveQuery( - () => db_events.presenters.get($events_loc.auth__person.presenter_id ?? null) -); + return results; +})); -if (!$ae_loc.authenticated_access && $events_loc.pres_mgmt.show_content__presenter_view) { - $events_loc.pres_mgmt.show_content__presenter_view = null; -} +let lq__event_presentation_obj = $derived(liveQuery(async () => { + let results = await db_events.presentations.get(ae_acct.slct.event_presentation_id) + + return results; +})); +let lq__auth__event_presenter_obj = $derived(liveQuery(async () => { + let results = await db_events.presenters.get($events_loc.auth__person.presenter_id ?? null) + + return results; +})); // if (browser && $lq__event_presenter_obj) { // console.log('Pres Mgmt [page]: +presenter.svelte'); @@ -120,7 +129,7 @@ if (!$ae_loc.authenticated_access && $events_loc.pres_mgmt.show_content__present - - + class="btn btn-sm preset-tonal-warning hover:preset-tonal-warning border border-warning-500" + > + + Close + + + + {/snippet} diff --git a/src/routes/events/[event_id]/reports/+page.svelte b/src/routes/events/[event_id]/reports/+page.svelte index 60846a67..338f6d3a 100644 --- a/src/routes/events/[event_id]/reports/+page.svelte +++ b/src/routes/events/[event_id]/reports/+page.svelte @@ -88,15 +88,15 @@ if ($events_loc.pres_mgmt.show_report == 'sessions_poc_agree') { }); } -onMount(() => { - console.log('Events Event [slug] Reports: +page.svelte'); +// onMount(() => { +// console.log('Events Event [slug] Reports: +page.svelte'); - if (!$events_slct.event_id) { - console.log(`No ID! Nothing to show. Try setting the ID again.`); - $events_slct.event_id = $events_slct.event_id; - } +// if (!$events_slct.event_id) { +// console.log(`No ID! Nothing to show. Try setting the ID again.`); +// $events_slct.event_id = $events_slct.event_id; +// } -}); +// }); async function handle_qry__event_file( { @@ -642,7 +642,7 @@ async function handle_qry__event_session( agree: $events_loc.pres_mgmt.rpt__presenter_agree ?? false, ft_search_str: '', lk_search_str: '', - log_lvl: 2, + log_lvl: log_lvl, }); $events_loc.pres_mgmt.show_report = 'presenters_agree'; }} @@ -839,6 +839,13 @@ async function handle_qry__event_session( type="button" on:click={() => { $events_loc.pres_mgmt.rpt__presenter_agree = !$events_loc.pres_mgmt.rpt__presenter_agree; + + ae_promises.handle_search__event_presenter = handle_search__event_presenter({ + agree: $events_loc.pres_mgmt.rpt__presenter_agree ?? false, + ft_search_str: '', + lk_search_str: '', + log_lvl: 2, + }); }} class="btn btn-sm preset-tonal-warning hover:preset-tonal-warning border border-warning-500 transition-all m-1" >