diff --git a/src/routes/events_pres_mgmt/ae_comp__event_presenter_obj_li.svelte b/src/routes/events_pres_mgmt/ae_comp__event_presenter_obj_li.svelte index 3318012f..14cf2fd1 100644 --- a/src/routes/events_pres_mgmt/ae_comp__event_presenter_obj_li.svelte +++ b/src/routes/events_pres_mgmt/ae_comp__event_presenter_obj_li.svelte @@ -21,9 +21,9 @@ export let link_to_id: string; export let lq__event_presenter_obj_li: any; export let log_lvl: number = 0; -if (log_lvl) { - console.log(`link_to_type: ${link_to_type}; link_to_id: ${link_to_id}`); -} +// if (log_lvl) { +// console.log(`link_to_type: ${link_to_type}; link_to_id: ${link_to_id}`); +// } // Variables // let ae_promises: key_val = {}; diff --git a/src/routes/events_pres_mgmt/ae_comp__event_presenter_obj_tbl.svelte b/src/routes/events_pres_mgmt/ae_comp__event_presenter_obj_tbl.svelte index eac71dfa..330671f6 100644 --- a/src/routes/events_pres_mgmt/ae_comp__event_presenter_obj_tbl.svelte +++ b/src/routes/events_pres_mgmt/ae_comp__event_presenter_obj_tbl.svelte @@ -23,9 +23,9 @@ export let log_lvl: number = 0; export let show_presentation_fields: boolean = false; export let show_session_fields: boolean = false; -if (log_lvl) { - console.log(`link_to_type: ${link_to_type}; link_to_id: ${link_to_id}`); -} +// if (log_lvl) { +// console.log(`link_to_type: ${link_to_type}; link_to_id: ${link_to_id}`); +// } // Variables // let ae_promises: key_val = {}; diff --git a/src/routes/events_pres_mgmt/ae_comp__event_presenter_obj_tbl_wrapper.svelte b/src/routes/events_pres_mgmt/ae_comp__event_presenter_obj_tbl_wrapper.svelte index d2856815..59ecfb8e 100644 --- a/src/routes/events_pres_mgmt/ae_comp__event_presenter_obj_tbl_wrapper.svelte +++ b/src/routes/events_pres_mgmt/ae_comp__event_presenter_obj_tbl_wrapper.svelte @@ -57,6 +57,8 @@ $: lq__event_presenter_obj_li = liveQuery(async () => { link_to_id={link_to_id} event_presenter_id_random_li={event_presenter_id_random_li} lq__event_presenter_obj_li={lq__event_presenter_obj_li} + show_presentation_fields={show_presentation_fields} + show_session_fields={show_session_fields} log_lvl={log_lvl} > diff --git a/src/routes/events_pres_mgmt/ae_comp__event_session_obj_li.svelte b/src/routes/events_pres_mgmt/ae_comp__event_session_obj_li.svelte index 0ef2aa24..81c88d25 100644 --- a/src/routes/events_pres_mgmt/ae_comp__event_session_obj_li.svelte +++ b/src/routes/events_pres_mgmt/ae_comp__event_session_obj_li.svelte @@ -2,34 +2,34 @@ export let log_lvl = 0; // Imports -// import { onMount } from 'svelte'; - import type { key_val } from '$lib/ae_stores'; import { ae_util } from '$lib/ae_utils'; -// import { api, send_email } from '$lib/api'; import Element_ae_crud from '$lib/element_ae_crud.svelte'; // import Element_data_store from '$lib/element_data_store_v2.svelte'; import Comp_event_presenter_obj_li from './ae_comp__event_presenter_obj_li_wrapper.svelte'; import Element_manage_event_file_li from '$lib/element_manage_event_file_li_direct.svelte'; -import { liveQuery } from "dexie"; +// import { liveQuery } from "dexie"; import { core_func } from '$lib/ae_core_functions'; -import { db_events } from "$lib/db_events"; +// import { db_events } from "$lib/db_events"; 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'; import { events_func } from '$lib/ae_events_functions'; // Exports -export let lq__event_obj: any; +// export let lq__event_obj: any; +export let lq__event_session_obj_li: any; // This is probably not needed??? 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 = ['']; // [''] +// export let link_to_type: string; // This is probably not needed??? +// export let link_to_id: string; // This is probably not needed??? +export let event_session_id_random_li: Array; // [''] export let hide__session_location: boolean = false; export let hide__session_poc: boolean = false; export let show__launcher_link: boolean = false; export let show__launcher_link_legacy: boolean = false; export let show__location_link: boolean = false; +export let show__session_files: boolean = false; +export let show__session_presentations: boolean = false; // export let allow_basic: boolean = false; // export let allow_moderator: boolean = false; @@ -38,74 +38,16 @@ export let show__location_link: boolean = false; // Variables // let ae_promises: key_val = {}; let ae_tmp: key_val = {}; -let ae_triggers: key_val = { - hide_event_launcher: {}, - hide: {}, -}; - -// let dq__where_type_val: string = link_to_type; // "event", "event_location", "event_track" -let dq__where_type_id_val: string = `${link_to_type}_id_random`; -let dq__where_eq_id_val: string = link_to_id; - +let ae_triggers: key_val = {}; // Functions and Logic -import { browser } from '$app/environment'; - -if (browser) { - console.log('Browser environment detected.'); -} - -// let lq__event_obj = liveQuery( -// () => db_events.events.get($events_slct.event_id) -// ); - -// let lq__event_session_obj_li = liveQuery( -// () => db_events.sessions -// .where(dq__where_type_id_val) -// .equals(dq__where_eq_id_val) -// .sortBy('name') -// ); - - -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); - }) -); - -
-{#if event_session_id_random_li && $events_slct.event_session_obj_li?.length == $lq_kv__event_session_obj_li?.length} +{#if event_session_id_random_li?.length > 0 && event_session_id_random_li?.length == $lq__event_session_obj_li?.length} @@ -113,15 +55,15 @@ let lq_kv__event_session_obj_li = liveQuery(

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

@@ -137,14 +79,11 @@ let lq_kv__event_session_obj_li = liveQuery( POC - Actions -{#each $lq_kv__event_session_obj_li as session_obj} +{#each $lq__event_session_obj_li as session_obj} @@ -153,7 +92,7 @@ let lq_kv__event_session_obj_li = liveQuery( href="/events_pres_mgmt/session/{session_obj?.event_session_id_random}" class=" btn btn-md - variant-ghost-primary hover:variant-filled-primary + variant-ghost-secondary hover:variant-filled-secondary min-w-full max-w-md sm:w-80 md:max-w-xs md:p-2 @@ -168,19 +107,16 @@ let lq_kv__event_session_obj_li = liveQuery( {session_obj?.name} {#if session_obj?.file_count_all} - + {session_obj?.file_count_all}× - {:else} {/if} - {#if $ae_loc.manager_access} + {#if show__session_presentations && $ae_loc.manager_access} - + {#if show__launcher_link_legacy} --> {/if} - {#if show__location_link} { console.log(`ae_crud_updated:`, e.detail); + events_func.load_ae_obj_id__event_session({ api_cfg: $ae_api, event_session_id: $events_slct?.event_session_id, @@ -398,7 +333,6 @@ let lq_kv__event_session_obj_li = liveQuery( $events_slct.event_obj = null; }} class="btn btn-sm variant-soft-warning hover:variant-ghost-warning" - title="Cancel edit the POC person for the session" > Cancel @@ -427,7 +361,6 @@ let lq_kv__event_session_obj_li = liveQuery( }} class="btn btn-sm variant-soft-warning hover:variant-ghost-warning" class:hidden={!$ae_loc.edit_mode} - title="Edit the POC person for the session" > Edit @@ -438,123 +371,6 @@ let lq_kv__event_session_obj_li = liveQuery( - - -
- { - console.log(`ae_crud_updated:`, e.detail); - - events_func.load_ae_obj_id__event_session({ - api_cfg: $ae_api, - event_session_id: session_obj?.event_session_id_random, - log_lvl: log_lvl - }); - }} - > - - - - - { - console.log(`ae_crud_updated:`, e.detail); - - events_func.load_ae_obj_id__event_session({ - api_cfg: $ae_api, - event_session_id: session_obj?.event_session_id_random, - log_lvl: log_lvl - }); - }} - > - - - -
- {/each} diff --git a/src/routes/events_pres_mgmt/ae_comp__event_session_obj_li_v2.svelte b/src/routes/events_pres_mgmt/ae_comp__event_session_obj_li_v2.svelte deleted file mode 100644 index 81c88d25..00000000 --- a/src/routes/events_pres_mgmt/ae_comp__event_session_obj_li_v2.svelte +++ /dev/null @@ -1,394 +0,0 @@ - - - -
- - -{#if event_session_id_random_li?.length > 0 && event_session_id_random_li?.length == $lq__event_session_obj_li?.length} - - - - -
-

- - Sessions: - - - {#if $lq__event_session_obj_li?.length} - - - {$lq__event_session_obj_li?.length ?? 'None'} - - {/if} -

- - - - - - - - - - - - -{#each $lq__event_session_obj_li as session_obj} - - - - - - - - -{/each} - -
SessionDateStart/EndLocationPOC
- - - - - {session_obj?.name} - - {#if session_obj?.file_count_all} - - - {session_obj?.file_count_all}× - - {:else} - - {/if} - - - {#if show__session_presentations && $ae_loc.manager_access} - - - {/if} - - - {#if show__session_files && $ae_loc.manager_access} - - {/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_12_short')} - - - – - - - {ae_util.iso_datetime_formatter(session_obj?.end_datetime,'time_12_short')} - - {:else} - {@html ae_snip.html__not_set} - {/if} - - - - - {#if show__launcher_link_legacy} - - - {@html session_obj?.event_location_name ? session_obj?.event_location_name : ae_snip.html__not_set} - - {:else} - - {session_obj?.event_location_name ?? '-- not set --'} - - {/if} - - - {#if show__launcher_link} - - - {@html session_obj?.event_location_name ? session_obj?.event_location_name : ae_snip.html__not_set} - - {:else} - - {/if} - {#if show__location_link} - - - - - {/if} - - - {#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_snip.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.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. - -

- - - - - - -{/if} - -
\ No newline at end of file diff --git a/src/routes/events_pres_mgmt/ae_comp__event_session_obj_tbl.svelte b/src/routes/events_pres_mgmt/ae_comp__event_session_obj_tbl.svelte index d5ab976d..ade478c5 100644 --- a/src/routes/events_pres_mgmt/ae_comp__event_session_obj_tbl.svelte +++ b/src/routes/events_pres_mgmt/ae_comp__event_session_obj_tbl.svelte @@ -1,46 +1,39 @@
-{#if event_session_id_random_li && event_session_id_random_li?.length > 0 && $events_slct.event_session_obj_li?.length == $lq_kv__event_session_obj_li?.length} +{#if event_session_id_random_li && event_session_id_random_li?.length > 0 && $events_slct.event_session_obj_li?.length == $lq__event_session_obj_li?.length}

@@ -48,12 +41,12 @@ let lq_kv__event_session_obj_li = liveQuery( Results: - {#if $lq_kv__event_session_obj_li?.length} + {#if $lq__event_session_obj_li?.length} - {$lq_kv__event_session_obj_li.length ?? 'None'} + {$lq__event_session_obj_li.length ?? 'None'} {/if}

@@ -74,7 +67,7 @@ let lq_kv__event_session_obj_li = liveQuery( - {#each $lq_kv__event_session_obj_li as event_session_obj, index} + {#each $lq__event_session_obj_li as event_session_obj, index} diff --git a/src/routes/events_pres_mgmt/ae_comp__event_session_obj_tbl_wrapper.svelte b/src/routes/events_pres_mgmt/ae_comp__event_session_obj_tbl_wrapper.svelte new file mode 100644 index 00000000..06c3918f --- /dev/null +++ b/src/routes/events_pres_mgmt/ae_comp__event_session_obj_tbl_wrapper.svelte @@ -0,0 +1,64 @@ + + + + + + diff --git a/src/routes/events_pres_mgmt/event/[slug]/+page.svelte b/src/routes/events_pres_mgmt/event/[slug]/+page.svelte index dece6be9..00c82aec 100644 --- a/src/routes/events_pres_mgmt/event/[slug]/+page.svelte +++ b/src/routes/events_pres_mgmt/event/[slug]/+page.svelte @@ -10,7 +10,7 @@ import { browser } from '$app/environment'; import type { key_val } from '$lib/ae_stores'; import { ae_util } from '$lib/ae_utils'; // import Element_data_store from '$lib/element_data_store_v2.svelte'; -import Comp_event_session_obj_li from '../../ae_comp__event_session_obj_li_v2.svelte'; +import Comp_event_session_obj_li from '../../ae_comp__event_session_obj_li.svelte'; import { liveQuery } from "dexie"; import { core_func } from '$lib/ae_core_functions'; diff --git a/src/routes/events_pres_mgmt/event/[slug]/reports/+page.svelte b/src/routes/events_pres_mgmt/event/[slug]/reports/+page.svelte index 3ff9c2ed..4ca0fc96 100644 --- a/src/routes/events_pres_mgmt/event/[slug]/reports/+page.svelte +++ b/src/routes/events_pres_mgmt/event/[slug]/reports/+page.svelte @@ -10,7 +10,7 @@ import type { key_val } from '$lib/ae_stores'; import { ae_util } from '$lib/ae_utils'; // import Element_data_store from '$lib/element_data_store_v2.svelte'; import Comp_event_file_obj_tbl from '../../../ae_comp__event_file_obj_tbl.svelte'; -import Comp_event_session_obj_tbl from '../../../ae_comp__event_session_obj_tbl.svelte'; +import Comp_event_session_obj_tbl from '../../../ae_comp__event_session_obj_tbl_wrapper.svelte'; import Comp_event_presenter_obj_tbl from '../../../ae_comp__event_presenter_obj_tbl_wrapper.svelte'; import { liveQuery } from "dexie"; @@ -626,7 +626,10 @@ async function handle_qry__event_session(

Sessions without Files

{/if} diff --git a/src/routes/events_pres_mgmt/location/[slug]/+page.svelte b/src/routes/events_pres_mgmt/location/[slug]/+page.svelte index c0647d3a..fbe17912 100644 --- a/src/routes/events_pres_mgmt/location/[slug]/+page.svelte +++ b/src/routes/events_pres_mgmt/location/[slug]/+page.svelte @@ -25,7 +25,7 @@ import { events_loc, events_sess, events_slct, events_trigger, events_trig_kv } import { events_func } from '$lib/ae_events_functions'; import Comp_event_files_upload from './../../ae_comp__event_files_upload.svelte'; -import Comp_event_session_obj_li from './../../ae_comp__event_session_obj_li_v2.svelte'; +import Comp_event_session_obj_li from '../../ae_comp__event_session_obj_li.svelte'; import Element_manage_event_file_li_wrap from '$lib/element_manage_event_file_li_direct.svelte'; import Location_view from './../../location_view.svelte'; import Location_page_menu from './../../location_page_menu.svelte';