diff --git a/src/routes/events/[event_id]/presenter/ae_comp__event_presenter_obj_tbl.svelte b/src/routes/events/[event_id]/presenter/ae_comp__event_presenter_obj_tbl.svelte index 3a835290..5cb729a9 100644 --- a/src/routes/events/[event_id]/presenter/ae_comp__event_presenter_obj_tbl.svelte +++ b/src/routes/events/[event_id]/presenter/ae_comp__event_presenter_obj_tbl.svelte @@ -4,20 +4,20 @@ interface Props { container_class_li?: string|Array; // export let event_presenter_id_random_li: Array; lq__event_presenter_obj_li: any; - log_lvl?: number; // export let allow_moderator: boolean = false; show_presentation_fields?: boolean; show_session_fields?: boolean; hide_session_code?: boolean; + log_lvl?: number; } let { container_class_li = [], lq__event_presenter_obj_li, - log_lvl = $bindable(0), show_presentation_fields = false, show_session_fields = false, hide_session_code = false, + log_lvl = $bindable(0), }: Props = $props(); diff --git a/src/routes/events/[event_id]/presenter/ae_comp__event_presenter_obj_tbl_wrapper.svelte b/src/routes/events/[event_id]/presenter/ae_comp__event_presenter_obj_tbl_wrapper.svelte index bff7c1c7..0fc62cb6 100644 --- a/src/routes/events/[event_id]/presenter/ae_comp__event_presenter_obj_tbl_wrapper.svelte +++ b/src/routes/events/[event_id]/presenter/ae_comp__event_presenter_obj_tbl_wrapper.svelte @@ -8,10 +8,10 @@ interface Props { link_to_type?: string; link_to_id?: string; // export let lq__event_presentation_obj - log_lvl?: number; show_presentation_fields?: boolean; show_session_fields?: boolean; hide_session_code?: boolean; + log_lvl?: number; } let { @@ -21,10 +21,10 @@ let { event_presenter_obj_li = $bindable(), link_to_type, link_to_id, - log_lvl = $bindable(0), show_presentation_fields = false, show_session_fields = false, hide_session_code = false, + log_lvl = $bindable(0), }: Props = $props(); @@ -48,7 +48,7 @@ if (log_lvl) { let event_presenter_id_random_li: Array = $state([]); let dq__where_type_id_val: string = `${link_to_type}_id_random`; -let dq__where_eq_id_val: string = link_to_id; +let dq__where_eq_id_val: string = link_to_id ?? ''; // *** Functions and Logic diff --git a/src/routes/events/[event_id]/reports/+page.svelte b/src/routes/events/[event_id]/reports/+page.svelte index 89bad0e4..03923d71 100644 --- a/src/routes/events/[event_id]/reports/+page.svelte +++ b/src/routes/events/[event_id]/reports/+page.svelte @@ -22,7 +22,8 @@ import { events_func } from '$lib/ae_events_functions'; import Event_reports_page_menu from './event_reports_page_menu.svelte'; import Reports_sessions from './reports_sessions.svelte'; import Reports_presenters from './reports_presenters.svelte'; -import Comp_event_file_obj_tbl from '../../ae_comp__event_file_obj_tbl.svelte'; +import Reports_files from './reports_files.svelte'; +// import Comp_event_file_obj_tbl from '../../ae_comp__event_file_obj_tbl.svelte'; // Quickly save the data passed from the parent(s) to the Svelte stores, localStorage, and other. @@ -88,19 +89,19 @@ let ae_triggers: key_val = {}; // lk_search_str: '', // log_lvl: log_lvl, // }); -if ($events_loc.pres_mgmt.show_report == 'recent_files') { - handle_qry__event_file({ - created_on_offset: $events_loc.pres_mgmt.qry__files_offset_seconds ?? 0, - file_purpose: $events_loc.pres_mgmt.qry__files_purpose ?? null, - log_lvl: 0, - }); -} else if ($events_loc.pres_mgmt.show_report == 'large_files') { - handle_qry__event_file({ - min_file_size: $events_loc.pres_mgmt.qry__files_min_size ?? 100000000, // in bytes - file_purpose: $events_loc.pres_mgmt.qry__files_purpose ?? null, - log_lvl: log_lvl, - }); -} +// if ($events_loc.pres_mgmt.show_report == 'recent_files') { +// handle_qry__event_file({ +// created_on_offset: $events_loc.pres_mgmt.qry__files_offset_seconds ?? 0, +// file_purpose: $events_loc.pres_mgmt.qry__files_purpose ?? null, +// log_lvl: 0, +// }); +// } else if ($events_loc.pres_mgmt.show_report == 'large_files') { +// handle_qry__event_file({ +// min_file_size: $events_loc.pres_mgmt.qry__files_min_size ?? 100000000, // in bytes +// file_purpose: $events_loc.pres_mgmt.qry__files_purpose ?? null, +// log_lvl: log_lvl, +// }); +// } // onMount(() => { // console.log('Events Event [slug] Reports: +page.svelte'); @@ -762,7 +763,6 @@ async function handle_qry__event_session( disabled={!$ae_loc.trusted_access} onclick={() => { handle_search__event_presenter({ - ft_search_str: '', lk_search_str: '', log_lvl: log_lvl, @@ -791,10 +791,11 @@ async function handle_qry__event_session( onclick={() => { handle_qry__event_file({ created_on_offset: $events_loc.pres_mgmt.qry__files_offset_seconds ?? 0, - log_lvl: 0, + log_lvl: log_lvl, }); $events_loc.pres_mgmt.show_report = 'recent_files'; }} + class:hidden={$lq__event_obj?.mod_pres_mgmt_json?.hide__report_kv.recent_files} class="btn btn-sm preset-tonal-success border border-success-500 hover:preset-filled-success-500 transition-all m-1" title="Show recent file uploads." > @@ -816,6 +817,7 @@ async function handle_qry__event_session( }); $events_loc.pres_mgmt.show_report = 'large_files'; }} + class:hidden={$lq__event_obj?.mod_pres_mgmt_json?.hide__report_kv.large_files} class="btn btn-sm preset-tonal-success border border-success-500 hover:preset-filled-success-500 transition-all m-1" title="Show large file uploads." > @@ -1144,8 +1146,32 @@ async function handle_qry__event_session( {/if} --> + + + +{#if $events_loc.pres_mgmt.show_report == 'recent_files' || $events_loc.pres_mgmt.show_report == 'large_files'} + +{/if} + + -{#if $events_loc.pres_mgmt.show_report == 'recent_files' && event_file_id_random_li} +{#if 1==3 && $events_loc.pres_mgmt.show_report == 'recent_files' && event_file_id_random_li}

Recent File Uploads @@ -1267,7 +1293,7 @@ async function handle_qry__event_session( This report is new and still being tested.

--> - - + --> {/if} -{#if $events_loc.pres_mgmt.show_report == 'large_files' && event_file_id_random_li} +{#if 1==3 && $events_loc.pres_mgmt.show_report == 'large_files' && event_file_id_random_li}

Large File Uploads @@ -1354,7 +1380,7 @@ async function handle_qry__event_session(

- - + --> {/if} {/if} - - - - - diff --git a/src/routes/events/[event_id]/reports/reports_files.svelte b/src/routes/events/[event_id]/reports/reports_files.svelte new file mode 100644 index 00000000..925abdb7 --- /dev/null +++ b/src/routes/events/[event_id]/reports/reports_files.svelte @@ -0,0 +1,501 @@ + + + + +{#if rpt__name == 'recent_files'} +
+

+ {#if qry__status == 'loading'} + + + {:else} + + {/if} + Recent File Uploads +

+ +
+ + + + + + + + +
+ +
+{/if} + + + +{#if rpt__name == 'large_files'} +
+

+ {#if qry__status == 'loading'} + + + {:else} + + {/if} + Large File Uploads +

+ + +
+ + + +
+
+{/if} + + +{#if event_file_obj_li} + + +{/if} diff --git a/src/routes/events/ae_comp__event_file_obj_tbl.svelte b/src/routes/events/ae_comp__event_file_obj_tbl.svelte index a28abe0a..d5070fb7 100644 --- a/src/routes/events/ae_comp__event_file_obj_tbl.svelte +++ b/src/routes/events/ae_comp__event_file_obj_tbl.svelte @@ -3,6 +3,7 @@ interface Props { // Exports container_class_li?: string|Array; event_file_id_random_li?: Array; + lq__event_file_obj_li: any; allow_basic?: boolean; allow_moderator?: boolean; // export let max_records: number = 100; @@ -12,18 +13,21 @@ interface Props { // export let show_presenter_fields: boolean = false; show_session_fields?: boolean; hide_session_code?: boolean; + log_lvl?: number; } let { container_class_li = [], event_file_id_random_li = [], + lq__event_file_obj_li, allow_basic = false, allow_moderator = false, - show_direct_download = false, + show_direct_download = $bindable(false), show_location_fields = false, show_presentation_fields = false, show_session_fields = false, - hide_session_code = false + hide_session_code = false, + log_lvl = $bindable(0), }: Props = $props(); // Imports @@ -46,17 +50,7 @@ import MyClipboard from '$lib/e_app_clipboard.svelte'; let ae_promises: key_val = $state({}); // *** Functions and Logic -// let lq__event_file_obj = liveQuery( -// () => db_events.files.get($events_slct.event_file_id) -// ); -let lq_kv__event_file_obj_li = $derived(liveQuery(async () => { -// let lq_kv__event_file_obj_li = liveQuery( - let results = await db_events.files - .bulkGet(event_file_id_random_li); - - return results; -})); // Define the list of unacceptable characters if not using the default. // const unacceptable_chars = /[ <>:"/\\|?*]/g; @@ -74,6 +68,7 @@ $effect(() => { // console.log('Element fits within the container. No horizontal scrolling.', horiz_check_element); } }); + @@ -84,31 +79,137 @@ $effect(() => { class="ae_comp event_file_obj_tbl {container_class_li} container overflow-auto max-w-screen"> -{#if event_file_id_random_li && $lq_kv__event_file_obj_li && $lq_kv__event_file_obj_li?.length > 0 && $lq_kv__event_file_obj_li?.length == event_file_id_random_li?.length} + +{#if $lq__event_file_obj_li && $lq__event_file_obj_li?.length}
-

- - Results: - +
+

+ + Results: + - {#if $lq_kv__event_file_obj_li.length} - + + {$lq__event_file_obj_li.length ?? 'None'}× + + {/if} +

+ +
- - {$lq_kv__event_file_obj_li.length ?? 'None'}× - + + + + + {#if show_session_fields} + + {:else} + {/if} -

+ + + {#if !hide_session_code} + + {:else} + + {/if} + + {#if show_presentation_fields} + + {:else} + + {/if} +
+ +

{ - {#each $lq_kv__event_file_obj_li as event_file_obj} + {#each $lq__event_file_obj_li as event_file_obj} diff --git a/src/routes/events/ae_comp__event_file_obj_tbl_wrapper.svelte b/src/routes/events/ae_comp__event_file_obj_tbl_wrapper.svelte new file mode 100644 index 00000000..4a3cbc12 --- /dev/null +++ b/src/routes/events/ae_comp__event_file_obj_tbl_wrapper.svelte @@ -0,0 +1,136 @@ + + + +{#if event_file_obj_li && event_file_obj_li?.length} + + + +{:else} +
+

No files available to show in table.

+
+{/if} \ No newline at end of file diff --git a/src/routes/events/ae_comp__event_session_obj_li_wrapper.svelte b/src/routes/events/ae_comp__event_session_obj_li_wrapper.svelte index c3138f6c..0f0c044d 100644 --- a/src/routes/events/ae_comp__event_session_obj_li_wrapper.svelte +++ b/src/routes/events/ae_comp__event_session_obj_li_wrapper.svelte @@ -34,7 +34,7 @@ if (log_lvl > 1) { // let ae_triggers: key_val = {}; let dq__where_type_id_val: string = `${link_to_type}_id_random`; -let dq__where_eq_id_val: string = link_to_id; +let dq__where_eq_id_val: string = link_to_id ?? ''; // *** Functions and Logic let lq__event_session_obj_li = $derived(liveQuery(async () => {
Filename - + {