From 8044cd07238faeb510c19ac2af24eeb07ded39d1 Mon Sep 17 00:00:00 2001 From: Scott Idem Date: Tue, 18 Jun 2024 15:52:14 -0400 Subject: [PATCH] POC sign is mostly working now --- src/lib/ae_events_functions.ts | 44 +++++ src/lib/ae_events_stores.ts | 2 +- src/lib/db_events.ts | 11 ++ .../event/[slug]/+page.svelte | 22 ++- .../session/[slug]/+page.svelte | 161 +++++++++++++----- .../session/[slug]/form_agree.svelte | 2 +- .../session/[slug]/presenter_view.svelte | 67 +++++++- 7 files changed, 254 insertions(+), 55 deletions(-) diff --git a/src/lib/ae_events_functions.ts b/src/lib/ae_events_functions.ts index 4d67bb7d..9db58205 100644 --- a/src/lib/ae_events_functions.ts +++ b/src/lib/ae_events_functions.ts @@ -208,6 +208,41 @@ async function handle_load_ae_obj_li__event_file( } +// Updated 2024-06-17 +async function handle_delete_ae_obj_id__event_file( + { + api_cfg, + event_file_id, + params={}, + log_lvl=0 + } : { + api_cfg: any, + event_file_id: string, + params?: key_val, + log_lvl?: number + } + ) { + console.log(`*** handle_delete_ae_obj_id__event_file() *** event_file_id=${event_file_id}`); + + const endpoint = `/event/file/${event_file_id}/v2`; + + params['delete_hosted_file'] = true; // This does not actually delete the hosted file from the server. + params['rm_orphan'] = true; // This is what actually allows the hosted file to be deleted from the server. + + ae_promises.delete__event_file_obj = await api.delete_object({ + api_cfg: api_cfg, + endpoint: endpoint, + params: params, + // return_meta: return_meta, + log_lvl: log_lvl + }); + + db_events.files.delete(event_file_id); + + return ae_promises.delete__event_file_obj; +} + + // Updated 2024-06-10 async function handle_load_ae_obj_id__event_session( { @@ -1527,6 +1562,14 @@ function handle_db_save_ae_obj_li__event_session({obj_type, obj_li}) { event_id_random: obj.event_id_random, event_location_id_random: obj.event_location_id_random, + poc_person_id_random: obj.poc_person_id_random, + poc_person_given_name: obj.poc_person_given_name, + poc_person_family_name: obj.poc_person_family_name, + poc_person_full_name: obj.poc_person_full_name, + poc_person_primary_email: obj.poc_person_primary_email, + + poc_kv_json: obj.poc_kv_json, + name: obj.name, description: obj.description, @@ -1806,6 +1849,7 @@ let export_obj = { handle_load_ae_obj_id__event_file: handle_load_ae_obj_id__event_file, handle_load_ae_obj_li__event_file: handle_load_ae_obj_li__event_file, + handle_delete_ae_obj_id__event_file: handle_delete_ae_obj_id__event_file, handle_load_ae_obj_id__event_session: handle_load_ae_obj_id__event_session, handle_load_ae_obj_li__event_session: handle_load_ae_obj_li__event_session, diff --git a/src/lib/ae_events_stores.ts b/src/lib/ae_events_stores.ts index c3529d90..78950d36 100644 --- a/src/lib/ae_events_stores.ts +++ b/src/lib/ae_events_stores.ts @@ -266,7 +266,7 @@ let events_session_data_struct: key_val = { fulltext_search_qry_str: null, status_qry__search: null, - disable_submit__event_file_obj: false, + disable_submit__event_file_obj: true, show_form__search: true, show_form__search_results: true, diff --git a/src/lib/db_events.ts b/src/lib/db_events.ts index ff8b39c6..75d463c8 100644 --- a/src/lib/db_events.ts +++ b/src/lib/db_events.ts @@ -1,5 +1,8 @@ import Dexie, { type Table } from 'dexie'; +// li = list +// kv = key value list + export interface Event { id_random: string; code: string; @@ -229,6 +232,13 @@ export interface Session { event_id_random: string; event_location_id_random: string; + poc_person_id_random: string; + poc_person_given_name: string; + poc_person_family_name: string; + poc_person_full_name: string; + poc_person_primary_email: string; + poc_kv_json: null|string; + name: string; description: null|string; @@ -402,6 +412,7 @@ export class MySubClassedDexie extends Dexie { id_random, event_session_id_random, external_id, code, for_type, for_id_random, type_code, event_id_random, event_location_id_random, + poc_person_id_random, poc_person_given_name, poc_person_family_name, poc_person_full_name, poc_person_primary_email, poc_kv_json, name, description, start_datetime, end_datetime, passcode, hide_event_launcher, diff --git a/src/routes/events_pres_mgmt/event/[slug]/+page.svelte b/src/routes/events_pres_mgmt/event/[slug]/+page.svelte index 506e0be2..8e15f382 100644 --- a/src/routes/events_pres_mgmt/event/[slug]/+page.svelte +++ b/src/routes/events_pres_mgmt/event/[slug]/+page.svelte @@ -201,8 +201,8 @@ $: if ($events_trigger == 'load__event_session_obj_li' && $events_slct.event_id) {#if $events_slct.event_id && $event_obj} -

{$event_obj.name}

-

Presentation Management Hub

+

{$event_obj.name}

+

Presentation Management Hub

{/if}
@@ -220,7 +220,7 @@ $: if ($events_trigger == 'load__event_session_obj_li' && $events_slct.event_id) placeholder="Search for a session" id="session_fulltext_search_qry_str" bind:value={$events_sess.pres_mgmt.fulltext_search_qry_str} - class="input text-1xl hover:text-2xl font-bold font-mono w-96 transition-all" + class="input text-1xl hover:text-2xl font-bold font-mono w-80 transition-all" on:keyup={() => { if ($events_sess.pres_mgmt.fulltext_search_qry_str.length >= 3) { $events_trigger = 'load__event_session_obj_li'; @@ -233,7 +233,7 @@ $: if ($events_trigger == 'load__event_session_obj_li' && $events_slct.event_id) + + {/if} + + {#if $ae_loc.trusted_access} + + + + {/if} + + + + {#if $ae_loc.trusted_access}
  • Session passcode: {$lq__event_session_obj.passcode ? $lq__event_session_obj.passcode : '-- not set --'} @@ -386,11 +476,15 @@ function send_init_confirm_email({to_email, to_name, person_id, person_passcode, -->
    -{#if $ae_loc.trusted_access || $events_loc.auth__kv.session[$events_slct.event_session_id]} +{#if $ae_loc.trusted_access || $events_loc.auth__person.id } + {#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'}

    + {/if} - {#if $ae_loc.trusted_access || ($events_loc.auth__kv.presenter[$events_slct.event_presenter_id] && $lq__event_presenter_obj?.agree)} + {#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)} { - $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: {}, - }; + sign_out(); alert('You have been signed out.'); }} > @@ -456,6 +538,7 @@ function send_init_confirm_email({to_email, to_name, person_id, person_passcode,

    + {#if ($events_sess.auth__person.presenter_id) || ($events_sess.auth__person.session_id)}
    @@ -484,7 +567,11 @@ function send_init_confirm_email({to_email, to_name, person_id, person_passcode, on:click={() => { console.log('Sign in with URL values'); - presenter_sign_in(); + if ($events_sess.auth__person.presenter_id) { + presenter_sign_in(); + } else if ($events_sess.auth__person.session_id) { + session_sign_in(); + } // This needs to be moved to a function! @@ -511,7 +598,10 @@ function send_init_confirm_email({to_email, to_name, person_id, person_passcode,
    - For: presentation: {$events_sess.auth__person.presentation_id} presenter: {$events_sess.auth__person.presenter_id} + For: + session: {$events_sess.auth__person.session_id} + presentation: {$events_sess.auth__person.presentation_id} + presenter: {$events_sess.auth__person.presenter_id}
    {$lq__event_presentation_obj?.name ? `Name: "${$lq__event_presentation_obj.name}"` : '-- not set --'} @@ -523,19 +613,7 @@ function send_init_confirm_email({to_email, to_name, person_id, person_passcode, type="button" class="btn btn-sm variant-soft-warning" on:click={() => { - $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: {}, - }; + sign_out(); alert('You have been signed out.'); }} > @@ -544,6 +622,7 @@ function send_init_confirm_email({to_email, to_name, person_id, person_passcode, {/if}
    + {/if} {/if}
    @@ -633,7 +712,7 @@ function send_init_confirm_email({to_email, to_name, person_id, person_passcode,
  • + +
    • {/each}