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

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}
/>