+
Results:
@@ -381,10 +382,16 @@ function add_activity_log(
{:else}
- {#if $idaa_loc.recovery_meetings.qry_status === 'loading'}
-
Loading...
+ {#if $idaa_sess.recovery_meetings.qry__status === 'loading'}
+
+
+
+ xx Loading...
+
{:else}
-
No recovery meetings available to show. The search may need to be changed.
+
+ xx No recovery meetings available to show. The search may need to be changed.
+
{/if}
{/if}
diff --git a/src/routes/idaa/(idaa)/recovery_meetings/ae_idaa_comp__event_obj_li_wrapper.svelte b/src/routes/idaa/(idaa)/recovery_meetings/ae_idaa_comp__event_obj_li_wrapper.svelte
index 18490915..d91c56b1 100644
--- a/src/routes/idaa/(idaa)/recovery_meetings/ae_idaa_comp__event_obj_li_wrapper.svelte
+++ b/src/routes/idaa/(idaa)/recovery_meetings/ae_idaa_comp__event_obj_li_wrapper.svelte
@@ -54,18 +54,48 @@ let dq__where_eq_id_val: string = link_to_id;
// Functions and Logic
let lq__event_obj_li = $derived(liveQuery(async () => {
- if (event_id_random_li.length > 0) {
+ // Check if event_id_random_li is an array and has items
+ // if (Array.isArray(event_id_random_li)) { // && event_id_random_li.length > 0) {
+ if (event_id_random_li && event_id_random_li.length) {
+ if (log_lvl) {
+ console.log(`Trying IDB bulkGet: ${event_id_random_li.length}`), event_id_random_li;
+ }
+ // if (!event_id_random_li.length) {
+ // return [];
+ // }
let results = await db_events.events
.bulkGet(event_id_random_li);
return results;
} else if (link_to_type && link_to_id) {
- let results = await db_events.events
- .where(dq__where_type_id_val)
- .equals(dq__where_eq_id_val)
- // .sortBy('name')
- .sortBy('updated_on')
- // This should be sorted by a custom sort field
+ if (log_lvl) {
+ console.log(`Trying where: ${link_to_type}; equals: ${link_to_id}; event_id_random_li: ${event_id_random_li}`, event_id_random_li);
+ }
+ let results: any = null;
+ if (order_by == 'name') {
+ results = await db_events.events
+ .where(dq__where_type_id_val)
+ .equals(dq__where_eq_id_val)
+ .and((event) => {
+ return event.hide == false;
+ })
+ .and((event) => {
+ return event.enable == true;
+ })
+ .sortBy('name')
+ // This should be sorted by a custom sort field
+ } else {
+ results = await db_events.events
+ .where(dq__where_type_id_val)
+ .equals(dq__where_eq_id_val)
+ .and((event) => {
+ return event.hide == false;
+ })
+ .and((event) => {
+ return event.enable == true;
+ })
+ .sortBy('updated_on')
+ }
return results;
} else {
@@ -74,7 +104,7 @@ let lq__event_obj_li = $derived(liveQuery(async () => {
}));
-
+{#if $lq__event_obj_li}
{
log_lvl={log_lvl}
>
+{:else}
+
+
+
+ Loading...
+
+
+
+ No recovery meetings available to show. The search may need to be changed.
+
+
+{/if}
\ No newline at end of file
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
index d6993b55..2844127f 100644
--- 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
@@ -43,11 +43,6 @@ if ($idaa_loc.recovery_meetings?.save_search_text && $idaa_loc.recovery_meetings
// Functions and Logic
-if (browser) {
- $idaa_trig.event_li_qry = true;
- // $idaa_trig = 'load__event_obj_li';
-}
-
function preventDefault(fn) {
return function (event) {
event.preventDefault();
@@ -441,20 +436,6 @@ function preventDefault(fn) {
bind:value={$idaa_loc.recovery_meetings.qry__limit}
onchange={() => {
$idaa_trig.event_li_qry = true;
- // search__event_presenter({
- // api_cfg: $ae_api,
- // event_id: $events_slct.event_id,
- // agree: true,
- // biography: null,
- // ft_search_str: '',
- // lk_search_str: '',
- // params: {
- // 'qry__enabled': 'enabled',
- // 'qry__hidden': 'not_hidden',
- // 'qry__limit': $idaa_loc.recovery_meetings.qry__limit__events,},
- // try_cache: false,
- // log_lvl: log_lvl,
- // });
}}
class="
select w-20 text-sm inline-block
@@ -490,11 +471,11 @@ function preventDefault(fn) {
bind:value={$idaa_loc.recovery_meetings.qry__order_by}
onchange={() => {
if ($idaa_loc.recovery_meetings.qry__order_by == 'updated_on') {
- $idaa_loc.recovery_meetings.qry__order_by = 'updated_on';
- $idaa_loc.recovery_meetings.qry__order_by_li = {'priority': 'DESC', 'sort': 'DESC', 'updated_on': 'DESC', 'created_on': 'DESC', 'name': 'ASC'};
+ $idaa_loc.recovery_meetings.qry__order_by = 'updated_on'; // For the IDB index query
+ $idaa_loc.recovery_meetings.qry__order_by_li = {'priority': 'DESC', 'sort': 'DESC', 'updated_on': 'DESC', 'created_on': 'DESC', 'name': 'ASC'}; // For the SQL query
} else {
- $idaa_loc.recovery_meetings.qry__order_by = 'name';
- $idaa_loc.recovery_meetings.qry__order_by_li = {'priority': 'DESC', 'sort': 'DESC', 'name': 'ASC', 'updated_on': 'DESC', 'created_on': 'DESC'};
+ $idaa_loc.recovery_meetings.qry__order_by = 'name'; // For the IDB index query
+ $idaa_loc.recovery_meetings.qry__order_by_li = {'priority': 'DESC', 'sort': 'DESC', 'name': 'ASC', 'updated_on': 'DESC', 'created_on': 'DESC'}; // For the SQL query
}
$idaa_trig.event_li_qry = true;
}}