From 79a74db4aef88f415c7b1c8e10796b4fce6a2cfe Mon Sep 17 00:00:00 2001 From: Scott Idem Date: Tue, 15 Oct 2024 11:11:33 -0400 Subject: [PATCH] Improving the reports --- src/lib/ae_events__event_presenter.ts | 2 +- src/lib/ae_events__event_session.ts | 53 +++++ .../events/[event_id]/reports/+page.svelte | 200 ++++++++++++++---- 3 files changed, 208 insertions(+), 47 deletions(-) diff --git a/src/lib/ae_events__event_presenter.ts b/src/lib/ae_events__event_presenter.ts index d3685710..f731f28e 100644 --- a/src/lib/ae_events__event_presenter.ts +++ b/src/lib/ae_events__event_presenter.ts @@ -450,7 +450,7 @@ export async function search__event_presenter( params_json['and_qry'] = {}; - if (agree) { + if (agree === true || agree === false) { params_json['and_qry']['agree'] = agree; } diff --git a/src/lib/ae_events__event_session.ts b/src/lib/ae_events__event_session.ts index 6260b869..eabbc8b5 100644 --- a/src/lib/ae_events__event_session.ts +++ b/src/lib/ae_events__event_session.ts @@ -409,6 +409,8 @@ export async function qry__event_session( qry_str, qry_files, qry_start_datetime, // Example greater than: '2024-10-24' + qry_poc_agree = null, + qry_poc_kv_json, enabled = 'enabled', hidden = 'not_hidden', limit = 50, @@ -422,6 +424,8 @@ export async function qry__event_session( qry_str?: string, qry_files?: null|boolean, qry_start_datetime?: null|string, // Greater than this datetime + qry_poc_agree?: null|boolean, + qry_poc_kv_json?: null|boolean, // Key value pairs for the point of contact enabled?: string, // all, disabled, enabled hidden?: string, // all, hidden, not_hidden limit?: number, @@ -478,6 +482,55 @@ export async function qry__event_session( params_json['qry'].push(qry_param); } + if (qry_poc_agree === true) { + let qry_param = + { + type: "AND", + field: "poc_agree", + operator: "=", + value: true + }; + params_json['qry'].push(qry_param); + } else if (qry_poc_agree === false) { + // let qry_param = + // { + // type: "AND", + // field: "poc_agree", + // operator: "IS", + // value: null + // }; + // params_json['qry'].push(qry_param); + let qry_param = + { + type: "AND", + field: "poc_agree", + operator: "=", + value: false + }; + params_json['qry'].push(qry_param); + } + + + if (qry_poc_kv_json === true) { + let qry_param = + { + type: "AND", + field: "poc_kv_json", + operator: "IS NOT", + value: null + }; + params_json['qry'].push(qry_param); + } else if (qry_poc_kv_json === false) { + let qry_param = + { + type: "AND", + field: "poc_kv_json", + operator: "IS", + value: null + }; + params_json['qry'].push(qry_param); + } + let order_by_li = {'priority': 'DESC', 'sort': 'DESC', 'start_datetime': 'ASC', 'name': 'ASC', 'updated_on': 'DESC', 'created_on': 'DESC'}; ae_promises.load__event_session_obj_li = await api.get_ae_obj_li_for_obj_id_crud_v2({ diff --git a/src/routes/events/[event_id]/reports/+page.svelte b/src/routes/events/[event_id]/reports/+page.svelte index 7ab5d1cc..740e86e9 100644 --- a/src/routes/events/[event_id]/reports/+page.svelte +++ b/src/routes/events/[event_id]/reports/+page.svelte @@ -226,8 +226,8 @@ async function handle_search__event_presenter( 'qry__hidden': $events_loc.pres_mgmt.qry_hidden ?? 'not_hidden', 'qry__limit': $events_loc.pres_mgmt.qry_limit__presenters ?? 200, }, - try_cache=true, - log_lvl=0, + try_cache = true, + log_lvl = 0, }: { agree?: null|boolean, biography?: null|boolean, @@ -302,23 +302,31 @@ async function handle_search__event_presenter( }); } + +// Updated 2024-10-15 async function handle_qry__event_session( { - qry_files = false, + qry_files = null, // file_count = false, // file_count_all = null, // ft_search_str = '', // lk_search_str = '', + qry_poc_agree = null, + qry_poc_kv_json = null, + qry_poc_bios = null, enabled = $events_loc.pres_mgmt.qry_enabled ?? 'enabled', hidden = $events_loc.pres_mgmt.qry_hidden ?? 'not_hidden', limit = $events_loc.pres_mgmt.qry_limit__sessions ?? 150, - log_lvl=0, + log_lvl = 0, }: { - qry_files?: boolean, + qry_files?: null|boolean, // file_count?: boolean, // file_count_all?: null|number, // ft_search_str?: string, // lk_search_str?: string, + qry_poc_agree?: null|boolean, + qry_poc_kv_json?: null|boolean, + qry_poc_bios?: null|boolean, enabled?: string, hidden?: string, limit?: number, @@ -339,6 +347,8 @@ async function handle_qry__event_session( // external_event_id: $events_loc.pres_mgmt.default__external_registration_id, qry_files: qry_files, qry_start_datetime: null, + qry_poc_agree: qry_poc_agree, + qry_poc_kv_json: qry_poc_kv_json, enabled: enabled, hidden: hidden, limit: limit, @@ -366,7 +376,17 @@ async function handle_qry__event_session( let tmp_li = []; // This is to prevent the array from constantly updating and triggering the liveQuery. if ($events_slct.event_session_obj_li) { for (let i = 0; i < $events_slct.event_session_obj_li.length; i++) { - tmp_li.push($events_slct.event_session_obj_li[i].event_session_id_random); + if (qry_poc_bios && $events_slct.event_session_obj_li[i].poc_kv_json) { + if ($events_slct.event_session_obj_li[i].poc_kv_json['champion']?.biography.length > 1) { + console.log(`Biography for session:`, $events_slct.event_session_obj_li[i]); + tmp_li.push($events_slct.event_session_obj_li[i].event_session_id_random); + } else { + console.log(`No biography for session:`, $events_slct.event_session_obj_li[i]); + } + } else { + // console.log(`Pushing session to array (no biography):`, $events_slct.event_session_obj_li[i]); + tmp_li.push($events_slct.event_session_obj_li[i].event_session_id_random); + } } } event_session_id_random_li = tmp_li; @@ -428,56 +448,132 @@ async function handle_qry__event_session(
+ + + + + + - + + + +