Scott.Idem/OSIT-AE-App-Svelte
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Lots of work on getting the Launcher actually working well.

Browse Source
This commit is contained in:
Scott Idem
2025-09-24 16:56:32 -04:00
parent 4220a354be
commit 1ba9cd1c03
17 changed files with 453 additions and 344 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/lib/ae_events_stores.ts
View File

@@ -372,6 +372,11 @@ let events_session_data_struct: key_val = {
loading__session_li_status: null,
loading__session_id_status: null,
trigger_reload__event_session_obj_id: null,
trigger_reload__event_session_obj_li: null,
trigger_reload__event_location_obj_id: null,
trigger_reload__event_location_obj_li: null,
},
// Lead Retrievals (Exhibit)

2
src/lib/element_data_store_v2.svelte
View File

@@ -10,7 +10,7 @@ import { ae_util } from '$lib/ae_utils/ae_utils';
import type { key_val } from '$lib/ae_stores';
export let log_lvl: number = 0;
export let expire_minutes: number = 10;
export let expire_minutes: number = 15;
export let mount_reload_sec: number = 0;
export let ds_code: string;

12
src/routes/+layout.svelte
View File

@@ -714,7 +714,7 @@ $effect(() => {
gap-1 items-center justify-start
p-2
bg-neutral-500/50
z-10
z-40
transition-all
"
>
@@ -733,7 +733,13 @@ $effect(() => {
rounded-lg p-2
preset-outlined-surface-600-400
preset-filled-surface-200-800
opacity-70 md:opacity-50
shadow-lg
opacity-40 md:opacity-20 hover:opacity-100 focus:opacity-100 active:opacity-100
transition-delay-500 transition-duration-1000 transition-timing-function-ease-out
transition-all
"
>
@@ -742,7 +748,7 @@ $effect(() => {
class="flex flex-row items-center justify-between w-full"
>
<span class="fas fa-cog fa-spin m-1"></span>
<span class="text-center">App loading</span>
<span class="text-center">App Loading</span>
<span class="fas fa-cog fa-spin m-1"></span>
</div>

12
src/routes/+layout.ts
View File

@@ -252,8 +252,8 @@ export async function load({ fetch, params, parent, route, url }) { // params, r
}
})
.catch(function (error) {
console.log('API GET Object *fetch* request was aborted or failed in an unexpected way.', error);
.catch((err) => {
console.log('API GET Object *fetch* request was aborted or failed in an unexpected way.', err);
error(500, {
message: 'Site lookup aborted or failed! Check the network connection, domain name, and API.'
});
@@ -272,19 +272,15 @@ export async function load({ fetch, params, parent, route, url }) { // params, r
});
}
// log_lvl = 0;
if (log_lvl > 1) {
console.log(`root +layout.ts: Using account_id = `, account_id);
console.log(`root +layout.ts: ae_loc_init = `, ae_loc_init);
}
// log_lvl = 0;
if (!account_id) {
console.log(`root +layout.ts: The account_id was not found!!!`);
error(500, {
message: 'The account ID was not found!'
message: 'The account ID was not found! Check the API.'
});
}

5
src/routes/events/+layout.svelte
View File

@@ -96,7 +96,10 @@ function scroll_container() {
<svelte:head>
<title>Presentation Management - {$events_loc.title ?? 'Æ loading...'}</title>
<title>
&AElig;:
Events - {$events_loc.title ?? 'Æ loading...'}
</title>
</svelte:head>

39
src/routes/events/+layout.ts
View File

@@ -23,45 +23,6 @@ export async function load({ parent }) {
console.log(`ae_acct = `, ae_acct);
}
// let event_id = ae_acct.slct.event_id; // From root +layout.ts
// if (!event_id) {
// console.log(`ERROR: events_pres_mgmt +layout.ts: The event_id was not found in the parent_data!!!`);
// return false;
// }
// if (browser) {
// if (log_lvl) {
// console.log(`ae_events_pres_mgmt +layout.ts parent_data:`, parent_data);
// }
// // Should we limit these to event.conference = true?
// let load_event_obj_li = events_func.load_ae_obj_li__event({
// api_cfg: ae_acct.api,
// for_obj_type: 'account',
// for_obj_id: account_id,
// params: {qry__enabled: 'enabled', qry__limit: 25},
// try_cache: true,
// log_lvl: log_lvl
// });
// ae_acct.slct.event_obj_li = load_event_obj_li;
// }
// let load_event_obj = events_func.load_ae_obj_id__event({
// api_cfg: ae_acct.api,
// event_id: event_id,
// try_cache: false
// });
// ae_acct.slct.event_obj = load_event_obj;
// let submenu = {
// main: {name: 'Main', href: '/events', access: false},
// // manage: {name: 'Manage', href: '/events/${event_id}/manage', access: 'administrator', disable: true, hide: true},
// locations: {name: 'Locations', href: `/events/${event_id}/locations`, access: false, disable: false, hide: false},
// };
// parent_data.submenu = submenu
// WARNING: Precaution against shared parent_data between sites and sessions.
parent_data[account_id] = ae_acct;

3
src/routes/events/+page.ts
View File

@@ -28,9 +28,6 @@ export async function load({ parent }) {
let load_event_obj_li = await events_func.load_ae_obj_id__event({
api_cfg: ae_acct.api,
event_id: event_id,
hidden: 'all', // 'not_hidden' to load only visible entries
// params: ae_params,
try_cache: true,
log_lvl: log_lvl
});
ae_acct.slct.event_obj_li = load_event_obj_li;

47
src/routes/events/[event_id]/(launcher)/launcher/+layout.svelte
View File

@@ -219,21 +219,21 @@ let lq__event_session_obj_li = $derived(liveQuery(async () => {
let results;
if ($events_sess?.session_li && $events_sess?.session_li?.length) {
if (log_lvl) {
console.log(`LQ - Using $events_sess.session_li to get event sessions.`);
}
// $events_sess.session_li_trigger = false;
let event_session_id_random_li = []; // This is to prevent the array from constantly updating and triggering the liveQuery.
// if (log_lvl) {
// console.log(`LQ - Using $events_sess.session_li to get event sessions.`);
// }
// // $events_sess.session_li_trigger = false;
// let event_session_id_random_li = []; // This is to prevent the array from constantly updating and triggering the liveQuery.
for (let i = 0; i < $events_sess?.session_li.length; i++) {
let event_session_obj = $events_sess?.session_li[i];
let event_session_id_random = event_session_obj.event_session_id_random;
event_session_id_random_li.push(event_session_id_random);
}
// let event_session_id_random_li = tmp_li;
// for (let i = 0; i < $events_sess?.session_li.length; i++) {
// let event_session_obj = $events_sess?.session_li[i];
// let event_session_id_random = event_session_obj.event_session_id_random;
// event_session_id_random_li.push(event_session_id_random);
// }
// // let event_session_id_random_li = tmp_li;
results = await db_events.sessions
.bulkGet(event_session_id_random_li);
// results = await db_events.sessions
// .bulkGet(event_session_id_random_li);
// } else if ($lq__event_obj?.cfg_json?.session_group_sort === 'DESC') {
// if (log_lvl) {
@@ -259,7 +259,7 @@ let lq__event_session_obj_li = $derived(liveQuery(async () => {
// .reverse()
// .sortBy('tmp_sort_1');
} else {
} else if ($events_slct.event_location_id) {
if (log_lvl) {
// console.log(`$lq__event_obj.cfg_json = `, $lq__event_obj?.cfg_json);
console.log(`LQ - Using default sort for Event Session list event_id: ${$events_slct?.event_id}`);
@@ -648,10 +648,11 @@ $effect(() => {
<svelte:head>
<!-- {ae_util.shorten_string({ string: $lq__event_obj?.name ?? '', max_length: 20, begin_length: 10, end_length: 4 })} -->
<title>
Launcher:
{ae_util.shorten_string({ string: $lq__event_obj?.name ?? '', max_length: 20, begin_length: 10, end_length: 4 })}
({$lq__event_obj?.event_id ?? 'loading...'}) - Pres Mgmt - {$ae_loc?.title}
&AElig;:
{$lq__event_location_obj?.name ?? '-- not set --'}
({$lq__event_session_obj?.name ?? 'Æ loading...'}) - Launcher - {$events_loc?.title}
</title>
</svelte:head>
@@ -790,7 +791,12 @@ $effect(() => {
lq__event_session_obj_li={lq__event_session_obj_li}
bind:loading__session_id_status={$events_sess.launcher.loading__session_id_status}
lq__event_session_obj={lq__event_session_obj}
slct__event_session_id={$events_slct.event_session_id}
bind:slct__event_session_id={$events_slct.event_session_id}
bind:trigger_reload__event_session_obj_id={$events_sess.launcher.trigger_reload__event_session_obj_id}
bind:trigger_reload__event_session_obj_li={$events_sess.launcher.trigger_reload__event_session_obj_li}
bind:trigger_reload__event_location_obj_li={$events_sess.launcher.trigger_reload__event_location_obj_li}
>
</Launcher_menu>
<!-- {:else}
@@ -840,9 +846,12 @@ $effect(() => {
</div>
{/if}
{#if $events_slct.event_session_id && $lq__event_session_obj}
<!-- Using the loading__session_id_status is kind of a hacky way to determine if the session is still loading or not. -->
{#if $events_slct.event_session_id && $lq__event_session_obj && !$events_sess.launcher.loading__session_id_status}
<Launcher_session_view
bind:slct__event_session_id={$events_slct.event_session_id}
lq__event_session_obj={lq__event_session_obj}
bind:type_code={$lq__event_session_obj.type_code}
>
</Launcher_session_view>
{/if}

2
src/routes/events/[event_id]/(launcher)/launcher/[event_location_id]/+page.svelte
View File

@@ -59,7 +59,7 @@ $events_slct.event_location_obj_li = ae_acct.slct.event_location_obj_li ?? [''];
$events_slct.id_li__event_location = ae_acct.slct.id_li__event_location ?? [''];
console.log(`$events_slct.event_location_obj_li:`, $events_slct.event_location_obj_li);
$events_slct.event_session_obj_li = ae_acct.slct.event_session_obj_li ?? [''];
$events_slct.id_li__event_session = ae_acct.slct.id_li__event_session ?? [''];
// $events_slct.id_li__event_session = ae_acct.slct.id_li__event_session ?? [''];
// $events_trig = ae_acct.trig;
// $events_trig.event_location_li = true;

31
src/routes/events/[event_id]/(launcher)/launcher/[event_location_id]/+page.ts
View File

@@ -6,7 +6,7 @@ import { browser } from '$app/environment';
import { events_func } from '$lib/ae_events_functions';
export async function load({ params, parent, url }) { // route
let log_lvl: number = 0;
let log_lvl: number = 1;
let data = await parent();
// console.log(`ae events_pres_mgmt event [event_location_id] +page.ts data:`, data);
@@ -14,25 +14,22 @@ export async function load({ params, parent, url }) { // route
let account_id = data.account_id;
let ae_acct = data[account_id];
console.log(`ae_acct = `, ae_acct);
let event_location_id = params.event_location_id;
if (!event_location_id) {
console.log(`ae Events - [event_id] launcher [event_location_id] +page.ts: The event_location_id was not found in the params.event_location_id!!!`);
error(404, {
message: 'Event Location ID not found'
message: 'Events Pres Mgmt - Event Location ID not found'
});
}
if (log_lvl) {
console.log(`ae_events launcher [event_location_id] +page.ts: event_location_id = `, event_location_id);
}
if (browser) {
if (log_lvl) {
console.log(`ae_events launcher [event_location_id] +page.ts: event_location_id = `, event_location_id);
}
// Load event_session object
let load_event_session_obj_li = await events_func.load_ae_obj_li__event_session({
// let load_event_session_obj_li = await events_func.load_ae_obj_li__event_session({
let load_event_session_obj_li = events_func.load_ae_obj_li__event_session({
api_cfg: ae_acct.api,
for_obj_type: 'event_location',
for_obj_id: event_location_id,
@@ -52,18 +49,18 @@ export async function load({ params, parent, url }) { // route
ae_acct.slct.event_session_obj_li = load_event_session_obj_li;
// console.log(`ae_acct.slct.event_session_obj_li = `, ae_acct.slct.event_session_obj_li);
let id_li__event_session = [];
// let id_li__event_session = [];
let tmp_li = []; // This is to prevent the array from constantly updating and triggering the liveQuery.
// let tmp_li = []; // This is to prevent the array from constantly updating and triggering the liveQuery.
for (let i = 0; i < load_event_session_obj_li.length; i++) {
let event_session_obj = load_event_session_obj_li[i];
let event_session_id_random = event_session_obj.event_session_id_random;
tmp_li.push(event_session_id_random);
}
id_li__event_session = tmp_li;
console.log(`id_li__event_session:`, id_li__event_session);
ae_acct.slct.id_li__event_session = id_li__event_session;
// for (let i = 0; i < load_event_session_obj_li.length; i++) {
// let event_session_obj = load_event_session_obj_li[i];
// let event_session_id_random = event_session_obj.event_session_id_random;
// tmp_li.push(event_session_id_random);
// }
// id_li__event_session = tmp_li;
// console.log(`id_li__event_session:`, id_li__event_session);
// ae_acct.slct.id_li__event_session = id_li__event_session;
// This should only be needed if the session ID passed is not part of the location sessions.
// let event_session_id = url.searchParams.get('session_id');

11
src/routes/events/[event_id]/(launcher)/launcher_menu.svelte
View File

@@ -18,6 +18,10 @@ interface Props {
lq__event_session_obj?: any;
slct__event_session_id?: string|null;
trigger_reload__event_session_obj_id?: boolean|null|string;
trigger_reload__event_session_obj_li?: boolean;
trigger_reload__event_location_obj_li?: boolean;
log_lvl?: number;
}
@@ -40,6 +44,10 @@ let {
lq__event_session_obj,
slct__event_session_id = $bindable(null),
trigger_reload__event_session_obj_id = $bindable(false),
trigger_reload__event_session_obj_li = $bindable(false),
trigger_reload__event_location_obj_li = $bindable(false),
log_lvl = $bindable(0),
}: Props = $props();
@@ -233,9 +241,10 @@ let ae_promises: key_val = $state({
{#if $lq__event_session_obj_li}
<Menu_session_list_menu
data_url={data_url}
bind:slct__event_session_id={slct__event_session_id}
bind:loading__session_id_status={loading__session_id_status}
lq__event_session_obj_li={lq__event_session_obj_li}
slct_event_session_id={$events_slct.event_session_id}
bind:trigger_reload__event_session_obj_id={trigger_reload__event_session_obj_id}
/>
{/if}

226
src/routes/events/[event_id]/(launcher)/launcher_session_view.svelte
View File

@@ -1,16 +1,23 @@
<script lang="ts">
interface Props {
// export let lq_get__event_presenter_obj_li: any;
slct__event_session_id?: string;
lq__event_session_obj: any;
type_code?: string;
log_lvl?: number;
}
let { lq__event_session_obj }: Props = $props();
let {
slct__event_session_id = $bindable(''),
lq__event_session_obj,
type_code = $bindable(''),
log_lvl = $bindable(1),
}: Props = $props();
import type { key_val } from '$lib/ae_stores';
import { ae_util } from '$lib/ae_utils/ae_utils';
import { api } from '$lib/api';
// import Element_ae_crud from '$lib/element_ae_crud.svelte';
// import Launcher_file_cont from './launcher_file_cont.svelte';
import Event_launcher_file_cont from './launcher_file_cont.svelte';
import Launcher_presenter_view from './launcher_presenter_view.svelte';
import Launcher_presenter_view_posters from './launcher_presenter_view_posters.svelte';
@@ -25,7 +32,7 @@ import { events_func } from '$lib/ae_events_functions';
// let load_event_session_obj = events_func.load_ae_obj_id__event_session({
// api_cfg: $ae_api,
// event_session_id: $events_slct.event_session_id,
// event_session_id: slct__event_session_id,
// inc_presenter_li: false,
// try_cache: true,
// log_lvl: 1
@@ -36,7 +43,7 @@ import { events_func } from '$lib/ae_events_functions';
// );
// let lq__event_session_obj = liveQuery(
// () => db_events.sessions.get($events_slct.event_session_id)
// () => db_events.sessions.get(slct__event_session_id)
// );
// import Event_launcher_file_cont from './launcher_file_cont.svelte';
@@ -46,14 +53,37 @@ import { events_func } from '$lib/ae_events_functions';
// export let show_designations: boolean = false;
// export let show_email: boolean = false;
// Event File
// Event File (for a Session)
let lq__event_file_obj_li = $derived(liveQuery(async () => {
if (log_lvl) {
console.log(`lq__event_file_obj: event_file_id = ${$events_slct?.event_file_id}`);
}
let results = await db_events.files
// .where('event_session_id_random')
.where('for_id_random')
.equals($events_slct.event_session_id)
.equals(slct__event_session_id)
.reverse() // Need reverse for created_on newest first.
.sortBy('created_on') // or filename
;
if (log_lvl) {
console.log(`lq__event_file_obj_li: results = `, results);
}
// Check if results are different than the current $events_slct.event_file_obj_li
if ($events_slct.event_file_obj_li && results) {
if (JSON.stringify($events_slct.event_file_obj_li) !== JSON.stringify(results)) {
$events_slct.event_file_obj_li = { ...results};
if (log_lvl) {
console.log(`$events_slct.event_file_obj_li has changed for event_session_id: ${slct__event_session_id}`, $events_slct.event_file_obj_li);
}
} else {
if (log_lvl) {
console.log(`$events_slct.event_file_obj_li has not changed for event_session_id: ${slct__event_session_id}`);
}
}
}
return results;
}));
@@ -71,15 +101,37 @@ let lq__event_file_obj_li = $derived(liveQuery(async () => {
// );
let lq__event_presentation_obj_li = $derived(liveQuery(async () => {
if (log_lvl) {
console.log(`lq__event_presentation_obj_li: slct__event_session_id = ${slct__event_session_id}`);
}
let sort_by = 'start_datetime';
if ($lq__event_session_obj.type_code == 'poster') {
if (type_code == 'poster') {
sort_by = 'name';
}
let results = await db_events.presentations
.where('event_session_id_random')
.equals($events_slct.event_session_id)
.sortBy(sort_by);
.equals(slct__event_session_id)
.sortBy(sort_by)
// .sortBy('name')
;
if (log_lvl) {
console.log(`lq__event_presentation_obj_li: results = `, results);
}
// Check if results are different than the current $events_slct.event_presentation_obj_li
if ($events_slct.event_presentation_obj_li && results) {
if (JSON.stringify($events_slct.event_presentation_obj_li) !== JSON.stringify(results)) {
$events_slct.event_presentation_obj_li = { ...results};
if (log_lvl) {
console.log(`$events_slct.event_presentation_obj_li has changed for event_session_id: ${slct__event_session_id}`, $events_slct.event_presentation_obj_li);
}
} else {
if (log_lvl) {
console.log(`$events_slct.event_presentation_obj_li has not changed for event_session_id: ${slct__event_session_id}`);
}
}
}
return results;
}));
@@ -92,10 +144,32 @@ let lq__event_presentation_obj_li = $derived(liveQuery(async () => {
let lq__event_presenter_obj_li = $derived(liveQuery(async () => {
if (log_lvl) {
console.log(`lq__event_presenter_obj_li: slct__event_session_id = ${slct__event_session_id}`);
}
let results = await db_events.presenters
.where('event_session_id_random')
.equals($events_slct.event_session_id)
.sortBy('full_name');
.where('event_session_id')
.equals(slct__event_session_id)
.sortBy('full_name')
;
if (log_lvl) {
console.log(`lq__event_presenter_obj_li: results = `, results);
}
// Check if results are different than the current $events_slct.event_presenter_obj_li
if ($events_slct.event_presenter_obj_li && results) {
if (JSON.stringify($events_slct.event_presenter_obj_li) !== JSON.stringify(results)) {
$events_slct.event_presenter_obj_li = { ...results};
if (log_lvl) {
console.log(`$events_slct.event_presenter_obj_li has changed for event_session_id: ${slct__event_session_id}`, $events_slct.event_presenter_obj_li);
}
} else {
if (log_lvl) {
console.log(`$events_slct.event_presenter_obj_li has not changed for event_session_id: ${slct__event_session_id}`);
}
}
}
return results;
}));
@@ -106,37 +180,35 @@ let lq__event_presenter_obj_li = $derived(liveQuery(async () => {
let ae_promises: key_val = $state({});
$events_slct.id_li__event_presenter = [];
// $events_slct.id_li__event_presenter = [];
// await tick();
ae_promises[$events_slct.event_session_id] = events_func.load_ae_obj_li__event_presenter({
api_cfg: $ae_api,
for_obj_type: 'event_session',
for_obj_id: $events_slct.event_session_id,
// inc_file_li: false,
params: {qry__enabled: 'enabled', qry__limit: 550},
try_cache: true,
log_lvl: 1,
})
.then(async function (load_results) {
console.log(`load_results = `, load_results);
// ae_promises[slct__event_session_id] = events_func.load_ae_obj_li__event_presenter({
// api_cfg: $ae_api,
// for_obj_type: 'event_session',
// for_obj_id: slct__event_session_id,
// // inc_file_li: false,
// params: {qry__enabled: 'enabled', qry__limit: 550},
// try_cache: true,
// log_lvl: 1,
// })
// .then(async function (load_results) {
// console.log(`load_results = `, load_results);
let event_presenter_id_li = [];
// // let event_presenter_id_li = [];
let tmp_li = []; // This is to prevent the array from constantly updating and triggering the liveQuery.
// // let tmp_li = []; // This is to prevent the array from constantly updating and triggering the liveQuery.
for (let i = 0; i < load_results.length; i++) {
let event_presenter_obj = load_results[i];
let event_presenter_id_random = event_presenter_obj.event_presenter_id_random;
tmp_li.push(event_presenter_id_random);
}
event_presenter_id_li = tmp_li;
console.log(`event_presenter_id_li:`, event_presenter_id_li);
$events_slct.id_li__event_presenter = event_presenter_id_li;
// $events_slct = {...$events_slct};
// await tick();
// // for (let i = 0; i < load_results.length; i++) {
// // let event_presenter_obj = load_results[i];
// // let event_presenter_id_random = event_presenter_obj.event_presenter_id_random;
// // tmp_li.push(event_presenter_id_random);
// // }
// // event_presenter_id_li = tmp_li;
// // console.log(`event_presenter_id_li:`, event_presenter_id_li);
// // $events_slct.id_li__event_presenter = event_presenter_id_li;
return load_results;
});
// return load_results;
// });
</script>
@@ -164,10 +236,10 @@ ae_promises[$events_slct.event_session_id] = events_func.load_ae_obj_li__event_p
{#if $lq__event_session_obj && $lq__event_session_obj.event_session_id_random}
<header class="event_session_about text-center border-b-2 border-gray-400">
<header class="event_session_about text-center border-b-2 border-gray-400 flex flex-row flex-wrap gap-2 items-center justify-between">
<h3
class="event_session_datetimes"
class="shrink event_session_datetimes"
>
<button
type="button"
@@ -194,19 +266,23 @@ ae_promises[$events_slct.event_session_id] = events_func.load_ae_obj_li__event_p
</span>
</button>
</h3>
<h2 class="text-xl">
<span class="grow flex flex-row gap-2 items-center justify-end">
<h2
class="shrink text-xl"
title={`Name: ${$lq__event_session_obj.name}\nType: ${$lq__event_session_obj.type_code} \nCode: ${$lq__event_session_obj.code} \nID: ${$lq__event_session_obj.event_session_id_random} \nStart Date/Time: ${ae_util.iso_datetime_formatter($lq__event_session_obj.start_datetime, 'week_long')} ${ae_util.iso_datetime_formatter($lq__event_session_obj.start_datetime, $events_loc.launcher.time_format)} \nEnd Date/Time: ${ae_util.iso_datetime_formatter($lq__event_session_obj.end_datetime, $events_loc.launcher.time_format)}`}
>
{$lq__event_session_obj?.name}
{#if $lq__event_session_obj?.code}
</h2>
{#if $lq__event_session_obj?.code}
<span class="text-base text-gray-500 font-normal p-1"
title="Session code {$lq__event_session_obj.code}"
>
<span class="fas fa-barcode"></span>
{$lq__event_session_obj?.code}
</span>
{/if}
</h2>
{/if}
</span>
</header>
@@ -257,54 +333,16 @@ ae_promises[$events_slct.event_session_id] = events_func.load_ae_obj_li__event_p
class="flex flex-row justify-center gap-1"
class:hidden={!$events_loc.launcher.show_content__hidden_files && event_file_obj.hide}
>
<button
disabled={!$ae_loc.trusted_access}
onclick={() => {
// ae_promises[event_file_obj.event_file_id_random]
ae_promises[event_file_obj.event_file_id_random] = api.download_hosted_file({
api_cfg: $ae_api,
hosted_file_id: event_file_obj.hosted_file_id_random,
return_file: true,
filename: event_file_obj.filename,
auto_download: true,
log_lvl: 0
});
// window.postMessage({ type: 'download_event_file', event_file_id: event_file_obj.event_file_id_random, filename: event_file_obj.filename, auto_download: true }, '*');
}}
class="btn btn-sm lg:btn-md preset-tonal-secondary hover:preset-filled-primary-500 min-w-72 lg:min-w-96
transition-all
"
title={`Download this file:\n${event_file_obj.filename}\n[API] SHA256: ${event_file_obj.hash_sha256.slice(0, 10)}... Hosted ID: ${event_file_obj.hosted_file_id_random} Event File ID: ${event_file_obj.event_file_id_random}`}
>
{#await ae_promises[event_file_obj.event_file_id_random]}
<span class="fas fa-spinner fa-spin mx-1"></span>
<span class="">
Downloading
{#if $ae_sess.api_download_kv[event_file_obj.hosted_file_id_random]}
{$ae_sess.api_download_kv[event_file_obj.hosted_file_id_random].percent_completed}%
{/if}
:
</span>
{:then}
<!-- <span class="fas fa-download mx-1"></span> -->
<span class="fas fa-{ae_util.file_extension_icon(event_file_obj.extension)}"></span>
<!-- <span class="text-sm">
Download:
</span> -->
{/await}
<Event_launcher_file_cont
event_file_obj={event_file_obj}
hide_created_on={true}
show_bak_download={$ae_loc.trusted_access && $ae_loc.edit_mode}
session_type={event_file_obj?.event_session_type_code ?? 'oral'}
open_method={event_file_obj?.event_session_type_code == 'poster' ? 'modal' : null}
modal_title={$lq__event_session_obj?.name}
/>
<span class="grow">
{ae_util.shorten_filename({filename: event_file_obj.filename, max_length: 30})}
</span>
<span
class="badge preset-tonal-success hover:preset-filled-success-500 text-sm"
class:hidden={!event_file_obj.file_purpose}
>
{event_file_obj.file_purpose}
</span>
</button>
<!-- <Launcher_file_cont {event_file_obj} hide_created_on={false} show_bak_download={($ae_loc.trusted_access || $events_loc.launcher.trusted_access)} open_file_as={$lq__event_session_obj.type_code} poster_title={$lq__event_session_obj.title} /> -->
@@ -335,7 +373,7 @@ ae_promises[$events_slct.event_session_id] = events_func.load_ae_obj_li__event_p
{#if $lq__event_presentation_obj_li}
<div class="text-xs text-surface-600-400"><strong>
{#if $lq__event_session_obj.type_code == 'poster'}
{#if type_code == 'poster'}
<span class="fas fa-image"></span>
Posters:
{:else}
@@ -378,7 +416,7 @@ ae_promises[$events_slct.event_session_id] = events_func.load_ae_obj_li__event_p
transition-all
"
>
{#if $lq__event_session_obj.type_code == 'poster'}
{#if type_code == 'poster'}
<Launcher_presenter_view_posters
lq__event_presenter_obj={event_presenter_obj}
/>

89
src/routes/events/[event_id]/(launcher)/menu_location_list.svelte
View File

@@ -5,6 +5,9 @@ interface Props {
lq__event_location_obj_li: any;
slct_event_location_id: string|null;
trigger_reload__event_session_obj_li?: boolean;
trigger_reload__event_location_obj_li?: boolean;
log_lvl?: number;
}
@@ -14,6 +17,9 @@ let {
lq__event_location_obj_li,
slct_event_location_id = null,
trigger_reload__event_session_obj_li = $bindable(false),
trigger_reload__event_location_obj_li = $bindable(false),
log_lvl = $bindable(0),
}: Props = $props();
@@ -43,6 +49,55 @@ let ae_promises: key_val = $state({
// let hover_timer_wait = 1000;
// let hover_timer: any = $state(null);
function handle_load_ae_obj_li__event_session(event_location_id: string) {
if (log_lvl) {
console.log(`handle_load_ae_obj_li__event_session: event_location_id = ${event_location_id}`);
}
if (!event_location_id) {
console.warn(`handle_load_ae_obj_li__event_session: No event_location_id provided.`);
return;
}
loading__session_li_status = true;
ae_promises[event_location_id] = events_func.load_ae_obj_li__event_session({
api_cfg: $ae_api,
for_obj_type: 'event_location',
for_obj_id: event_location_id,
inc_file_li: true, // Only include files directly under the session?
inc_all_file_li: false, // Also include files under presentations and presenters as well?
inc_presentation_li: true,
inc_presenter_li: true,
enabled: $events_loc.launcher.show_content__enabled_sessions ? 'all' : 'enabled',
hidden: $events_loc.launcher.show_content__hidden_sessions ? 'all' : 'not_hidden',
limit: 49,
try_cache: true,
log_lvl: 1,
})
.then(async function (load_results) {
console.log(`load_results = `, load_results);
let event_session_id_li = [];
let tmp_li = []; // This is to prevent the array from constantly updating and triggering the liveQuery.
for (let i = 0; i < load_results.length; i++) {
let event_session_obj = load_results[i];
let event_session_id_random = event_session_obj.event_session_id_random;
tmp_li.push(event_session_id_random);
}
event_session_id_li = tmp_li;
console.log(`event_session_id_li:`, event_session_id_li);
// $events_slct.id_li__event_session = event_session_id_li;
loading__session_li_status = false;
return load_results;
});
return ae_promises[event_location_id];
}
</script>
<!-- text-neutral-800/80 -->
@@ -94,40 +149,10 @@ let ae_promises: key_val = $state({
$events_loc.launcher.slct.event_location_id = slct_event_location_id;
$events_slct.event_location_id = slct_event_location_id;
$events_slct.id_li__event_session = [];
// Load the sessions for this location
await handle_load_ae_obj_li__event_session(slct_event_location_id);
ae_promises[slct_event_location_id] = events_func.load_ae_obj_li__event_session({
api_cfg: $ae_api,
for_obj_type: 'event_location',
for_obj_id: $events_slct.event_location_id,
inc_file_li: true, // Only include files directly under the session?
inc_all_file_li: false, // Also include files under presentations and presenters as well?
inc_presentation_li: true,
inc_presenter_li: true,
enabled: $events_loc.launcher.show_content__enabled_sessions ? 'all' : 'enabled',
hidden: $events_loc.launcher.show_content__hidden_sessions ? 'all' : 'not_hidden',
limit: 49,
try_cache: true,
log_lvl: 1,
})
.then(async function (load_results) {
console.log(`load_results = `, load_results);
let event_session_id_li = [];
let tmp_li = []; // This is to prevent the array from constantly updating and triggering the liveQuery.
for (let i = 0; i < load_results.length; i++) {
let event_session_obj = load_results[i];
let event_session_id_random = event_session_obj.event_session_id_random;
tmp_li.push(event_session_id_random);
}
event_session_id_li = tmp_li;
console.log(`event_session_id_li:`, event_session_id_li);
$events_slct.id_li__event_session = event_session_id_li;
return load_results;
});
new_url = `/events/${$events_slct.event_id}/launcher/${slct_event_location_id}`;
loading__session_li_status = 'finished';

250
src/routes/events/[event_id]/(launcher)/menu_session_list.svelte
View File

@@ -1,25 +1,32 @@
<script lang="ts">
interface Props {
data_url: any;
slct__event_session_id?: null|boolean|string;
loading__session_id_status?: null|boolean|string;
// export let lq__event_session_obj: any;
lq__event_session_obj_li: any;
slct_event_session_id: string|null;
trigger_reload__event_session_obj_id?: boolean|null|string;
// trigger_reload__event_session_obj_li?: boolean;
log_lvl?: number;
}
let {
data_url,
slct__event_session_id = $bindable(null),
loading__session_id_status = $bindable(null),
lq__event_session_obj_li,
slct_event_session_id = null,
log_lvl = $bindable(0),
trigger_reload__event_session_obj_id = $bindable(false),
// trigger_reload__event_session_obj_li = $bindable(false),
log_lvl = $bindable(1),
}: Props = $props();
// *** Import Svelte specific
import { goto } from '$app/navigation';
// import { liveQuery } from "dexie";
import { tick } from 'svelte';
// *** Import other supporting libraries
@@ -31,18 +38,98 @@ 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';
// export let slct_event_session_id: any;
// export let slct__event_session_id: any;
// *** Functions and Logic
let ae_promises: key_val = $state({
slct_event_session_id: null,
slct_event_presentation_li: null
slct__event_session_id: null,
slct__event_presentation_li: null
});
let hover_timer_wait = 2500;
let hover_timer: any = $state(null);
$effect(() => {
if (trigger_reload__event_session_obj_id) {
if (log_lvl) {
console.log(`trigger_reload__event_session_obj_id changed: ${trigger_reload__event_session_obj_id}`);
}
let event_session_id = trigger_reload__event_session_obj_id
trigger_reload__event_session_obj_id = false;
slct__event_session_id = event_session_id;
console.log(`slct__event_session_id = `, slct__event_session_id);
handle_load_ae_obj_id__event_session(event_session_id);
if ($events_loc.launcher.controller == 'local_push') {
console.log(`Local Push Controller Command: ae_load:event_session=${event_session_id}`);
$events_sess.launcher.controller_cmd = `ae_load:event_session=${event_session_id}`;
$events_sess.launcher.controller_trigger_send = true;
}
data_url.searchParams.set('session_id', event_session_id);
let new_url = data_url.toString();
console.log(new_url);
// goto(new_url, {replaceState: true}); // Updates the URL without adding a new entry to the history
goto(new_url, {replaceState: false}); // Updates the URL history without reloading the page
}
});
function handle_load_ae_obj_id__event_session(event_session_id: any) {
if (log_lvl) {
console.log(`handle_load_ae_obj_id__event_session: event_session_id = `, event_session_id);
}
loading__session_id_status = true;
// slct__event_session_id = null;
// slct__event_session_id = event_session_id;
// $events_slct.event_session_id = event_session_id;
// data_url.searchParams.set('session_id', event_session_id);
// let new_url = data_url.toString();
// console.log(new_url);
// loading__session_id_status = false;
// goto(new_url, {replaceState: true}); // Updates the URL without reloading the page
// goto(new_url, {replaceState: false}); // Updates the URL history without reloading the page
loading__session_id_status = 'loading';
// $events_slct.event_session_obj = event_session_obj;
ae_promises.slct__event_session_id = events_func.load_ae_obj_id__event_session({
api_cfg: $ae_api,
event_session_id: event_session_id,
inc_file_li: true,
inc_presentation_li: true,
inc_presenter_li: true,
log_lvl: log_lvl
})
.then(async (load_results) => {
console.log(`load_results = `, load_results);
$events_slct.event_session_obj = load_results.event_session_obj;
$events_slct.event_file_obj_li = load_results.event_file_obj_li;
$events_slct.event_presentation_obj_li = load_results.event_presentation_obj_li;
$events_slct.event_presenter_obj_li = load_results.event_presenter_obj_li;
// let new_url = data_url.toString();
// console.log(new_url);
// loading__session_id_status = false;
// // goto(new_url, {replaceState: true}); // Updates the URL without reloading the page
// goto(new_url, {replaceState: false}); // Updates the URL history without reloading the page
})
.finally(() => {
loading__session_id_status = false;
});
}
</script>
@@ -61,7 +148,7 @@ let hover_timer: any = $state(null);
</span>
<!-- This should fade out once the data is loaded. -->
{#await ae_promises.slct_event_session_id}
{#await ae_promises.slct__event_session_id}
<span class="fas fa-spinner fa-spin text-blue-500"></span>
{:then result}
<span class="fas fa-check text-green-500/80"></span>
@@ -92,88 +179,99 @@ let hover_timer: any = $state(null);
onmouseenter={() => {
// Start a 750 ms timer to prevent changing the session too quickly.
hover_timer = setTimeout(async () => {
loading__session_id_status = true;
// Only run if the session ID has changed
if (slct__event_session_id === event_session_obj?.id) {
return;
}
trigger_reload__event_session_obj_id = event_session_obj?.id;
// handle_load_ae_obj_id__event_session(event_session_obj?.id);
// $events_slct.event_session_id = null;
// await tick();
// loading__session_id_status = true;
slct_event_session_id = event_session_obj?.id;
$events_slct.event_session_id = event_session_obj?.id;
data_url.searchParams.set('session_id', event_session_obj?.id);
// slct__event_session_id = null;
let new_url = data_url.toString();
console.log(new_url);
loading__session_id_status = false;
// goto(new_url, {replaceState: true}); // Updates the URL without reloading the page
goto(new_url, {replaceState: false}); // Updates the URL history without reloading the page
loading__session_id_status = 'loading';
// slct__event_session_id = event_session_obj?.id;
// // $events_slct.event_session_id = event_session_obj?.id;
// data_url.searchParams.set('session_id', event_session_obj?.id);
$events_slct.event_session_obj = event_session_obj;
// let new_url = data_url.toString();
// console.log(new_url);
// loading__session_id_status = false;
// // goto(new_url, {replaceState: true}); // Updates the URL without reloading the page
// // goto(new_url, {replaceState: false}); // Updates the URL history without reloading the page
// loading__session_id_status = 'loading';
ae_promises.slct_event_session_id = events_func.load_ae_obj_id__event_session({
api_cfg: $ae_api,
event_session_id: event_session_obj?.id,
inc_file_li: true,
inc_presentation_li: true,
inc_presenter_li: true,
log_lvl: log_lvl
})
.then(async (load_results) => {
console.log(`load_results = `, load_results);
// $events_slct.event_session_obj = event_session_obj;
// let new_url = data_url.toString();
// console.log(new_url);
loading__session_id_status = false;
// // goto(new_url, {replaceState: true}); // Updates the URL without reloading the page
// goto(new_url, {replaceState: false}); // Updates the URL history without reloading the page
});
// ae_promises.slct__event_session_id = events_func.load_ae_obj_id__event_session({
// api_cfg: $ae_api,
// event_session_id: event_session_obj?.id,
// inc_file_li: true,
// inc_presentation_li: true,
// inc_presenter_li: true,
// log_lvl: log_lvl
// })
// .then(async (load_results) => {
// console.log(`load_results = `, load_results);
// // let new_url = data_url.toString();
// // console.log(new_url);
// loading__session_id_status = false;
// // // goto(new_url, {replaceState: true}); // Updates the URL without reloading the page
// // goto(new_url, {replaceState: false}); // Updates the URL history without reloading the page
// });
}, hover_timer_wait);
}}
onmouseleave={() => {
clearTimeout(hover_timer);
}}
onclick={async () => {
loading__session_id_status = true;
trigger_reload__event_session_obj_id = event_session_obj?.id;
// $events_slct.event_session_id = null;
// await tick();
// handle_load_ae_obj_id__event_session(event_session_obj?.id);
$events_slct.event_session_id = event_session_obj?.id;
data_url.searchParams.set('session_id', event_session_obj?.id);
// loading__session_id_status = true;
let new_url = data_url.toString();
console.log(new_url);
// goto(new_url, {replaceState: true}); // Updates the URL without reloading the page
goto(new_url, {replaceState: false}); // Updates the URL history without reloading the page
loading__session_id_status = 'loading';
// slct__event_session_id = null;
// // await tick();
// $events_slct.event_session_id = event_session_obj?.id;
$events_slct.event_session_obj = event_session_obj;
// slct__event_session_id = event_session_obj?.id;
// // $events_slct.event_session_id = event_session_obj?.id;
// data_url.searchParams.set('session_id', event_session_obj?.id);
ae_promises.slct_event_session_id = events_func.load_ae_obj_id__event_session({
api_cfg: $ae_api,
event_session_id: event_session_obj?.id,
inc_file_li: true,
inc_presentation_li: true,
inc_presenter_li: true,
log_lvl: log_lvl
})
.then(async (load_results) => {
console.log(`load_results = `, load_results);
// let new_url = data_url.toString();
// console.log(new_url);
// // goto(new_url, {replaceState: true}); // Updates the URL without reloading the page
// // goto(new_url, {replaceState: false}); // Updates the URL history without reloading the page
// loading__session_id_status = 'loading';
// let new_url = data_url.toString();
// console.log(new_url);
loading__session_id_status = false;
// // goto(new_url, {replaceState: true}); // Updates the URL history without reloading the page
// goto(new_url, {replaceState: false});
});
// // $events_slct.event_session_id = event_session_obj?.id;
// $events_slct.event_session_obj = event_session_obj;
// ae_promises.slct__event_session_id = events_func.load_ae_obj_id__event_session({
// api_cfg: $ae_api,
// event_session_id: event_session_obj?.id,
// inc_file_li: true,
// inc_presentation_li: true,
// inc_presenter_li: true,
// log_lvl: log_lvl
// })
// .then(async (load_results) => {
// console.log(`load_results = `, load_results);
// // let new_url = data_url.toString();
// // console.log(new_url);
// loading__session_id_status = false;
// // // goto(new_url, {replaceState: true}); // Updates the URL history without reloading the page
// // goto(new_url, {replaceState: false});
// });
if ($events_loc.launcher.controller == 'local_push') {
console.log(`Local Push Controller Command: ae_load:event_session=${event_session_obj?.id}`);
$events_sess.launcher.controller_cmd = `ae_load:event_session=${event_session_obj?.id}`;
$events_sess.launcher.controller_trigger_send = true;
}
// if ($events_loc.launcher.controller == 'local_push') {
// console.log(`Local Push Controller Command: ae_load:event_session=${event_session_obj?.id}`);
// $events_sess.launcher.controller_cmd = `ae_load:event_session=${event_session_obj?.id}`;
// $events_sess.launcher.controller_trigger_send = true;
// }
}}
class="
btn btn-sm hover:preset-filled-primary-500
@@ -190,10 +288,10 @@ let hover_timer: any = $state(null);
flex flex-row items-center justify-start
transition-all
"
class:preset-filled-primary-500={$events_slct.event_session_id === event_session_obj?.id}
class:preset-tonal-secondary={$events_slct.event_session_id != event_session_obj?.id}
class:border-secondary-500={$events_slct.event_session_id != event_session_obj?.id}
class:font-bold={$events_slct.event_session_id === event_session_obj?.id}
class:preset-filled-primary-500={slct__event_session_id === event_session_obj?.id}
class:preset-tonal-secondary={slct__event_session_id != event_session_obj?.id}
class:border-secondary-500={slct__event_session_id != event_session_obj?.id}
class:font-bold={slct__event_session_id === event_session_obj?.id}
class:hidden={!$events_loc.launcher.show_content__hidden_sessions && event_session_obj?.hide}
class:dim={event_session_obj?.hide}
@@ -205,14 +303,14 @@ let hover_timer: any = $state(null);
<span
class="border-r border-surface-400-600 pr-1 min-w-28"
>
{#if $events_slct.event_session_id === event_session_obj?.id}
{#if slct__event_session_id === event_session_obj?.id}
<span class="fas fa-calendar-check"></span>
{:else}
<span class="fas fa-calendar-alt"></span>
{/if}
<span
class="text-xs"
class:hidden={$events_slct.event_session_id === event_session_obj?.id}
class:hidden={slct__event_session_id === event_session_obj?.id}
>
{ae_util.iso_datetime_formatter(event_session_obj?.start_datetime, 'week_medium')}
</span>

38
src/routes/events/[event_id]/+layout.ts
View File

@@ -15,14 +15,6 @@ export async function load({ params, parent }) { // route
let account_id = data.account_id;
let ae_acct = data[account_id];
// console.log(`ae_acct = `, ae_acct);
// if (!account_id) {
// console.log(`events_pres_mgmt_event [event_id] +page.ts: The account_id was not found in the data!!!`);
// return false;
// }
// data.ae_events_pres_mgmt_event_event_id_page_ts = true;
let event_id = params.event_id;
if (!event_id) {
@@ -34,12 +26,6 @@ export async function load({ params, parent }) { // route
ae_acct.slct.event_id = event_id;
// let load_event_obj = events_func.handle_load_ae_obj_id__event({
// api_cfg: ae_acct.api, event_id: event_id, try_cache: true
// });
// ae_acct.slct.event_obj = await load_event_obj;
if (browser) {
let load_event_obj = await events_func.load_ae_obj_id__event({
api_cfg: ae_acct.api,
@@ -66,31 +52,9 @@ export async function load({ params, parent }) { // route
}
console.log(`load_event_obj = `, load_event_obj);
ae_acct.slct.event_obj = load_event_obj;
ae_acct.slct.event_device_obj_li = load_event_obj.event_device_obj_li;
// ae_acct.slct.event_device_obj_li = load_event_obj.event_device_obj_li;
ae_acct.slct.event_location_obj_li = load_event_obj.event_location_obj_li;
ae_acct.slct.event_session_obj_li = load_event_obj.event_session_obj_li;
// let load_event_session_obj_li = events_func.load_ae_obj_li__event_session({
// api_cfg: ae_acct.api,
// for_obj_type: 'event',
// for_obj_id: event_id,
// params: {qry__enabled: 'enabled', qry__hidden: 'all', qry__limit: 200},
// try_cache: true,
// log_lvl: log_lvl
// });
// console.log(`load_event_session_obj_li = `, load_event_session_obj_li);
// ae_acct.slct.event_session_obj_li = load_event_session_obj_li;
// let load_event_location_obj_li = events_func.load_ae_obj_li__event_location({
// api_cfg: ae_acct.api,
// for_obj_type: 'event',
// for_obj_id: event_id,
// params: {qry__enabled: 'enabled', qry__hidden: 'all', qry__limit: 200},
// try_cache: true,
// log_lvl: log_lvl
// });
// console.log(`load_event_location_obj_li = `, load_event_location_obj_li);
// ae_acct.slct.event_location_obj_li = load_event_location_obj_li;
}
// WARNING: Precaution against shared data between sites and sessions.

5
src/routes/events/[event_id]/+page.svelte
View File

@@ -392,8 +392,9 @@ async function handle_search__event_session(
<svelte:head>
<title>
Event: {ae_util.shorten_string({string: $lq__event_obj?.name, max_length: 12})}
({$lq__event_obj?.event_id}) - Pres Mgmt - {$events_loc?.title}
&AElig;:
{ae_util.shorten_string({string: $lq__event_obj?.name, max_length: 12})}
- Pres Mgmt - {$events_loc?.title}
</title>
</svelte:head>

20
src/routes/journals/+page.svelte
View File

@@ -44,17 +44,17 @@ let ae_acct = data[$slct.account_id];
let lq__journal_obj_li = $derived(liveQuery(async () => {
let results = await db_journals.journal
.where('person_id')
.equals($ae_loc.person_id)
// .sortBy('group')
// .sortBy('priority')
// .sortBy('sort')
.reverse()
.sortBy('tmp_sort_3')
.where('person_id')
.equals($ae_loc.person_id)
// .sortBy('group')
// .sortBy('priority')
// .sortBy('sort')
.reverse()
.sortBy('tmp_sort_3')
// .orderBy('tmp_sort_3')
// .reverse()
// .toArray()
// .orderBy('tmp_sort_3')
// .reverse()
// .toArray()
// .sortBy('start_datetime')