From f842392aacfdbbec012e94e7aa2f0794033c8ac4 Mon Sep 17 00:00:00 2001 From: Scott Idem Date: Mon, 8 Sep 2025 17:43:30 -0400 Subject: [PATCH] More work on reports and config options --- package.json | 2 +- src/lib/ae_api/api_get__crud_obj_li_v2.ts | 4 +- src/lib/ae_events/ae_events__event_file.ts | 6 +- .../events/[event_id]/reports/+page.svelte | 228 ++++++++++-------- .../events/ae_comp__events_menu_opts.svelte | 6 +- 5 files changed, 144 insertions(+), 102 deletions(-) diff --git a/package.json b/package.json index f0eb1ecb..7053cf02 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "osit-aether-app-svelte", - "version": "3.1.0", + "version": "3.1.1", "description": "One Sky IT's Aether App created with Svelte, SvelteKit, Tailwind CSS, Lucide, Font Awesome, and Skeleton UI. -Scott Idem", "homepage": "https://oneskyit.com/", "private": true, diff --git a/src/lib/ae_api/api_get__crud_obj_li_v2.ts b/src/lib/ae_api/api_get__crud_obj_li_v2.ts index 587c1188..bdf54f45 100644 --- a/src/lib/ae_api/api_get__crud_obj_li_v2.ts +++ b/src/lib/ae_api/api_get__crud_obj_li_v2.ts @@ -191,11 +191,11 @@ export async function get_ae_obj_li_for_obj_id_crud_v2( headers['order_by_li'] = JSON.stringify(order_by_li); } - if (limit >= 0) { + if (limit > 0) { params['limit'] = limit; } - if (offset >= 0) { + if (offset > 0) { params['offset'] = offset; } diff --git a/src/lib/ae_events/ae_events__event_file.ts b/src/lib/ae_events/ae_events__event_file.ts index 53469650..cec97425 100644 --- a/src/lib/ae_events/ae_events__event_file.ts +++ b/src/lib/ae_events/ae_events__event_file.ts @@ -387,7 +387,7 @@ export async function qry__event_file( qry_file_purpose = null, enabled = 'enabled', hidden = 'not_hidden', - limit = 50, + limit = 49, offset = 0, order_by_li = {'priority': 'DESC', 'sort': 'DESC', 'created_on': 'DESC', 'updated_on': 'DESC', 'filename': 'ASC', 'extension': 'ASC', 'hosted_file_size': 'ASC'}, params = {}, @@ -451,6 +451,10 @@ export async function qry__event_file( params_json['qry'].push(qry_param); } + // if (!limit || limit <= 0) { + // limit = null; + // } + if (log_lvl) { console.log('params_json:', params_json); } diff --git a/src/routes/events/[event_id]/reports/+page.svelte b/src/routes/events/[event_id]/reports/+page.svelte index b3f9413b..cf25d21d 100644 --- a/src/routes/events/[event_id]/reports/+page.svelte +++ b/src/routes/events/[event_id]/reports/+page.svelte @@ -122,6 +122,7 @@ async function handle_qry__event_file( file_purpose = null, ft_search_str = '', lk_search_str = '', + limit = $events_loc.pres_mgmt.qry_limit__files ?? 0, try_cache = true, log_lvl = 0, }: { @@ -130,6 +131,7 @@ async function handle_qry__event_file( file_purpose?: null|string, ft_search_str?: string, lk_search_str?: string, + limit?: number, try_cache?: boolean, log_lvl?: number, } @@ -195,7 +197,7 @@ async function handle_qry__event_file( // external_event_id: $events_loc.pres_mgmt.default__external_registration_id, enabled: $events_loc.pres_mgmt.qry_enabled ?? 'enabled', hidden: $events_loc.pres_mgmt.qry_hidden ?? 'not_hidden', - limit: $events_loc.pres_mgmt.qry_limit__files ?? 35, + limit: limit, // params: params, try_cache: try_cache, log_lvl: log_lvl, @@ -931,107 +933,117 @@ async function handle_qry__event_session( {#if $events_loc.pres_mgmt.show_report == 'presenters_overview' && $events_sess.event_presenter_obj_li} +

Presenters Overview - -

+ {#if $events_sess.pres_mgmt.status_rpt[$events_sess.pres_mgmt?.show_report] == 'loading'} + + Loading... + {/if} + +
+ + + }; + } else if ($events_loc.pres_mgmt.qry__presenter_sort == 'start_datetime') { + $events_loc.pres_mgmt.qry__presenter_order_by_li = { + 'event_presentation_start_datetime': 'ASC', + 'priority': 'DESC', + 'sort': 'DESC', + 'given_name': 'ASC', + 'family_name': 'ASC', + 'email': 'ASC', + 'updated_on': 'DESC', + 'created_on': 'DESC', + }; + } else { + $events_loc.pres_mgmt.qry__presenter_order_by_li = { + 'updated_on': 'DESC', + 'priority': 'DESC', + 'sort': 'DESC', + 'given_name': 'ASC', + 'family_name': 'ASC', + 'email': 'ASC', + 'created_on': 'DESC', + }; + } + ae_promises.handle_search__event_presenter = handle_search__event_presenter({ + // ft_search_str: '', + // lk_search_str: '', + order_by_li: $events_loc.pres_mgmt.qry__presenter_order_by_li, + log_lvl: log_lvl, + }); + $events_loc.pres_mgmt.show_report = 'presenters_overview'; + }} + > + + + + + + + + + + +
+ +
-
{ handle_qry__event_file({ @@ -1130,6 +1142,32 @@ async function handle_qry__event_session( {/each} {/if} + + + + +
diff --git a/src/routes/events/ae_comp__events_menu_opts.svelte b/src/routes/events/ae_comp__events_menu_opts.svelte index a72017da..ab6ae782 100644 --- a/src/routes/events/ae_comp__events_menu_opts.svelte +++ b/src/routes/events/ae_comp__events_menu_opts.svelte @@ -57,7 +57,7 @@ export let hide: boolean = true; @@ -105,7 +105,7 @@ export let hide: boolean = true;