diff --git a/src/routes/events_pres_mgmt/session/[slug]/+page.svelte b/src/routes/events_pres_mgmt/session/[slug]/+page.svelte index 7c418e39..d4a47cba 100644 --- a/src/routes/events_pres_mgmt/session/[slug]/+page.svelte +++ b/src/routes/events_pres_mgmt/session/[slug]/+page.svelte @@ -86,12 +86,25 @@ let lq__event_session_obj = liveQuery( () => db_events.sessions.get(ae_acct.slct.event_session_id) ); +let lq__event_presentation_obj_li = liveQuery( + () => db_events.presentations + .where('event_session_id_random') + .equals(ae_acct.slct.event_session_id) + .sortBy('name') +); + +let lq__auth__event_presenter_obj = liveQuery( + () => db_events.presenters.get($events_loc.auth__person.event_presenter_id ?? null) +); + $slct.person_obj_kv = {}; // This is intended for the POC lookup list when generated. onMount(() => { console.log('Events Session [slug]: +page.svelte'); + // console.log(`lq__auth__event_presenter_obj:`, $lq__auth__event_presenter_obj?.full_name); + // let url_person_id = data.url.searchParams.get('person_id'); // let url_person_pass = data.url.searchParams.get('person_pass'); // let url_presentation_id = data.url.searchParams.get('presentation_id'); @@ -218,10 +231,10 @@ onMount(() => { md:container h-full mx-auto flex flex-col gap-1 py-1 px-2 pb-16" > - @@ -232,7 +245,10 @@ onMount(() => { {:else if $lq__event_session_obj?.enable || $ae_loc.trusted_access} {:else}
diff --git a/src/routes/events_pres_mgmt/session_page_menu.svelte b/src/routes/events_pres_mgmt/session_page_menu.svelte index 40411879..ea627bd8 100644 --- a/src/routes/events_pres_mgmt/session_page_menu.svelte +++ b/src/routes/events_pres_mgmt/session_page_menu.svelte @@ -11,6 +11,7 @@ import Element_data_store from '$lib/element_data_store.svelte'; import Sign_in_out from './sign_in_out.svelte'; export let lq__event_session_obj: any; +export let lq__auth__event_presenter_obj: any; let ae_tmp: key_val = {}; let ae_triggers: key_val = {}; @@ -88,7 +89,10 @@ let ae_triggers: key_val = {}; class:hidden={!$events_loc.auth__person?.id} > - + diff --git a/src/routes/events_pres_mgmt/session_view.svelte b/src/routes/events_pres_mgmt/session_view.svelte index 6d02bbe2..159e3063 100644 --- a/src/routes/events_pres_mgmt/session_view.svelte +++ b/src/routes/events_pres_mgmt/session_view.svelte @@ -41,25 +41,30 @@ if (!$events_sess.pres_mgmt) { $events_sess.pres_mgmt.show_content__agree_text = false; $events_sess.pres_mgmt.show_content__presenter_start = false; -let lq__event_session_obj = liveQuery( - () => db_events.sessions.get(event_session_id) -); +export let lq__event_session_obj: any; +// let lq__event_session_obj = liveQuery( +// () => db_events.sessions.get(event_session_id) +// ); -let lq__event_presentation_obj_li = liveQuery( - () => db_events.presentations - .where('event_session_id_random') - .equals(event_session_id) - .sortBy('name') -); +export let lq__auth__event_presenter_obj: any; + +export let lq__event_presentation_obj_li: any; + +// let lq__event_presentation_obj_li = liveQuery( +// () => db_events.presentations +// .where('event_session_id_random') +// .equals(event_session_id) +// .sortBy('name') +// ); let lq__event_presentation_obj = liveQuery( () => db_events.presentations.get($events_slct.event_presentation_id) ); -let lq__auth__event_presenter_obj = liveQuery( - () => db_events.presenters.get($events_slct.auth__event_presenter_id) -); +// let lq__auth__event_presenter_obj = liveQuery( +// () => db_events.presenters.get($events_slct.auth__event_presenter_id) +// ); let lq__event_presenter_obj = liveQuery( () => db_events.presenters.get($events_slct.event_presenter_id) @@ -69,71 +74,10 @@ $slct.person_obj_kv = {}; // This is intended for the person POC lookup list whe onMount(() => { - console.log('Events Pres Mgmt: session_view.svelte'); + console.log(`Events Pres Mgmt: session_view.svelte: event_session_id=${event_session_id}`); }); -// function presenter_sign_in() { -// console.log('Presenter sign in with URL values'); - -// $ae_loc.authenticated_access = true; -// $ae_loc.access_type = 'authenticated'; - -// $events_loc.auth__person.id = $events_sess.auth__entered_key; // person_id -// $events_loc.auth__person.entered_key = $events_sess.auth__entered_key; // also person_id in this case -// $events_loc.auth__person.email = 'test@example.com'; -// $events_loc.auth__person.full_name = 'Test Person'; - -// $events_loc.auth__kv.person[$events_sess.entered_key] = true; -// $events_loc.auth__kv.session[$events_slct.event_session_id] = false; // Set to false for presenters. -// $events_loc.auth__kv.presentation[$events_sess.auth__person.presentation_id] = true; -// $events_loc.auth__kv.presenter[$events_sess.auth__person.presenter_id] = true; - -// // Setting again here... just because for now. -// $events_slct.event_presentation_id = $events_sess.auth__person.presentation_id; -// $events_slct.event_presenter_id = $events_sess.auth__person.presenter_id; -// } - -// function session_sign_in() { -// console.log('Session sign in with URL values'); - -// $ae_loc.authenticated_access = true; -// $ae_loc.access_type = 'authenticated'; - -// $events_loc.auth__person.id = $events_sess.auth__entered_key; // person_id -// $events_loc.auth__person.entered_key = $events_sess.auth__entered_key; // also person_id in this case -// $events_loc.auth__person.email = 'test@example.com'; -// $events_loc.auth__person.full_name = 'Test Person'; - -// $events_loc.auth__kv.person[$events_sess.entered_key] = true; -// $events_loc.auth__kv.session[$events_slct.event_session_id] = true; -// $events_loc.auth__kv.presentation[$events_sess.auth__person.presentation_id] = false; // Set to false for session POC (LCI Champions). -// $events_loc.auth__kv.presenter[$events_sess.auth__person.presenter_id] = false; // Set to false for session POC (LCI Champions). - -// // Setting again here... just because for now. -// // $events_slct.event_presentation_id = $events_sess.auth__person.presentation_id; -// // $events_slct.event_presenter_id = $events_sess.auth__person.presenter_id; -// } - -function sign_out() { - $ae_loc.authenticated_access = false; - $ae_loc.access_type = 'anonymous'; - - $events_loc.auth__person = { - id: null, - email: null, - full_name: null, - entered_key: null, - entered_passcode: null, - }; - $events_loc.auth__kv = { - session: {}, - presentation: {}, - presenter: {}, - person: {}, - }; -} - $: if ($lq__event_session_obj) { // Generate a QR code for the object ID. // ae_promises.generate_qr_code_obj_id = core_func.generate_qr_code({api_cfg: $ae_api, account_id: $slct.account_id, qr_type: 'obj', qr_id: $lq__event_session_obj?.event_session_id_random, obj_type: 'event_session', obj_id: $lq__event_session_obj?.event_session_id_random}); @@ -728,7 +672,7 @@ $: if ($lq__event_session_obj) { {#if $events_loc.auth__kv.session[$events_slct.event_session_id]}

Welcome {$lq__event_session_obj?.poc_person_full_name ?? 'Session POC'}

{:else} -

Welcome {$lq__event_presenter_obj?.full_name ?? 'Presenter'}

+

Welcome {$lq__auth__event_presenter_obj?.full_name ?? 'Presenter'}

{/if} {#if $ae_loc.trusted_access || $events_loc.auth__kv.session[$events_slct.event_session_id] || ($events_loc.auth__kv.presenter[$events_slct.event_presenter_id] && $lq__event_presenter_obj?.agree)} diff --git a/src/routes/events_pres_mgmt/sign_in_out.svelte b/src/routes/events_pres_mgmt/sign_in_out.svelte index 199bd797..490d249d 100644 --- a/src/routes/events_pres_mgmt/sign_in_out.svelte +++ b/src/routes/events_pres_mgmt/sign_in_out.svelte @@ -8,10 +8,14 @@ import { goto } from '$app/navigation'; import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores'; import { events_loc, events_sess, events_slct, events_trigger, events_trig_kv } from '$lib/ae_events_stores'; +export let lq__auth__event_presenter_obj: any; + if (browser) { // onMount(() => { console.log('Browser environment detected.'); + console.log(`lq__auth__event_presenter_obj = `, $lq__auth__event_presenter_obj); + let url_person_id = data.url.searchParams.get('person_id'); let url_person_pass = data.url.searchParams.get('person_pass'); let url_presentation_id = data.url.searchParams.get('presentation_id'); @@ -70,12 +74,13 @@ function session_sign_in() { $ae_loc.authenticated_access = true; $ae_loc.access_type = 'authenticated'; - $events_loc.auth__person.id = $events_sess.auth__entered_key; // person_id - $events_loc.auth__person.entered_key = $events_sess.auth__entered_key; // also person_id in this case + $events_loc.auth__person.id = $events_sess.auth__person.id; // person_id + $events_loc.auth__person.entered_key = $events_sess.auth__entered_key; // need to verify entered_key... $events_loc.auth__person.email = 'test@example.com'; $events_loc.auth__person.full_name = 'Test Person'; + // $events_loc.auth__person.event_session_id = $events_sess.auth__person.session_id; - $events_loc.auth__kv.person[$events_sess.entered_key] = true; + $events_loc.auth__kv.person[$events_sess.auth__person.id] = true; $events_loc.auth__kv.session[$events_slct.event_session_id] = true; $events_loc.auth__kv.presentation[$events_sess.auth__person.presentation_id] = false; // Set to false for session POC (LCI Champions). $events_loc.auth__kv.presenter[$events_sess.auth__person.presenter_id] = false; // Set to false for session POC (LCI Champions). @@ -91,11 +96,14 @@ function presenter_sign_in() { $ae_loc.authenticated_access = true; $ae_loc.access_type = 'authenticated'; + $ae_loc.person_id = $events_sess.auth__person.id; - $events_loc.auth__person.id = $events_sess.auth__entered_key; // person_id + $events_loc.auth__person.id = $events_sess.auth__person.id; // person_id $events_loc.auth__person.entered_key = $events_sess.auth__entered_key; // also person_id in this case + // $lq__auth__event_presenter_obj.full_name $events_loc.auth__person.email = 'test@example.com'; $events_loc.auth__person.full_name = 'Test Person'; + $events_loc.auth__person.event_presenter_id = $events_sess.auth__person.presenter_id; $events_loc.auth__kv.person[$events_sess.entered_key] = true; $events_loc.auth__kv.session[$events_slct.event_session_id] = false; // Set to false for presenters. @@ -103,8 +111,11 @@ function presenter_sign_in() { $events_loc.auth__kv.presenter[$events_sess.auth__person.presenter_id] = true; // Setting again here... just because for now. - $events_slct.auth__event_presentation_id = $events_sess.auth__person.presentation_id; - $events_slct.auth__event_presenter_id = $events_sess.auth__person.presenter_id; + // $events_slct.auth__event_presentation_id = $events_sess.auth__person.presentation_id; + // $events_slct.auth__event_presenter_id = $events_sess.auth__person.presenter_id; + + $events_loc.auth__person.presentation_id = $events_sess.auth__person.presentation_id; + $events_loc.auth__person.presenter_id = $events_sess.auth__person.presenter_id; } function sign_out() { @@ -131,7 +142,6 @@ function sign_out() { } - {#if $events_loc.auth__person?.id} {:else if $events_sess.auth__person.presenter_id || $events_sess.auth__person.session_id}