diff --git a/src/lib/ae_events__event.ts b/src/lib/ae_events__event.ts index 2eff7d41..6734e129 100644 --- a/src/lib/ae_events__event.ts +++ b/src/lib/ae_events__event.ts @@ -74,6 +74,7 @@ export async function load_ae_obj_li__event( for_obj_type = 'account', for_obj_id, qry_conference = true, + qry_str = null, inc_file_li = false, inc_location_li = false, inc_presentation_li = false, @@ -88,6 +89,7 @@ export async function load_ae_obj_li__event( for_obj_type: string, for_obj_id: string, qry_conference?: boolean, + qry_str?: null|string, inc_file_li?: boolean, inc_location_li?: boolean, inc_presentation_li?: boolean, @@ -113,6 +115,15 @@ export async function load_ae_obj_li__event( if (qry_conference) { params_json['and_qry']['conference'] = qry_conference; + } else if (qry_conference === false) { + params_json['and_qry']['conference'] = qry_conference; + } + + if (qry_str) { + params_json['ft_qry'] = {}; + params_json['ft_qry']['default_qry_str'] = qry_str; + params_json['ft_qry']['location_address_json_ext'] = qry_str; + params_json['ft_qry']['contact_li_json_ext'] = qry_str; } // console.log('params_json:', params_json); diff --git a/src/lib/ae_idaa_stores.ts b/src/lib/ae_idaa_stores.ts index a6bda515..828b8e34 100644 --- a/src/lib/ae_idaa_stores.ts +++ b/src/lib/ae_idaa_stores.ts @@ -3,6 +3,7 @@ import { writable } from 'svelte/store'; import type { Writable } from 'svelte/store'; import type { key_val } from '$lib/ae_stores'; +import { offset } from '@floating-ui/dom'; // Set the version for the app data. Changing this should force a notification and ask the user to clear and reload the page. let ver = '2024-08-21_1646'; @@ -37,15 +38,25 @@ let idaa_local_data_struct: key_val = { 'qry__offset': 0, archives: { - + enabled: 'enabled', // all, disabled, enabled + hidden: 'not_hidden', // all, hidden, not_hidden + limit: 150, + offset: 0, }, bb: { + enabled: 'enabled', // all, disabled, enabled + hidden: 'not_hidden', // all, hidden, not_hidden + limit: 150, + offset: 0, show_list__post_obj_li: true, }, recovery_meetings: { - + enabled: 'enabled', // all, disabled, enabled + hidden: 'not_hidden', // all, hidden, not_hidden + limit: 150, + offset: 0, }, }; // console.log(`AE Stores - App IDAA Local Storage Data:`, idaa_local_data_struct); @@ -67,15 +78,16 @@ let idaa_session_data_struct: key_val = { log_lvl: 1, archives: { - + qry__status: null, }, bb: { - + qry__status: null, }, recovery_meetings: { - + qry__status: null, + qry__fulltext_str: null, }, }; diff --git a/src/routes/idaa/(idaa)/recovery_meetings/+page.svelte b/src/routes/idaa/(idaa)/recovery_meetings/+page.svelte index 0bd57026..a6693bab 100644 --- a/src/routes/idaa/(idaa)/recovery_meetings/+page.svelte +++ b/src/routes/idaa/(idaa)/recovery_meetings/+page.svelte @@ -19,12 +19,13 @@ import { liveQuery } from "dexie"; import { core_func } from '$lib/ae_core_functions'; import { db_events } from "$lib/db_events"; import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores'; -import { events_loc, events_sess, events_slct, events_trigger } from '$lib/ae_events_stores'; -import { events_func } from '$lib/ae_events_functions'; +// import { events_func } from '$lib/ae_events_functions'; +import Comp__event_obj_qry from './ae_idaa_comp__event_obj_qry.svelte'; import Comp__event_obj_li from './ae_idaa_comp__event_obj_li.svelte'; import Comp__event_obj_id_view from './ae_idaa_comp__event_obj_id_view.svelte'; +let event_id_random_li: Array; $: lq__event_obj_li = liveQuery(async () => { let results = await db_events.events @@ -42,6 +43,54 @@ $: lq__event_obj = liveQuery(async () => { return results; }); + + + +// Functions and Logic +$: lq_new__event_obj_li = liveQuery(async () => { + console.log('Trying... HERE!!! BEGIN'); + + let link_to_type: string = 'account'; + let link_to_id: string = $slct.account_id; + console.log(`link_to_type: ${link_to_type}; link_to_id: ${link_to_id}`); + + if (event_id_random_li?.length) { + console.log(`Trying bulkGet:`, event_id_random_li); + let results = await db_events.events + .bulkGet(event_id_random_li); + + return results; + } else if (link_to_type && link_to_id) { + console.log(`Trying where: ${link_to_type}; equals: ${link_to_id}`); + let results = await db_events.events + .where(`${link_to_type}_id`) + .equals(link_to_id) + .sortBy('name') + + return results; + } else { + console.log('Trying... Nothing to load'); + return null; + } + console.log('Trying... HERE!!! END'); +}); + +$: lq_bulk__event_obj_li = liveQuery(async () => { + console.log('Trying... HERE!!! BULK BEGIN'); + + if (event_id_random_li.length) { + console.log(`Trying bulkGet:`, event_id_random_li); + let results = await db_events.events + .bulkGet(event_id_random_li); + + return results; + } else { + console.log('Trying... Nothing to load'); + return null; + } + console.log('Trying... HERE!!! BULK END'); +}); + @@ -57,11 +106,17 @@ $: lq__event_obj = liveQuery(async () => { " > + -

Recovery Meetings {$lq__event_obj_li?.length}

-{#if $lq__event_obj_li && $lq__event_obj_li?.length } +

Recovery Meetings {$lq_new__event_obj_li?.length}

+ + + +{#if $lq_new__event_obj_li && $lq_new__event_obj_li?.length } {/if} diff --git a/src/routes/idaa/(idaa)/recovery_meetings/ae_idaa_comp__event_obj_qry.svelte b/src/routes/idaa/(idaa)/recovery_meetings/ae_idaa_comp__event_obj_qry.svelte new file mode 100644 index 00000000..1b5fa0e6 --- /dev/null +++ b/src/routes/idaa/(idaa)/recovery_meetings/ae_idaa_comp__event_obj_qry.svelte @@ -0,0 +1,394 @@ + + + +