From a2b7dd9450a5e106ca872f5cb602789e2e4b20ac Mon Sep 17 00:00:00 2001 From: Scott Idem Date: Thu, 17 Oct 2024 10:36:03 -0400 Subject: [PATCH] Moved some files around. Improved style. No longer using other pres_mgmt nav component. Added links to the locations. --- src/routes/events/[event_id]/+page.svelte | 4 +- .../location/[event_location_id]/+page.svelte | 3 +- .../location/location_page_menu.svelte | 17 ++-- .../ae_comp__event_location_obj_li.svelte | 47 +++++++++- .../presenter/[presenter_id]/+page.svelte | 6 +- .../reports/event_reports_page_menu.svelte | 4 +- .../events/ae_comp__events_menu_nav.svelte | 8 +- .../ae_comp__event_presentation_obj_li.svelte | 14 ++- .../ae_comp__pres_mgmt_menu_nav.svelte | 6 +- .../events_pres_mgmt/event_page_menu.svelte | 8 +- .../session/[slug]/+page.svelte | 94 +------------------ .../events_pres_mgmt/session_page_menu.svelte | 8 +- .../events_pres_mgmt/session_view.svelte | 4 +- 13 files changed, 95 insertions(+), 128 deletions(-) diff --git a/src/routes/events/[event_id]/+page.svelte b/src/routes/events/[event_id]/+page.svelte index f40571bc..d47e7fba 100644 --- a/src/routes/events/[event_id]/+page.svelte +++ b/src/routes/events/[event_id]/+page.svelte @@ -386,8 +386,8 @@ max-w-max --> title="View event search or manage files for the event" > {#if $events_loc.pres_mgmt.show_content__event_view == 'manage_files'} - - + + Event Search? {:else} diff --git a/src/routes/events/[event_id]/location/[event_location_id]/+page.svelte b/src/routes/events/[event_id]/location/[event_location_id]/+page.svelte index bfd4f869..34fe7630 100644 --- a/src/routes/events/[event_id]/location/[event_location_id]/+page.svelte +++ b/src/routes/events/[event_id]/location/[event_location_id]/+page.svelte @@ -67,7 +67,7 @@ if (!$events_sess.pres_mgmt) { $: lq__event_obj = liveQuery(async () => { let results = await db_events.events - .get($events_slct.event_id); + .get(ae_acct.slct.event_id); return results; }); @@ -152,6 +152,7 @@ onMount(() => { > diff --git a/src/routes/events/[event_id]/location/location_page_menu.svelte b/src/routes/events/[event_id]/location/location_page_menu.svelte index 8d817078..9e8a7e25 100644 --- a/src/routes/events/[event_id]/location/location_page_menu.svelte +++ b/src/routes/events/[event_id]/location/location_page_menu.svelte @@ -9,8 +9,10 @@ import { events_func } from '$lib/ae_events_functions'; import Element_ae_crud from '$lib/element_ae_crud.svelte'; import Element_data_store from '$lib/element_data_store_v2.svelte'; +import Comp__events_menu_nav from './../../ae_comp__events_menu_nav.svelte'; // export let event_location_id: string; +export let lq__event_obj: any; export let lq__event_location_obj: any; // export let lq__auth__event_presenter_obj: any; @@ -30,14 +32,13 @@ let ae_triggers: key_val = {};
- - - - Back to Session Search - - + +
+
- {#if $ae_loc.trusted_access && $ae_loc.edit_mode} + {#if $ae_loc.administrator_access && $ae_loc.edit_mode}
-
- -

Locations: + + + + + + + + + + + + + + + + + +

- {#if + + - {/if} + {/if} --> {/if} {:else} diff --git a/src/routes/events/[event_id]/reports/event_reports_page_menu.svelte b/src/routes/events/[event_id]/reports/event_reports_page_menu.svelte index 67721e33..7b5afa69 100644 --- a/src/routes/events/[event_id]/reports/event_reports_page_menu.svelte +++ b/src/routes/events/[event_id]/reports/event_reports_page_menu.svelte @@ -8,7 +8,7 @@ import { events_loc, events_sess, events_slct, events_trigger, events_trig_kv } // import Element_ae_crud from '$lib/element_ae_crud.svelte'; import Element_data_store from '$lib/element_data_store_v2.svelte'; -import Comp__pres_mgmt_menu_nav from './../../ae_comp__events_menu_nav.svelte'; +import Comp__events_menu_nav from './../../ae_comp__events_menu_nav.svelte'; export let lq__event_obj: any; @@ -28,7 +28,7 @@ let ae_triggers: key_val = {};
-
- + + Back to Session Search @@ -72,7 +73,8 @@ export let events__session_search: boolean = false; // event_id class="{ae_snip.classes__events_pres_mgmt_menu__button}" class:hidden={!events__session_id} > - + + Back to Session diff --git a/src/routes/events_pres_mgmt/ae_comp__event_presentation_obj_li.svelte b/src/routes/events_pres_mgmt/ae_comp__event_presentation_obj_li.svelte index 548a7302..ce038123 100644 --- a/src/routes/events_pres_mgmt/ae_comp__event_presentation_obj_li.svelte +++ b/src/routes/events_pres_mgmt/ae_comp__event_presentation_obj_li.svelte @@ -31,6 +31,18 @@ export let log_lvl: number = 0; +
+
@@ -68,7 +80,7 @@ export let log_lvl: number = 0;
-
+

diff --git a/src/routes/events_pres_mgmt/ae_comp__pres_mgmt_menu_nav.svelte b/src/routes/events_pres_mgmt/ae_comp__pres_mgmt_menu_nav.svelte index e8f3a8f3..b5e9084b 100644 --- a/src/routes/events_pres_mgmt/ae_comp__pres_mgmt_menu_nav.svelte +++ b/src/routes/events_pres_mgmt/ae_comp__pres_mgmt_menu_nav.svelte @@ -67,7 +67,8 @@ export let pres_mgmt__session_search: boolean = false; // event_id class="{ae_snip.classes__events_pres_mgmt_menu__button}" class:hidden={!pres_mgmt__session_search} > - + + Back to Session Search @@ -76,7 +77,8 @@ export let pres_mgmt__session_search: boolean = false; // event_id class="{ae_snip.classes__events_pres_mgmt_menu__button}" class:hidden={!pres_mgmt__session_id} > - + + Back to Session diff --git a/src/routes/events_pres_mgmt/event_page_menu.svelte b/src/routes/events_pres_mgmt/event_page_menu.svelte index a356c21c..1f2bbb0a 100644 --- a/src/routes/events_pres_mgmt/event_page_menu.svelte +++ b/src/routes/events_pres_mgmt/event_page_menu.svelte @@ -8,7 +8,7 @@ import { events_loc, events_sess, events_slct, events_trigger, events_trig_kv } // import Element_ae_crud from '$lib/element_ae_crud.svelte'; import Element_data_store from '$lib/element_data_store_v2.svelte'; -import Comp__pres_mgmt_menu_nav from './ae_comp__pres_mgmt_menu_nav.svelte'; +import Comp__events_menu_nav from './../events/ae_comp__events_menu_nav.svelte'; export let lq__event_obj: any; @@ -28,12 +28,12 @@ let ae_triggers: key_val = {};
- {
{ - -{#if $events_sess.pres_mgmt?.show_form__sign_in} -
-
- -
- - - - - - -
- - - - - - -
- - - - - -
- -
-
-{/if} - - - diff --git a/src/routes/events_pres_mgmt/session_page_menu.svelte b/src/routes/events_pres_mgmt/session_page_menu.svelte index 3ef9ddf1..d1e08d96 100644 --- a/src/routes/events_pres_mgmt/session_page_menu.svelte +++ b/src/routes/events_pres_mgmt/session_page_menu.svelte @@ -10,7 +10,7 @@ import { events_func } from '$lib/ae_events_functions'; import Element_ae_crud from '$lib/element_ae_crud.svelte'; import Element_data_store from '$lib/element_data_store_v2.svelte'; import Sign_in_out from './sign_in_out.svelte'; -import Comp__pres_mgmt_menu_nav from './ae_comp__pres_mgmt_menu_nav.svelte'; +import Comp__events_menu_nav from './../events/ae_comp__events_menu_nav.svelte'; // import Comp__global_menu_opts from '$lib/ae_comp__global_menu_opts.svelte'; import Comp__pres_mgmt_menu_opts from './ae_comp__pres_mgmt_menu_opts.svelte'; @@ -35,11 +35,11 @@ let ae_triggers: key_val = {};
- -
+
{#await $lq__event_presentation_obj_li} Loading....