diff --git a/src/lib/db_core.ts b/src/lib/db_core.ts index a8b233a0..2052d8b4 100644 --- a/src/lib/db_core.ts +++ b/src/lib/db_core.ts @@ -12,7 +12,7 @@ export interface Person { external_id?: string; // This may be semi-random or unique only withing the account. external_sys_id?: string; // Generated by an external system. Ideally this should be something like a UUID. It may be the same as the external_id if nothing given. - code?: string; + code?: string; // Not currently used. account_id?: string; // Technically this is not required for global users. account_id_random?: string; // Technically this is not required for global users. diff --git a/src/routes/events/[event_id]/presenter/[presenter_id]/presenter_view.svelte b/src/routes/events/[event_id]/presenter/[presenter_id]/presenter_view.svelte index 5d2aa3cd..b4abdb00 100644 --- a/src/routes/events/[event_id]/presenter/[presenter_id]/presenter_view.svelte +++ b/src/routes/events/[event_id]/presenter/[presenter_id]/presenter_view.svelte @@ -48,23 +48,23 @@ let lq__event_obj = liveQuery( // async () => await db_events.presentations.get(event_presentation_id) // ); -console.log(`event_presenter_id:`, $lq__event_presenter_obj?.event_presenter_id_random); +console.log(`event_presenter_id:`, $lq__event_presenter_obj?.event_presenter_id); // let lq__event_presenter_obj = liveQuery( // async () => await db_events.presenters.get(event_presenter_id) // ); -// let event_presentation_id: null|string = $lq__event_presenter_obj?.event_presentation_id_random ?? ''; -// event_presentation_id = $lq__event_presenter_obj?.event_presentation_id_random ?? event_presentation_id; +// let event_presentation_id: null|string = $lq__event_presenter_obj?.event_presentation_id ?? ''; +// event_presentation_id = $lq__event_presenter_obj?.event_presentation_id ?? event_presentation_id; console.log(`event_presentation_id:`, $lq__event_presentation_obj?.event_presentation_id_random); // $events_slct.event_presentation_id = event_presentation_id; -// event_presentation_id = $lq__event_presenter_obj?.event_presentation_id_random; +// event_presentation_id = $lq__event_presenter_obj?.event_presentation_id; // let lq__event_presentation_obj = liveQuery( // () => db_events.presentations.get(event_presentation_id) // ); // export let event_presentation_obj: any = $lq__event_presentation_obj; let lq__event_file_obj_li = liveQuery( - async () => await db_events.files.where('event_presenter_id_random').equals($lq__event_presenter_obj?.event_presenter_id_random).toArray() + async () => await db_events.files.where('event_presenter_id').equals($lq__event_presenter_obj?.event_presenter_id).toArray() ); // ae_tmp.biography = ''; @@ -88,7 +88,7 @@ $slct.person_obj_kv = {}; // This is intended for the person presenter lookup li onMount(() => { console.log('Events Pres Mgmt: presenter_view.svelte'); - console.log(`event_presenter_id:`, $lq__event_presenter_obj?.event_presenter_id_random); + console.log(`event_presenter_id:`, $lq__event_presenter_obj?.event_presenter_id); $slct_trigger = 'load__event_file_obj_li'; // ae_tmp.biography = $lq__event_presenter_obj?.biography; @@ -123,7 +123,7 @@ async function handle_input_upload_files(input_upload_files) { console.log('*** handle_input_upload_files() ***'); let link_to_type = 'event_presenter'; - let link_to_id = $lq__event_presenter_obj?.event_presenter_id_random; + let link_to_id = $lq__event_presenter_obj?.event_presenter_id; const form_data = new FormData(); @@ -224,7 +224,7 @@ async function handle_delete__event_file({event_file_id}) { console.log(`*** handle_delete__event_file() *** event_file_id:`, event_file_id); let link_to_type = 'event_presenter'; - let link_to_id = $lq__event_presenter_obj?.event_presenter_id_random; + let link_to_id = $lq__event_presenter_obj?.event_presenter_id; ae_promises.delete__event_file_obj = await events_func.delete_ae_obj_id__event_file({ api_cfg: $ae_api, @@ -277,13 +277,13 @@ $: if ($lq__event_presenter_obj) { console.log('Updated on is different.'); } // FUTURE USE: 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_presenter_obj?.event_presenter_id_random, obj_type: 'event_presenter', obj_id: $lq__event_presenter_obj?.event_presenter_id_random}); + // 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_presenter_obj?.event_presenter_id, obj_type: 'event_presenter', obj_id: $lq__event_presenter_obj?.event_presenter_id}); // Generate a QR code for the URL. - let qr_id_url = `${$lq__event_presenter_obj?.event_presenter_id_random}_url`; + let qr_id_url = `${$lq__event_presenter_obj?.event_presenter_id}_url`; // URL for this page (be sure to URL encode it): - let url_str = `${$ae_loc.url_origin}/events_pres_mgmt/presenter/${$lq__event_presenter_obj?.event_presenter_id_random}`; + let url_str = `${$ae_loc.url_origin}/events_pres_mgmt/presenter/${$lq__event_presenter_obj?.event_presenter_id}`; url_str = encodeURI(url_str); @@ -313,7 +313,7 @@ $: if ($lq__event_presenter_obj) { {$lq__event_presenter_obj.full_name} - {#if (!$ae_loc.trusted_access && !$events_loc.auth__kv.presenter[$lq__event_presenter_obj?.event_presenter_id_random] && !$events_loc.auth__kv.session[$lq__event_presenter_obj.event_session_id_random])} + {#if (!$ae_loc.trusted_access && !$events_loc.auth__kv.presenter[$lq__event_presenter_obj?.event_presenter_id] && !$events_loc.auth__kv.session[$lq__event_presenter_obj.event_session_id])} @@ -338,7 +338,7 @@ $: if ($lq__event_presenter_obj) {