diff --git a/src/lib/ae_stores.ts b/src/lib/ae_stores.ts index 27b3cf70..a7a8cd00 100644 --- a/src/lib/ae_stores.ts +++ b/src/lib/ae_stores.ts @@ -36,7 +36,8 @@ export type key_val = { // *** BEGIN *** Longer-term app data. This should be stored to local storage. export let ae_app_local_data_struct: key_val = { - 'ver': '2024-06-26_12', + 'ver': '2024-06-26_13', + 'ver_idb': '2024-06-26_1625', // Clear if date IndexedDB version 'name': 'Aether - App Hub (SvelteKit 2.x Svelte 4.x)', 'theme': 'light', 'iframe': false, diff --git a/src/routes/events_pres_mgmt/+layout.svelte b/src/routes/events_pres_mgmt/+layout.svelte index 0ff3900c..9c461acb 100644 --- a/src/routes/events_pres_mgmt/+layout.svelte +++ b/src/routes/events_pres_mgmt/+layout.svelte @@ -111,33 +111,61 @@ $: if ($events_trigger == 'load__event_session_obj_id' && $events_trig_kv['event {/if} -{#if $ae_loc.ver < '2024-06-26_12'} -
-

There is a new version of the app. Please use the button to clear the page cache and reload the page.

+ + +{#if $ae_loc.ver != '2024-06-26_13' || $ae_loc.ver_idb != '2024-06-26_1625'} + +
+ + +

New Version Available

+

+ There is a new version of the web app (this website). Please use the button to clear some cached data and settings. The page will then reload. +

+{#if $ae_loc.ver != '2024-06-26_13'} +

+ You will need to sign in again after clearing the cache. +

+{/if} + +
+ +{:else} + + + {/if} diff --git a/src/routes/events_pres_mgmt/event/[slug]/+page.svelte b/src/routes/events_pres_mgmt/event/[slug]/+page.svelte index 28954735..5b9289ac 100644 --- a/src/routes/events_pres_mgmt/event/[slug]/+page.svelte +++ b/src/routes/events_pres_mgmt/event/[slug]/+page.svelte @@ -102,14 +102,29 @@ $: if ($events_trigger == 'load__event_session_obj_li' && $events_slct.event_id) $events_trigger = null; - if (!$events_sess.pres_mgmt.fulltext_search_qry_str || $events_sess?.pres_mgmt.fulltext_search_qry_str.length <= 1 ) { + if ( $ae_loc.administrator_access ) { + console.log('Administrator access search'); + handle_search__event_session($events_sess.pres_mgmt.fulltext_search_qry_str); + } else if ( $ae_loc.trusted_access ) { + console.log('Trusted access search'); + handle_search__event_session($events_sess.pres_mgmt.fulltext_search_qry_str); + } else if (!$events_sess.pres_mgmt.fulltext_search_qry_str || $events_sess?.pres_mgmt.fulltext_search_qry_str.length <= 1 ) { $events_slct.session_obj_li = []; // $events_sess.pres_mgmt.fulltext_search_qry_str = ''; + // return false; } else { + handle_search__event_session($events_sess.pres_mgmt.fulltext_search_qry_str); + } +} + + +function handle_search__event_session(search_str: string) { + console.log('handle_search__event_session()'); // let type_code = $events_sess.pres_mgmt.search_badge_type_code; - let search_str = $events_sess.pres_mgmt.fulltext_search_qry_str.trim(); + // let search_str = $events_sess.pres_mgmt.fulltext_search_qry_str.trim(); + let search_method = 'lk'; // 'ft', 'lk', 'eq' let ft_search_str_new = ''; let lk_search_str_new = ''; @@ -199,7 +214,7 @@ $: if ($events_trigger == 'load__event_session_obj_li' && $events_slct.event_id) }); } - } // end if search string is valid + // } // end if search string is valid } @@ -353,8 +368,21 @@ $: if ($events_trigger == 'load__event_session_obj_li' && $events_slct.event_id) {#if $events_slct?.session_obj_li && $events_slct.session_obj_li.length > 0} -
-

Results:

+
+

+ + Results: + + + {#if $events_slct.session_obj_li.length} + + + {$events_slct.session_obj_li.length ?? 'None'} + + {/if} +

diff --git a/src/routes/events_pres_mgmt/session/[slug]/presenter_view.svelte b/src/routes/events_pres_mgmt/session/[slug]/presenter_view.svelte index 8552d78e..06e73657 100644 --- a/src/routes/events_pres_mgmt/session/[slug]/presenter_view.svelte +++ b/src/routes/events_pres_mgmt/session/[slug]/presenter_view.svelte @@ -15,6 +15,7 @@ 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 { core_func } from '$lib/ae_core_functions'; import { ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores'; import { db_events } from "$lib/db_events"; import { events_loc, events_sess, events_slct, events_trigger } from '$lib/ae_events_stores'; @@ -44,6 +45,9 @@ let lq__event_file_obj_li = liveQuery( async () => await db_events.files.where('event_presenter_id_random').equals($events_slct.event_presenter_id).toArray() ); + +$slct.person_obj_kv = {}; // This is intended for the POC lookup list when generated. + // $events_slct.event_presenter_obj = $lq__event_presenter_obj; // $events_sess.pres_mgmt.disable_submit__opt_out = false; @@ -435,10 +439,12 @@ async function handle_delete__event_file({event_file_id}) { {$events_slct.presenter_obj.email} {#if $events_slct.presenter_obj.person_primary_email != $events_slct.presenter_obj.email} +
+ {$events_slct.presenter_obj.person_primary_email} + + + { + console.log(`ae_crud_updated:`, e.detail); + + events_func.handle_load_ae_obj_id__event_presenter({api_cfg: $ae_api, event_presenter_id: $lq__event_presenter_obj?.event_presenter_id_random, log_lvl: 1}) + .then(function (load_results) { + // Maybe reload page? + // window.location.reload(); + }); + }} + > + + +
{/if} @@ -516,7 +566,8 @@ async function handle_delete__event_file({event_file_id}) { class_li={''} > - {$events_slct.presenter_obj.person_passcode ?? '-- passcode not set --'} (your passcode) + Passcode: + {$events_slct.presenter_obj.person_passcode ?? '-- passcode not set --'} + +
  • + + {#if $ae_loc.administrator_access} + { + console.log(`ae_crud_updated:`, e.detail); + + events_func.handle_load_ae_obj_id__event_presenter({api_cfg: $ae_api, event_presenter_id: $lq__event_presenter_obj?.event_presenter_id_random, log_lvl: 1}) + .then(function (load_results) { + // Maybe reload page? + // window.location.reload(); + }); + }} + > + + + Person link + {#if $events_slct.presenter_obj.person_id_random} + + {$events_slct.presenter_obj.person_id_random} + {:else} + + -- person not set -- + {/if} + + {#if ae_tmp?.show__edit_person} + + {#await $slct.person_obj_li} + + {:then person_obj_li} + + {/await} + + + + + + {:else} + + + + {/if} + + {/if} + + +