General clean up

src/lib/ae_events__event_session.ts

@@ -10,7 +10,7 @@ let ae_promises: key_val = {};
 
 
 // Updated 2024-08-09
-export async function handle_load_ae_obj_id__event_session(
+export async function load_ae_obj_id__event_session(
         {
             api_cfg,
             event_session_id,
@@ -27,7 +27,7 @@ export async function handle_load_ae_obj_id__event_session(
             log_lvl?: number
         }
     ) {
-    console.log(`*** handle_load_ae_obj_id__event_session() *** event_session_id=${event_session_id}`);
+    console.log(`*** load_ae_obj_id__event_session() *** event_session_id=${event_session_id}`);
 
     let params = {};
 
@@ -273,13 +273,17 @@ export async function handle_load_ae_obj_li__event_session(
 
 // This new function is using CRUD v2. This should allow for more flexibility in the queries.
 // Updated 2024-08-14
-export async function handle_qry__event_session(
+export async function qry__event_session(
         {
             api_cfg,
             event_id,
             qry_str,
             qry_files,
             qry_start_datetime, // Example greater than: '2024-10-24'
+            enabled = 'enabled',
+            hidden = 'not_hidden',
+            limit = 50,
+            offset = 0,
             params = {},
             try_cache = true,
             log_lvl = 0
@@ -288,18 +292,22 @@ export async function handle_qry__event_session(
             event_id: any,
             qry_str?: string,
             qry_files?: null|boolean,
-            qry_start_datetime?: null|string,
+            qry_start_datetime?: null|string, // Greater than this datetime
+            enabled?: string, // all, disabled, enabled
+            hidden?: string, // all, hidden, not_hidden
+            limit?: number,
+            offset?: number,
             params?: any,
             try_cache?: boolean,
             log_lvl?: number
         }
     ) {
-    console.log(`*** handle_qry__event_session() *** event_id=${event_id} qry_str=${qry_str}`);
+    console.log(`*** qry__event_session() *** event_id=${event_id} qry_str=${qry_str}`);
 
-    let enabled: string = (params.qry__enabled ?? 'enabled'); // all, disabled, enabled
+    // let enabled: string = (params.qry__enabled ?? 'enabled'); // all, disabled, enabled
-    let hidden: string = (params.qry__hidden ?? 'not_hidden'); // all, hidden, not_hidden
+    // let hidden: string = (params.qry__hidden ?? 'not_hidden'); // all, hidden, not_hidden
-    let limit: number = (params.qry__limit ?? 25); // 99
+    // let limit: number = (params.qry__limit ?? 25); // 99
-    let offset: number = (params.qry__offset ?? 0); // 0
+    // let offset: number = (params.qry__offset ?? 0); // 0
 
     let params_json: key_val = {};
 

src/lib/ae_events_functions.ts

@@ -35,9 +35,9 @@ import {
 } from "$lib/ae_events__event_location";
 
 import {
-    handle_load_ae_obj_id__event_session,
+    load_ae_obj_id__event_session,
     handle_load_ae_obj_li__event_session,
-    handle_qry__event_session,
+    qry__event_session,
     handle_search__event_session,
     handle_db_save_ae_obj_li__event_session,
     handle_email_sign_in__event_session,
@@ -86,9 +86,9 @@ let export_obj = {
     handle_create_ae_obj__event_location: handle_create_ae_obj__event_location,
     handle_db_save_ae_obj_li__event_location: handle_db_save_ae_obj_li__event_location,
 
-    handle_load_ae_obj_id__event_session: handle_load_ae_obj_id__event_session,
+    load_ae_obj_id__event_session: load_ae_obj_id__event_session,
     handle_load_ae_obj_li__event_session: handle_load_ae_obj_li__event_session,
-    handle_qry__event_session: handle_qry__event_session,
+    qry__event_session: qry__event_session,
     handle_search__event_session: handle_search__event_session,
     handle_email_sign_in__event_session: handle_email_sign_in__event_session,
     handle_db_save_ae_obj_li__event_session: handle_db_save_ae_obj_li__event_session,

src/routes/core/+layout.svelte

@@ -48,7 +48,7 @@ onMount(() => {
 //     $events_trigger = null;
 
 //     if ($events_slct.event_session_id) {
-//         $events_trig_kv['event_session_id'] = events_func.handle_load_ae_obj_id__event_session({
+//         $events_trig_kv['event_session_id'] = ({
 //             api_cfg: $ae_api,
 //             event_session_id: $events_slct.event_session_id,
 //             log_lvl: 1

src/routes/events_pres_mgmt/(launcher)/launcher/[slug]/launcher_session_view.svelte

@@ -26,7 +26,7 @@ export let lq__event_location_obj: any;
 // export let lq_get__event_presenter_obj_li: any;
 export let lq__event_session_obj: any;
 
-// let load_event_session_obj = events_func.handle_load_ae_obj_id__event_session({
+// let load_event_session_obj = ({
 //     api_cfg: $ae_api,
 //     event_session_id: $events_loc.launcher.slct.event_session_id,
 //     inc_presenter_li: false,

src/routes/events_pres_mgmt/(launcher)/launcher/[slug]/menu_session_list.svelte

@@ -66,7 +66,7 @@ let hover_timer: any = null;
                     $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.handle_load_ae_obj_id__event_session({
+                    ae_promises.slct_event_session_id = ({
                         api_cfg: $ae_api,
                         event_session_id: event_session_obj?.id,
                         inc_file_li: true,
@@ -96,7 +96,7 @@ let hover_timer: any = null;
                 $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.handle_load_ae_obj_id__event_session({
+                ae_promises.slct_event_session_id = ({
                     api_cfg: $ae_api,
                     event_session_id: event_session_obj?.id,
                     inc_file_li: true,

src/routes/events_pres_mgmt/+layout.svelte

@@ -58,7 +58,7 @@ onMount(() => {
 //     $events_trigger = null;
 
 //     if ($events_slct.event_session_id) {
-//         $events_trig_kv['event_session_id'] = events_func.handle_load_ae_obj_id__event_session({
+//         $events_trig_kv['event_session_id'] = ({
 //             api_cfg: $ae_api,
 //             event_session_id: $events_slct.event_session_id,
 //             log_lvl: 1

src/routes/events_pres_mgmt/ae_comp__event_session_obj_li.svelte

@@ -259,7 +259,7 @@ let lq_kv__event_session_obj_li = liveQuery(
             on:ae_crud_updated={e => {
                 console.log(`ae_crud_updated:`, e.detail);
 
-                events_func.handle_load_ae_obj_id__event_session({
+                ({
                     api_cfg: $ae_api,
                     event_session_id: $events_slct?.event_session_id,
                     log_lvl: 1

src/routes/events_pres_mgmt/event/[slug]/reports/+page.svelte

@@ -225,11 +225,9 @@ async function handle_qry__event_session(
             // file_count_all = null,
             // ft_search_str = '',
             // lk_search_str = '',
-            params = {
+            enabled = $events_loc.pres_mgmt.qry_enabled ?? 'enabled',
-                'qry__enabled': $events_loc.pres_mgmt.qry_enabled ?? 'enabled',
+            hidden = $events_loc.pres_mgmt.qry_hidden ?? 'not_hidden',
-                'qry__hidden': $events_loc.pres_mgmt.qry_hidden ?? 'not_hidden',
+            limit = $events_loc.pres_mgmt.qry_limit__session ?? 150,
-                'qry__limit': $events_loc.pres_mgmt.qry_limit__session ?? 150,
-            },
             log_lvl=2,
         }: {
             qry_files?: boolean,
@@ -246,7 +244,7 @@ async function handle_qry__event_session(
     $events_sess.pres_mgmt.status_qry__search = 'loading';
     $events_sess.pres_mgmt.status_rpt[$events_sess.pres_mgmt.show_report] = 'loading';
 
-    ae_promises.handle_qry__event_session = events_func.handle_qry__event_session({
+    ae_promises.handle_qry__event_session = events_func.qry__event_session({
         api_cfg: $ae_api,
         event_id: $events_slct.event_id,
         // file_count_all: file_count_all,
@@ -254,7 +252,10 @@ async function handle_qry__event_session(
         // like_search_qry_str: lk_search_str,
         // external_event_id: $events_loc.pres_mgmt.default__external_registration_id,
         qry_files: qry_files,
-        params: params,
+        qry_start_datetime: null,
+        enabled: enabled,
+        hidden: hidden,
+        limit: limit,
         log_lvl: log_lvl,
     })
     .then(function (search_results) {

src/routes/events_pres_mgmt/session/[slug]/+page.ts

@@ -33,7 +33,7 @@ export async function load({ params, parent }) { // route
 
     if (browser) {
         // Load event session object
-        let load_event_session_obj = events_func.handle_load_ae_obj_id__event_session({
+        let load_event_session_obj = ({
             api_cfg: ae_acct.api,
             event_session_id:  event_session_id,
             try_cache: true

src/routes/events_pres_mgmt/session_page_menu.svelte

@@ -150,7 +150,7 @@ let ae_triggers: key_val = {};
             on:ae_crud_updated={e => {
                 console.log(`ae_crud_updated:`, e.detail);
 
-                events_func.handle_load_ae_obj_id__event_session({
+                ({
                     api_cfg: $ae_api,
                     event_session_id: $lq__event_session_obj?.event_session_id_random,
                     log_lvl: log_lvl
@@ -204,7 +204,7 @@ let ae_triggers: key_val = {};
             on:ae_crud_updated={e => {
                 console.log(`ae_crud_updated:`, e.detail);
 
-                events_func.handle_load_ae_obj_id__event_session({
+                ({
                     api_cfg: $ae_api,
                     event_session_id: $lq__event_session_obj?.event_session_id_random,
                     log_lvl: log_lvl
@@ -257,7 +257,7 @@ let ae_triggers: key_val = {};
             on:ae_crud_updated={e => {
                 console.log(`ae_crud_updated:`, e.detail);
 
-                events_func.handle_load_ae_obj_id__event_session({
+                ({
                     api_cfg: $ae_api,
                     event_session_id: $lq__event_session_obj?.event_session_id_random,
                     log_lvl: log_lvl

src/routes/events_pres_mgmt/session_view.svelte

@@ -148,7 +148,7 @@ $: if ($lq__event_session_obj) {
             on:ae_crud_updated={e => {
                 console.log(`ae_crud_updated:`, e.detail);
 
-                events_func.handle_load_ae_obj_id__event_session({
+                ({
                     api_cfg: $ae_api,
                     event_session_id: $lq__event_session_obj?.event_session_id_random,
                     log_lvl: 1
@@ -177,7 +177,7 @@ $: if ($lq__event_session_obj) {
             on:ae_crud_updated={e => {
                 console.log(`ae_crud_updated:`, e.detail);
 
-                events_func.handle_load_ae_obj_id__event_session({
+                ({
                     api_cfg: $ae_api,
                     event_session_id: $lq__event_session_obj?.event_session_id_random,
                     log_lvl: 1
@@ -213,7 +213,7 @@ $: if ($lq__event_session_obj) {
             on:ae_crud_updated={e => {
                 console.log(`ae_crud_updated:`, e.detail);
 
-                events_func.handle_load_ae_obj_id__event_session({
+                ({
                     api_cfg: $ae_api,
                     event_session_id: $lq__event_session_obj?.event_session_id_random
                     });
@@ -241,7 +241,7 @@ $: if ($lq__event_session_obj) {
             on:ae_crud_updated={e => {
                 console.log(`ae_crud_updated:`, e.detail);
 
-                events_func.handle_load_ae_obj_id__event_session({
+                ({
                     api_cfg: $ae_api,
                     event_session_id: $lq__event_session_obj?.event_session_id_random
                     });
@@ -287,7 +287,7 @@ $: if ($lq__event_session_obj) {
             on:ae_crud_updated={e => {
                 console.log(`ae_crud_updated:`, e.detail);
 
-                events_func.handle_load_ae_obj_id__event_session({
+                ({
                     api_cfg: $ae_api,
                     event_session_id: $lq__event_session_obj?.event_session_id_random,
                     log_lvl: 1
@@ -421,7 +421,7 @@ $: if ($lq__event_session_obj) {
             on:ae_crud_updated={e => {
                 console.log(`ae_crud_updated:`, e.detail);
 
-                events_func.handle_load_ae_obj_id__event_session({
+                ({
                     api_cfg: $ae_api,
                     event_session_id: $lq__event_session_obj?.event_session_id_random,
                     log_lvl: 1
@@ -625,7 +625,7 @@ $: if ($lq__event_session_obj) {
         on:ae_crud_updated={e => {
             console.log(`ae_crud_updated:`, e.detail);
 
-            events_func.handle_load_ae_obj_id__event_session({
+            ({
                 api_cfg: $ae_api,
                 event_session_id: $lq__event_session_obj?.event_session_id_random,
                 log_lvl: 1