From 889500e80d02ddfd994f9ed1faf8aeb2c112cbe4 Mon Sep 17 00:00:00 2001 From: Scott Idem Date: Tue, 2 Jul 2024 18:17:38 -0400 Subject: [PATCH] Finally got the horizontal scroll working correctly with the table. --- src/lib/ae_events__event.ts | 6 +- src/routes/events_pres_mgmt/+layout.svelte | 2 + .../event/[slug]/+page.svelte | 457 ++++-------------- .../ae_comp__event_session_obj_li.svelte | 96 ++-- 4 files changed, 166 insertions(+), 395 deletions(-) diff --git a/src/lib/ae_events__event.ts b/src/lib/ae_events__event.ts index 07e55355..9501eb4b 100644 --- a/src/lib/ae_events__event.ts +++ b/src/lib/ae_events__event.ts @@ -3,10 +3,10 @@ import { api } from '$lib/api'; import { db_events } from "$lib/db_events"; -let ae_promises: key_val = {}; // Promise; +let ae_promises: key_val = {}; -// Updated 2024-06-24 +// Updated 2024-07-02 export async function handle_load_ae_obj_id__event( { api_cfg, @@ -36,6 +36,7 @@ export async function handle_load_ae_obj_id__event( }) .then(function (event_obj_get_result) { if (event_obj_get_result) { + handle_db_save_ae_obj_li__event({obj_type: 'event', obj_li: [event_obj_get_result]}); return event_obj_get_result; } else { console.log('No results returned.'); @@ -113,7 +114,6 @@ export async function handle_load_ae_obj_li__event( } - // This function will loop through the event_obj_li and save each one to the DB. export function handle_db_save_ae_obj_li__event( { diff --git a/src/routes/events_pres_mgmt/+layout.svelte b/src/routes/events_pres_mgmt/+layout.svelte index 9c461acb..1a7a886f 100644 --- a/src/routes/events_pres_mgmt/+layout.svelte +++ b/src/routes/events_pres_mgmt/+layout.svelte @@ -168,4 +168,6 @@ $: if ($events_trigger == 'load__event_session_obj_id' && $events_trig_kv['event {/if} + + diff --git a/src/routes/events_pres_mgmt/event/[slug]/+page.svelte b/src/routes/events_pres_mgmt/event/[slug]/+page.svelte index d5c8ca24..fd867fac 100644 --- a/src/routes/events_pres_mgmt/event/[slug]/+page.svelte +++ b/src/routes/events_pres_mgmt/event/[slug]/+page.svelte @@ -13,9 +13,7 @@ import { ae_util } from '$lib/ae_utils'; 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 Comp_event_presenter_obj_li from '../../ae_comp__event_presenter_obj_li.svelte'; import Comp_event_session_obj_li from './ae_comp__event_session_obj_li.svelte'; -// import Element_manage_event_file_li from '$lib/element_manage_event_file_li.svelte'; import { liveQuery } from "dexie"; import { core_func } from '$lib/ae_core_functions'; @@ -41,7 +39,7 @@ $events_slct.event_session_obj_li = ae_acct.slct.event_session_obj_li; // let param_slug_event_id = data.params.slug; -let event_obj = liveQuery( +let lq__event_obj = liveQuery( () => db_events.events.get($events_slct.event_id) ); @@ -69,36 +67,36 @@ let event_session_id_random_li: string[] = ['VSBH-19-41-50']; // .sortBy('start_datetime') // ); -let lq_kv__event_session_obj_li = liveQuery( - () => db_events.sessions - .bulkGet(event_session_id_random_li) - .then(results => { - // console.log(`LQ Results:`, results); - // If the results are an array - if (results.length == 1) { - // If the first item is undefined we need to do something. - if (results[0] == undefined) { - console.log('Something went wrong! No sessions found?'); - // return []; - // return [{ id: '' }]; - // return 'NOTHING???'; - } - return results; - }else if (results.length > 1) { - return results; - } else { - return ['No sessions found.']; - } - // return results; - }) - .catch(error => { - console.error(`LQ Error: ${error}`); - return ['No sessions found.']; - }) - .finally(() => { - console.log(`LQ Finally:`, $lq_kv__event_session_obj_li); - }) -); +// let lq_kv__event_session_obj_li = liveQuery( +// () => db_events.sessions +// .bulkGet(event_session_id_random_li) +// .then(results => { +// // console.log(`LQ Results:`, results); +// // If the results are an array +// if (results.length == 1) { +// // If the first item is undefined we need to do something. +// if (results[0] == undefined) { +// console.log('Something went wrong! No sessions found?'); +// // return []; +// // return [{ id: '' }]; +// // return 'NOTHING???'; +// } +// return results; +// }else if (results.length > 1) { +// return results; +// } else { +// return ['No sessions found.']; +// } +// // return results; +// }) +// .catch(error => { +// console.error(`LQ Error: ${error}`); +// return ['No sessions found.']; +// }) +// .finally(() => { +// console.log(`LQ Finally:`, $lq_kv__event_session_obj_li); +// }) +// ); let load_obj_li_results: Promise|key_val; @@ -315,7 +313,7 @@ async function handle_search__event_session( if (log_lvl > 1) { console.log(`TEST SEARCH - event_session_id_random_li:`, event_session_id_random_li); - console.log(`TEST SEARCH - search live query: ${$lq_kv__event_session_obj_li}`); + // console.log(`TEST SEARCH - search live query: ${$lq_kv__event_session_obj_li}`); } }); @@ -384,53 +382,39 @@ async function handle_search__event_session(
+ +{#if $lq__event_obj} +
+

{$lq__event_obj?.name}

+

Presentation Management Hub

+
+{/if} +
-
- -
- - - -
+
-
-
+
+ -{#if $events_slct.event_id && $event_obj} -

{$event_obj.name}

-

Presentation Management Hub

-{/if} +
+ +
+
@@ -509,9 +519,6 @@ async function handle_search__event_session(
- - - {#await load_obj_li_results} @@ -529,291 +536,33 @@ async function handle_search__event_session( {/await} {#if $events_slct.event_session_obj_li?.length == event_session_id_random_li?.length} + +
-{/if} - -{#if 1==3 && $events_slct.event_session_obj_li?.length == event_session_id_random_li?.length && event_session_id_random_li.length == $lq_kv__event_session_obj_li?.length} - -
-

- - Results: - - - {#if $events_slct.event_session_obj_li.length} - - - {$events_slct.event_session_obj_li.length ?? 'None'} - - {/if} -

- - - - - - - - - - - - -{#each $lq_kv__event_session_obj_li as session_obj} - - - - - - -{/each} - -
SessionDateStart/EndLocationPOC
- - - - - {session_obj.name} - - {#if session_obj.file_count_all} - - - {session_obj.file_count_all}x - - {:else} - - {/if} - - - - - - - {ae_util.iso_datetime_formatter(session_obj.start_datetime,'dddd')} - {ae_util.iso_datetime_formatter(session_obj.start_datetime,'date_long_month_day')} - - - {#if session_obj.start_datetime} - - {ae_util.iso_datetime_formatter(session_obj.start_datetime,'time_short')} - - – - - {ae_util.iso_datetime_formatter(session_obj.end_datetime,'time_short')} - - {:else} - {@html ae_html.not_set} - {/if} - {session_obj.event_location_name ?? '-- not set --'} - {#if session_obj.poc_person_full_name} - - - {session_obj.poc_person_full_name} - - - {#if $ae_loc.trusted_access} - - - - {session_obj.poc_person_primary_email} - - - {/if} - {:else} - {@html ae_html.not_set} - {/if} - - {#if $ae_loc.trusted_access} - - {#if session_obj.event_session_id_random == $events_slct.event_session_id && ae_tmp[$events_slct.event_session_id] && ae_tmp[$events_slct.event_session_id].show__edit_poc_person} - { - console.log(`ae_crud_updated:`, e.detail); - - events_func.handle_load_ae_obj_id__event_session({api_cfg: $ae_api, event_session_id: $events_slct?.event_session_id, log_lvl: 1}) - .then(function (load_results) { - ae_tmp[$events_slct.event_session_id].poc_person_id = null; - ae_tmp[$events_slct.event_session_id].show__edit_poc_person = false; - - $events_slct.event_session_id = null; - $events_slct.event_obj = null; - - // Careful with the trigger_patch. It will keep firing if not reset. - ae_triggers.update_person_poc = false; - - // Maybe reload page? - // window.location.reload(); - }); - }} - > - {#await $slct.person_obj_li} - - {:then person_obj_li} - {#if person_obj_li && person_obj_li.length > 0} - - - - {/if} - {/await} - - {/if} - - {#if ae_tmp[$events_slct.event_session_id] && ae_tmp[$events_slct.event_session_id].show__edit_poc_person} - - {:else} - - {/if} - - {/if} -
-
+
{:else} -

+

+

+ No results to show. Please use the search above to find your session.

-
- Query results length: {$events_slct.event_session_obj_li?.length}; - ID list length: {event_session_id_random_li?.length}; - LQ results length: {$lq_kv__event_session_obj_li?.length} -
-{/if} - - - -{#if $events_slct.event_session_obj_li?.length == event_session_id_random_li?.length && event_session_id_random_li.length == $lq_kv__event_session_obj_li?.length} -
+ Search by: +
    - - - -
    - {#each $lq_kv__event_session_obj_li as event_session_obj} - - {event_session_obj?.event_session_id_random} - - {/each} -
    +
  • Session name
    • +
  • Session description
    • +
  • Presentation name
    • +
  • Presenter names
    • +
  • Presenter ID (LCI member ID)
    • +
-{:else} - +
{/if}
diff --git a/src/routes/events_pres_mgmt/event/[slug]/ae_comp__event_session_obj_li.svelte b/src/routes/events_pres_mgmt/event/[slug]/ae_comp__event_session_obj_li.svelte index 221c8bc6..e55deeb2 100644 --- a/src/routes/events_pres_mgmt/event/[slug]/ae_comp__event_session_obj_li.svelte +++ b/src/routes/events_pres_mgmt/event/[slug]/ae_comp__event_session_obj_li.svelte @@ -21,7 +21,7 @@ import { events_func } from '$lib/ae_events_functions'; export let container_class_li: string|Array = []; export let link_to_type: string; export let link_to_id: string; -export let event_session_id_random_li: Array = ['VSBH-19-41-50']; +export let event_session_id_random_li: Array = ['']; // 'VSBH-19-41-50' // export let allow_basic: boolean = false; // export let allow_moderator: boolean = false; @@ -89,14 +89,14 @@ let lq_kv__event_session_obj_li = liveQuery( -
+
{#if event_session_id_random_li && $events_slct.event_session_obj_li?.length == $lq_kv__event_session_obj_li?.length} -
+

Results: @@ -111,7 +111,7 @@ let lq_kv__event_session_obj_li = liveQuery( {/if}

- +
@@ -127,19 +127,27 @@ let lq_kv__event_session_obj_li = liveQuery( {/each}
Session
- {session_obj.name} + {session_obj?.name} - {#if session_obj.file_count_all} - + {#if session_obj?.file_count_all} + - {session_obj.file_count_all}x + {session_obj?.file_count_all}x {:else} @@ -149,7 +157,7 @@ let lq_kv__event_session_obj_li = liveQuery( {#if $ae_loc.trusted_access} - - + + - {session_obj.poc_person_primary_email} + {session_obj?.poc_person_primary_email} {/if} @@ -208,7 +226,7 @@ let lq_kv__event_session_obj_li = liveQuery( {#if $ae_loc.trusted_access} - {#if session_obj.event_session_id_random == $events_slct.event_session_id && ae_tmp[$events_slct.event_session_id] && ae_tmp[$events_slct.event_session_id].show__edit_poc_person} + {#if session_obj?.event_session_id_random == $events_slct.event_session_id && ae_tmp[$events_slct.event_session_id] && ae_tmp[$events_slct.event_session_id].show__edit_poc_person} + +