Moving more files around.

This commit is contained in:
Scott Idem
2024-09-24 18:23:22 -04:00
parent 9e6a7f0db0
commit 267b5052c9
16 changed files with 64 additions and 42 deletions

View File

@@ -21,7 +21,7 @@ import { events_func } from '$lib/ae_events_functions';
import Comp_event_files_upload from './../../events_pres_mgmt/ae_comp__event_files_upload.svelte';
import Element_manage_event_file_li_wrap from '$lib/element_manage_event_file_li_direct.svelte';
import Event_page_menu from './event_page_menu.svelte';
import Event_page_menu from '../event_page_menu.svelte';
// Quickly save the data passed from the parent(s) to the Svelte stores, localStorage, and other.

View File

@@ -24,11 +24,11 @@ import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$
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';
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.svelte';
import Comp_event_files_upload from '../../../../events_pres_mgmt/ae_comp__event_files_upload.svelte';
import Comp_event_session_obj_li from '../../../../events_pres_mgmt/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';
import Location_view from './location_view.svelte';
import Location_page_menu from '../location_page_menu.svelte';
import { browser } from '$app/environment';

View File

@@ -1,6 +1,6 @@
/** @type {import('./$types').PageLoad} */
import { error } from '@sveltejs/kit';
console.log(`ae_events_pres_mgmt_event [slug] +page.ts start`);
console.log(`ae_events_pres_mgmt_event [event_location_id] +page.ts start`);
import { browser } from '$app/environment';
import { events_func } from '$lib/ae_events_functions';
@@ -9,22 +9,22 @@ export async function load({ params, parent }) { // route
let log_lvl = 0;
let data = await parent();
// console.log(`ae events_pres_mgmt location [slug] +page.ts data:`, data);
// console.log(`ae events_pres_mgmt location [event_location_id] +page.ts data:`, data);
let account_id = data.account_id;
let ae_acct = data[account_id];
// console.log(`ae_acct = `, ae_acct);
// if (!account_id) {
// console.log(`ae events_pres_mgmt location [slug] +page.ts: The account_id was not found in the data!!!`);
// console.log(`ae events_pres_mgmt location [event_location_id] +page.ts: The account_id was not found in the data!!!`);
// return false;
// }
data.ae_events_pres_mgmt_event_slug_page_ts = true;
let event_location_id = params.slug;
let event_location_id = params.event_location_id;
if (!event_location_id) {
console.log(`ae events_pres_mgmt location [slug] +page.ts: The event_location_id was not found in the params!!!`);
console.log(`ae events_pres_mgmt location [event_location_id] +page.ts: The event_location_id was not found in the params!!!`);
error(404, {
message: 'Location not found'
});

View File

@@ -96,7 +96,7 @@ $: if ($lq__event_location_obj) {
let qr_id_url = `${$lq__event_location_obj?.event_location_id_random}_url`;
// URL for this page (be sure to URL encode it):
let url_str = `${$ae_loc.url_origin}/events_pres_mgmt/location/${$lq__event_location_obj?.event_location_id_random}`;
let url_str = `${$ae_loc.url_origin}/events/${$lq__event_location_obj?.event_id_random}/location/${$lq__event_location_obj?.event_location_id_random}`;
url_str = encodeURI(url_str);
ae_promises.generate_qr_code_url = core_func.generate_qr_code({api_cfg: $ae_api, account_id: $slct.account_id, qr_type: 'str', qr_id: qr_id_url, str: url_str});
@@ -296,7 +296,7 @@ $: if ($lq__event_location_obj) {
{#if show__launcher_link}
<a
data-sveltekit-preload-data="false"
href="/events_pres_mgmt/launcher/{$lq__event_location_obj?.event_id_random}?location_id={$lq__event_location_obj?.event_location_id_random}"
href="/events/${$lq__event_location_obj?.event_id_random}/launcher/{$lq__event_location_obj?.event_location_id_random}"
class="btn btn-sm variant-glass-secondary hover:variant-filled-secondary"
title="Launcher: {$lq__event_location_obj?.name} {$lq__event_location_obj?.event_location_id_random}"
>

View File

@@ -9,9 +9,9 @@ import { onMount } from 'svelte';
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_wrapper.svelte';
import Comp_event_presenter_obj_tbl from '../../../ae_comp__event_presenter_obj_tbl_wrapper.svelte';
import Comp_event_file_obj_tbl from '../../../events_pres_mgmt/ae_comp__event_file_obj_tbl.svelte';
import Comp_event_session_obj_tbl from '../../../events_pres_mgmt/ae_comp__event_session_obj_tbl_wrapper.svelte';
import Comp_event_presenter_obj_tbl from '../../../events_pres_mgmt/ae_comp__event_presenter_obj_tbl_wrapper.svelte';
import { liveQuery } from "dexie";
// import { core_func } from '$lib/ae_core_functions';
@@ -20,7 +20,7 @@ import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$
import { events_loc, events_sess, events_slct, events_trigger } from '$lib/ae_events_stores';
import { events_func } from '$lib/ae_events_functions';
import Event_reports_page_menu from './../../../event_reports_page_menu.svelte';
import Event_reports_page_menu from './event_reports_page_menu.svelte';
// Quickly save the data passed from the parent(s) to the Svelte stores, localStorage, and other.
$slct.account_id = data.account_id;

View File

@@ -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__pres_mgmt_menu_nav from './../../ae_comp__events_menu_nav.svelte';
export let lq__event_obj: any;
@@ -29,9 +29,12 @@ let ae_triggers: key_val = {};
class="flex flex-row flex-wrap gap-1 items-center justify-around w-full">
<Comp__pres_mgmt_menu_nav
hide={false}
ae_core={true}
pres_mgmt__session_search={$events_slct.event_id}
hide={!$ae_loc.authenticated_access}
event_id={$lq__event_obj?.event_id}
ae_core={$ae_loc.administrator_access}
events__locations={$ae_loc.administrator_access}
events__reports={$ae_loc.trusted_access}
events__session_search={$events_slct.event_id}
/>
<span

View File

@@ -4,13 +4,16 @@ import { events_loc, events_sess, events_slct, events_trigger, events_trig_kv }
export let hide: boolean = true;
export let event_id: null|string = null;
export let ae_core: boolean = false;
export let pres_mgmt__launcher_id: boolean = false; // event_location_id
export let pres_mgmt__location_id: boolean = false; // event_location_id
export let pres_mgmt__presenter_id: boolean = false; // event_presenter_id
export let pres_mgmt__reports: boolean = false; // event_id
export let pres_mgmt__session_id: boolean = false; // event_session_id
export let pres_mgmt__session_search: boolean = false; // event_id
export let events__launcher_id: boolean = false; // event_location_id
export let events__location_id: boolean = false; // event_location_id
export let events__locations: boolean = false; // event_id
export let events__presenter_id: boolean = false; // event_presenter_id
export let events__reports: boolean = false; // event_id
export let events__session_id: boolean = false; // event_session_id
export let events__session_search: boolean = false; // event_id
</script>
@@ -34,31 +37,39 @@ export let pres_mgmt__session_search: boolean = false; // event_id
</a>
<a
href="/events_pres_mgmt/event/{pres_mgmt__reports}/reports"
href="/events/{event_id}/reports"
class="{ae_snip.classes__events_pres_mgmt_menu__button}"
class:hidden={!pres_mgmt__reports}
class:hidden={!events__reports}
>
<span class="fas fa-chart-line m-1"></span>
Pres Mgmt Reports
</a>
<a
href="/events/{event_id}/locations"
class="{ae_snip.classes__events_pres_mgmt_menu__button}"
class:hidden={!events__locations}
>
<span class="fas fa-map-marker-alt m-1"></span>
Locations
</a>
</span>
<span
class="ae_menu__navigation_options flex flex-row items-center justify-around"
>
<a
href="/events_pres_mgmt/event/{pres_mgmt__session_search}"
href="/events_pres_mgmt/event/{events__session_search}"
class="{ae_snip.classes__events_pres_mgmt_menu__button}"
class:hidden={!pres_mgmt__session_search}
class:hidden={!events__session_search}
>
<span class="fas fa-arrow-left m-1"></span>
Back to Session Search
</a>
<a
href="/events_pres_mgmt/session/{pres_mgmt__session_id}"
href="/events_pres_mgmt/session/{events__session_id}"
class="{ae_snip.classes__events_pres_mgmt_menu__button}"
class:hidden={!pres_mgmt__session_id}
class:hidden={!events__session_id}
>
<span class="fas fa-arrow-left m-1"></span>
Back to Session

View File

@@ -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__pres_mgmt_menu_nav from './ae_comp__events_menu_nav.svelte';
export let lq__event_obj: any;
@@ -29,9 +29,11 @@ let ae_triggers: key_val = {};
class="flex flex-row flex-wrap gap-1 items-center justify-around w-full">
<Comp__pres_mgmt_menu_nav
hide={!$ae_loc.trusted_access}
hide={!$ae_loc.authenticated_access}
event_id={$lq__event_obj?.event_id}
ae_core={$ae_loc.administrator_access}
pres_mgmt__reports={$events_slct.event_id && $ae_loc.trusted_access}
events__locations={$ae_loc.administrator_access}
events__reports={$ae_loc.trusted_access}
/>
<span

View File

@@ -60,7 +60,7 @@ export async function load({ parent }) {
let submenu = {
main: {name: 'Main', href: '/events_pres_mgmt', access: false},
// manage: {name: 'Manage', href: '/events_pres_mgmt/manage', access: 'administrator', disable: true, hide: true},
locations: {name: 'Locations', href: '/events_pres_mgmt/locations', access: false, disable: false, hide: false},
locations: {name: 'Locations', href: `/events/${event_id}/locations`, access: false, disable: false, hide: false},
};
data.submenu = submenu

View File

@@ -223,7 +223,7 @@ let ae_triggers: key_val = {};
{/if}
{#if show__location_link}
<a
href="/events_pres_mgmt/location/{session_obj?.event_location_id_random}"
href="/events/{session_obj?.event_id_random}/location/{session_obj?.event_location_id_random}"
class="btn btn-sm variant-glass-surface hover:variant-filled-tertiary text-xs lg:text-sm"
title="Location: {session_obj?.event_location_name} {session_obj?.event_location_id_random}"
>

View File

@@ -4,9 +4,12 @@ import { events_loc, events_sess, events_slct, events_trigger, events_trig_kv }
export let hide: boolean = true;
export let event_id: null|string = null;
export let ae_core: boolean = false;
export let pres_mgmt__launcher_id: boolean = false; // event_location_id
export let pres_mgmt__location_id: boolean = false; // event_location_id
export let pres_mgmt__locations: boolean = false; // event_id
export let pres_mgmt__presenter_id: boolean = false; // event_presenter_id
export let pres_mgmt__reports: boolean = false; // event_id
export let pres_mgmt__session_id: boolean = false; // event_session_id
@@ -34,7 +37,7 @@ export let pres_mgmt__session_search: boolean = false; // event_id
</a>
<a
href="/events_pres_mgmt/event/{pres_mgmt__reports}/reports"
href="/events/{event_id}/reports"
class="{ae_snip.classes__events_pres_mgmt_menu__button}"
class:hidden={!pres_mgmt__reports}
>
@@ -47,7 +50,7 @@ export let pres_mgmt__session_search: boolean = false; // event_id
class="ae_menu__navigation_options flex flex-row items-center justify-around"
>
<a
href="/events_pres_mgmt/event/{pres_mgmt__session_search}"
href="/events_pres_mgmt/event/{event_id}"
class="{ae_snip.classes__events_pres_mgmt_menu__button}"
class:hidden={!pres_mgmt__session_search}
>

View File

@@ -29,9 +29,10 @@ let ae_triggers: key_val = {};
class="flex flex-row flex-wrap gap-1 items-center justify-around w-full">
<Comp__pres_mgmt_menu_nav
hide={!$ae_loc.trusted_access}
hide={!$ae_loc.authenticated_access}
event_id={$lq__event_obj?.event_id}
ae_core={$ae_loc.administrator_access}
pres_mgmt__reports={$events_slct.event_id && $ae_loc.trusted_access}
pres_mgmt__reports={$ae_loc.trusted_access}
/>
<span

View File

@@ -35,6 +35,7 @@ let ae_triggers: key_val = {};
<Comp__pres_mgmt_menu_nav
hide={false}
event_id={$lq__event_presenter_obj?.event_id_random}
pres_mgmt__session_id={$lq__event_presenter_obj?.event_session_id_random}
pres_mgmt__session_search={$events_slct.event_id}
/>

View File

@@ -37,6 +37,7 @@ let ae_triggers: key_val = {};
<Comp__pres_mgmt_menu_nav
hide={false}
event_id={$lq__event_session_obj?.event_id_random}
pres_mgmt__session_search={$events_slct.event_id}
/>

View File

@@ -60,7 +60,7 @@ export async function load({ parent }) {
let submenu = {
main: {name: 'Main', href: '/events_pres_mgmt', access: false},
// manage: {name: 'Manage', href: '/events_pres_mgmt/manage', access: 'administrator', disable: true, hide: true},
locations: {name: 'Locations', href: '/events_pres_mgmt/locations', access: false, disable: false, hide: false},
locations: {name: 'Locations', href: `/events/${event_id}/locations`, access: false, disable: false, hide: false},
};
data.submenu = submenu