More updates related to the IDB table name changes for events.

This commit is contained in:
Scott Idem
2025-10-06 14:25:52 -04:00
parent c3992d8711
commit 88e4ab119d
48 changed files with 180 additions and 130 deletions

View File

@@ -20,7 +20,7 @@ import { ae_util } from '$lib/ae_utils/ae_utils';
let ae_acct = data[$slct.account_id];
let lq__event_obj_li = $derived(liveQuery(async () => {
let results = await db_events.events
let results = await db_events.event
.where('account_id')
.equals(ae_acct.slct.account_id)
.reverse()

View File

@@ -0,0 +1,50 @@
<script lang="ts">
interface Props {
/** @type {import('./$types').PageData} */
data: any;
log_lvl?: number;
}
let {
data,
log_lvl = 0
}: Props = $props();
// *** Import Svelte specific
import { liveQuery } from "dexie";
import type { key_val } from '$lib/ae_stores';
import { ae_util } from '$lib/ae_utils/ae_utils';
// import { core_func } from '$lib/ae_core_functions';
import { db_events } from "$lib/ae_events/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';
let lq__event_obj = $derived(liveQuery(async () => {
let results = await db_events.event
.get($events_slct.event_id);
return results;
}));
// *** Functions and Logic
$effect(() => {
// if ($events_trigger == 'load__event_badge_obj_li' && $events_slct.event_id) {
// }
});
</script>
<svelte:head>
<title>
&AElig;:
{ae_util.shorten_string({string: $lq__event_obj?.name ?? '-- not set --', max_length: 12})}
</title>
</svelte:head>
<!-- - Badges - {$events_loc?.title} -->

View File

@@ -100,7 +100,7 @@ let lq__event_obj = $derived(liveQuery(async () => {
console.log(`lq__event_obj: event_id = ${$events_slct?.event_id}`);
}
let results = await db_events.events
let results = await db_events.event
.get($events_slct?.event_id ?? ''); // null or undefined does not reset things like '' does
if (log_lvl) {
console.log(`lq__event_obj: results = `, results);
@@ -126,7 +126,7 @@ let lq__event_obj = $derived(liveQuery(async () => {
// Event File - For Event
let lq__event_event_file_obj_li = $derived(liveQuery(async () => {
let results = await db_events.files
let results = await db_events.file
.where('for_id_random')
.equals($events_slct.event_id ?? '')
.sortBy('filename');
@@ -136,7 +136,7 @@ let lq__event_event_file_obj_li = $derived(liveQuery(async () => {
// Event File - For Location
let lq__location_event_file_obj_li = $derived(liveQuery(async () => {
let results = await db_events.files
let results = await db_events.file
// .where('event_location_id_random')
.where('for_id_random')
.equals($events_slct.event_location_id ?? '')
@@ -147,14 +147,14 @@ let lq__location_event_file_obj_li = $derived(liveQuery(async () => {
// Event Location
let lq__event_location_obj = $derived(liveQuery(async () => {
let results = await db_events.locations
let results = await db_events.location
.get($events_slct.event_location_id);
return results;
}));
let lq__event_location_obj_li = $derived(liveQuery(async () => {
let results = await db_events.locations
let results = await db_events.location
.where('event_id')
.equals($events_slct.event_id)
.sortBy('name');
@@ -164,14 +164,14 @@ let lq__event_location_obj_li = $derived(liveQuery(async () => {
// Event Session
let lq__event_session_obj = $derived(liveQuery(async () => {
let results = await db_events.sessions
let results = await db_events.session
.get($events_slct.event_session_id);
return results;
}));
// let lq__event_session_obj_li = $derived(liveQuery(async () => {
// let results = await db_events.sessions
// let results = await db_events.session
// // .bulkGet(event_session_id_random_li);
// .where('event_location_id')
// .equals($events_slct.event_location_id)
@@ -181,7 +181,7 @@ let lq__event_session_obj = $derived(liveQuery(async () => {
// }));
// let lq__event_session_obj_li = $derived(liveQuery(async () => {
// let results = await db_events.sessions
// let results = await db_events.session
// .where('event_location_id')
// .equals($events_slct.event_location_id)
// // .and((x) => (x.archive_on === null || x.archive_on > (new Date()).toISOString()))
@@ -232,14 +232,14 @@ let lq__event_session_obj_li = $derived(liveQuery(async () => {
// }
// // let event_session_id_random_li = tmp_li;
// results = await db_events.sessions
// results = await db_events.session
// .bulkGet(event_session_id_random_li);
// } else if ($lq__event_obj?.cfg_json?.session_group_sort === 'DESC') {
// if (log_lvl) {
// console.log(`LQ - Using DESC sort for Event Session list event_id: ${$events_slct?.event_id}`);
// }
// results = await db_events.sessions
// results = await db_events.session
// // .orderBy('updated_on')
// .where('event_id')
// .equals($events_slct?.event_id ?? '') // null or undefined does not reset things like '' does
@@ -252,7 +252,7 @@ let lq__event_session_obj_li = $derived(liveQuery(async () => {
// if (log_lvl) {
// console.log(`LQ - Using category filter: ${$events_loc.filter__category_code}`);
// }
// results = await db_events.sessions
// results = await db_events.session
// .where('event_id')
// .equals($events_slct?.event_id ?? '') // null or undefined does not reset things like '' does
// .and(session => session.category_code === $events_loc.filter__category_code)
@@ -264,7 +264,7 @@ let lq__event_session_obj_li = $derived(liveQuery(async () => {
// console.log(`$lq__event_obj.cfg_json = `, $lq__event_obj?.cfg_json);
console.log(`LQ - Using default sort for Event Session list event_id: ${$events_slct?.event_id}`);
}
results = await db_events.sessions
results = await db_events.session
.where('event_location_id')
.equals($events_slct.event_location_id)
// .where('event_id')

View File

@@ -27,7 +27,7 @@ let ae_promises: key_val = {
// Event File
let lq__event_file_obj_li = $derived(liveQuery(async () => {
let results = await db_events.files
let results = await db_events.file
// .where('event_session_id_random')
.where('for_id_random')
.equals(lq__event_presenter_obj?.event_presenter_id)

View File

@@ -27,7 +27,7 @@ let ae_promises: key_val = {
// Event File
let lq__event_file_obj_li = $derived(liveQuery(async () => {
let results = await db_events.files
let results = await db_events.file
// .where('event_session_id_random')
.where('for_id_random')
.equals(lq__event_presenter_obj?.event_presenter_id)

View File

@@ -39,11 +39,11 @@ import { events_func } from '$lib/ae_events_functions';
// });
// let lq__event_session_obj = liveQuery(
// () => db_events.sessions.get(slct_event_session_id)
// () => db_events.session.get(slct_event_session_id)
// );
// let lq__event_session_obj = liveQuery(
// () => db_events.sessions.get(slct__event_session_id)
// () => db_events.session.get(slct__event_session_id)
// );
// import Event_launcher_file_cont from './launcher_file_cont.svelte';
@@ -58,7 +58,7 @@ let lq__event_file_obj_li = $derived(liveQuery(async () => {
if (log_lvl) {
console.log(`lq__event_file_obj: event_file_id = ${$events_slct?.event_file_id}`);
}
let results = await db_events.files
let results = await db_events.file
// .where('event_session_id_random')
.where('for_id_random')
.equals(slct__event_session_id)
@@ -89,14 +89,14 @@ let lq__event_file_obj_li = $derived(liveQuery(async () => {
// Does not refresh when the event_file_id_li_json changes.
// let lq_get__event_file_obj_li = liveQuery(
// () => db_events.files
// () => db_events.file
// .bulkGet($lq__event_session_obj?.event_file_id_li_json ?? [''])
// );
// console.log(`$lq__event_session_obj?.event_file_id_li_json = `, $lq__event_session_obj?.event_file_id_li_json);
// Event Presentation
// let lq__event_presentation_obj = liveQuery(
// () => db_events.presentations
// () => db_events.presentation
// .get($events_slct.event_presentation_id)
// );
@@ -108,7 +108,7 @@ let lq__event_presentation_obj_li = $derived(liveQuery(async () => {
if (type_code == 'poster') {
sort_by = 'name';
}
let results = await db_events.presentations
let results = await db_events.presentation
.where('event_session_id_random')
.equals(slct__event_session_id)
.sortBy(sort_by)
@@ -138,7 +138,7 @@ let lq__event_presentation_obj_li = $derived(liveQuery(async () => {
// FIX! This id list needs to be updated. It is currently commented out in the menu_session_list.svelte file.
// let lq_get__event_presentation_obj_li = liveQuery(
// () => db_events.presentations
// () => db_events.presentation
// .bulkGet($events_slct.id_li__event_presentation)
// );
@@ -147,7 +147,7 @@ let lq__event_presenter_obj_li = $derived(liveQuery(async () => {
if (log_lvl) {
console.log(`lq__event_presenter_obj_li: slct__event_session_id = ${slct__event_session_id}`);
}
let results = await db_events.presenters
let results = await db_events.presenter
.where('event_session_id')
.equals(slct__event_session_id)
.sortBy('full_name')

View File

@@ -55,7 +55,7 @@ let lq__event_obj = $derived(liveQuery(async () => {
if (log_lvl) {
console.log(`*** LiveQuery: lq__event_obj *** event_id=${$events_slct.event_id}`);
}
let results = await db_events.events
let results = await db_events.event
.get($events_slct?.event_id ?? '');
return results;
@@ -88,12 +88,12 @@ let event_session_id_random_li: Array<string> = $state([]);
// // }
// if (event_session_id_random_li.length) {
// console.log(`*** LiveQuery: lq__event_session_obj_li *** time to bulkGet`, $state.snapshot(event_session_id_random_li));
// let results = await db_events.sessions
// let results = await db_events.session
// .bulkGet(event_session_id_random_li);
// return results;
// } else {
// let results = await db_events.sessions
// let results = await db_events.session
// .where('event_id')
// .equals($events_slct?.event_id ?? '') // null or undefined does not reset things like '' does
// .reverse()
@@ -106,7 +106,7 @@ let event_session_id_random_li: Array<string> = $state([]);
let lq__event_location_obj_li = $derived(liveQuery(async () => {
let results = await db_events.locations
let results = await db_events.location
.where('event_id')
.equals($events_slct.event_id)
.sortBy('name')

View File

@@ -39,14 +39,14 @@ let dq__where_eq_id_val: string = link_to_id;
// *** Functions and Logic
let lq__event_device_obj_li = $derived(liveQuery(async () => {
if (link_to_type && link_to_id) {
let results = await db_events.devices
let results = await db_events.device
.where(dq__where_type_id_val)
.equals(dq__where_eq_id_val)
.sortBy('name')
return results;
} else if (event_device_id_random_li.length > 0) {
let results = await db_events.devices
let results = await db_events.device
.bulkGet(event_device_id_random_li);
return results;

View File

@@ -69,19 +69,19 @@ if (!$events_sess.pres_mgmt) {
// $events_sess.pres_mgmt.show_content__presenter_start = false;
let lq__event_obj = $derived(liveQuery(async () => {
let results = await db_events.events
let results = await db_events.event
.get(ae_acct.slct.event_id);
return results;
}));
let lq__event_location_obj = $derived(liveQuery(async () => {
let results = await db_events.locations
let results = await db_events.location
.get(ae_acct.slct.event_location_id);
return results;
}));
let lq__event_session_obj_li = $derived(liveQuery(async () => {
let results = await db_events.sessions
let results = await db_events.session
.where('event_location_id')
.equals(ae_acct.slct.event_location_id)
.sortBy('start_datetime')

View File

@@ -44,7 +44,7 @@ if (!$events_sess.pres_mgmt) {
}
let lq__event_presentation_obj = $derived(liveQuery(async () => {
let results = await db_events.presentations
let results = await db_events.presentation
.get($events_slct.event_presentation_id);
return results;
}));

View File

@@ -49,12 +49,12 @@ $ae_loc.url_origin = data.url.origin;
$events_slct.event_id = ae_acct.slct.event_id;
let lq__event_obj = $derived(liveQuery(async () => {
let results = await db_events.events.get($events_slct.event_id);
let results = await db_events.event.get($events_slct.event_id);
return results;
}));
let lq__event_location_obj_li = $derived(liveQuery(async () => {
let results = await db_events.locations
let results = await db_events.location
.where('event_id')
.equals(ae_acct.slct.event_id)
.sortBy('name')

View File

@@ -50,23 +50,23 @@ $events_sess.pres_mgmt.show_modal__presenter_agree = false;
$events_sess.pres_mgmt.show_content__presenter_start = false;
let lq__event_obj = $derived(liveQuery(async () => {
let results = await db_events.events.get(ae_acct.slct.event_id)
let results = await db_events.event.get(ae_acct.slct.event_id)
return results;
}));
let lq__event_presenter_obj = $derived(liveQuery(async () => {
let results = await db_events.presenters.get(ae_acct.slct.event_presenter_id)
let results = await db_events.presenter.get(ae_acct.slct.event_presenter_id)
return results;
}));
let lq__event_presentation_obj = $derived(liveQuery(async () => {
let results = await db_events.presentations.get(ae_acct.slct.event_presentation_id)
let results = await db_events.presentation.get(ae_acct.slct.event_presentation_id)
return results;
}));
let lq__auth__event_presenter_obj = $derived(liveQuery(async () => {
let results = await db_events.presenters.get($events_loc.auth__person?.presenter_id ?? null)
let results = await db_events.presenter.get($events_loc.auth__person?.presenter_id ?? null)
return results;
}));

View File

@@ -40,14 +40,14 @@ let dq__where_eq_id_val: string = link_to_id;
// *** Functions and Logic
let lq__event_presenter_obj_li = $derived(liveQuery(async () => {
if (link_to_type && link_to_id) {
let results = await db_events.presenters
let results = await db_events.presenter
.where(dq__where_type_id_val)
.equals(dq__where_eq_id_val)
.sortBy('name')
return results;
} else if (event_presenter_id_random_li.length > 0) {
let results = await db_events.presenters
let results = await db_events.presenter
.bulkGet(event_presenter_id_random_li);
return results;

View File

@@ -44,11 +44,11 @@ if (log_lvl) {
// *** Functions and Logic
// let lq__event_presenter_obj = liveQuery(
// () => db_events.presenters.get($events_slct.event_presenter_id)
// () => db_events.presenter.get($events_slct.event_presenter_id)
// );
// let lq_kv__event_presenter_obj_li = liveQuery(
// () => db_events.presenters
// () => db_events.presenter
// .bulkGet(event_presenter_id_random_li)
// );

View File

@@ -77,13 +77,13 @@ let lq__event_presenter_obj_li = $derived(liveQuery(async () => {
}
// if (event_presenter_id_random_li.length) {
results = await db_events.presenters
results = await db_events.presenter
.bulkGet(event_presenter_id_random_li);
// }
} else if (link_to_type && link_to_id) {
console.log(`Trying where: ${dq__where_type_id_val}; equals: ${dq__where_eq_id_val}`);
event_presenter_id_random_li = [];
results = await db_events.presenters
results = await db_events.presenter
.where(dq__where_type_id_val)
.equals(dq__where_eq_id_val)
.sortBy('name');

View File

@@ -44,7 +44,7 @@ $events_slct.event_obj = ae_acct.slct.event_obj;
$events_slct.event_session_obj_li = ae_acct.slct.event_session_obj_li;
let lq__event_obj = $derived(liveQuery(async () => {
let results = await db_events.events
let results = await db_events.event
.get(ae_acct.slct.event_id);
return results;
}));

View File

@@ -93,18 +93,18 @@ $events_sess.pres_mgmt.show_content__agree_text = false;
$events_sess.pres_mgmt.show_content__presenter_start = false;
let lq__event_obj = $derived(liveQuery(async () => {
let results = await db_events.events
let results = await db_events.event
.get($events_slct.event_id);
return results;
}));
let lq__event_session_obj = $derived(liveQuery(async () => {
let results = await db_events.sessions.get(ae_acct.slct.event_session_id)
let results = await db_events.session.get(ae_acct.slct.event_session_id)
return results;
}));
let lq__event_presentation_obj_li = $derived(liveQuery(async () => {
let results = await db_events.presentations
let results = await db_events.presentation
.where('event_session_id')
.equals(ae_acct.slct.event_session_id)
.sortBy('name')
@@ -113,13 +113,13 @@ let lq__event_presentation_obj_li = $derived(liveQuery(async () => {
}));
let lq__event_presenter_obj = $derived(liveQuery(async () => {
let results = await db_events.presenters
let results = await db_events.presenter
.get($events_slct.event_presenter_id);
return results;
}));
let lq__auth__event_presenter_obj = $derived(liveQuery(async () => {
let results = await db_events.presenters
let results = await db_events.presenter
.get($events_loc.auth__person?.presenter_id ?? null);
return results;
}));

View File

@@ -83,13 +83,13 @@ let lq__event_file_obj_li = $derived(liveQuery(async () => {
}
// if (event_file_id_random_li.length) {
results = await db_events.files
results = await db_events.file
.bulkGet(event_file_id_random_li);
// }
} else if (link_to_type && link_to_id) {
console.log(`Trying where: ${dq__where_type_id_val}; equals: ${dq__where_eq_id_val}`);
event_file_id_random_li = [];
results = await db_events.files
results = await db_events.file
.where(dq__where_type_id_val)
.equals(dq__where_eq_id_val)
.sortBy('name');

View File

@@ -102,7 +102,7 @@ async function handle_submit_form_files(event) {
// await tick();
db_events.files.clear();
db_events.file.clear();
events_func.load_ae_obj_li__event_file({
api_cfg: $ae_api,

View File

@@ -39,7 +39,7 @@ let dq__where_eq_id_val: string = link_to_id ?? '';
// *** Functions and Logic
let lq__event_session_obj_li = $derived(liveQuery(async () => {
if (link_to_type && link_to_id) {
let results = await db_events.sessions
let results = await db_events.session
.where(dq__where_type_id_val)
.equals(dq__where_eq_id_val)
// .sortBy('name')
@@ -48,7 +48,7 @@ let lq__event_session_obj_li = $derived(liveQuery(async () => {
return results;
} else if (event_session_id_random_li.length > 0) {
let results = await db_events.sessions
let results = await db_events.session
.bulkGet(event_session_id_random_li);
return results;

View File

@@ -66,13 +66,13 @@ let lq__event_session_obj_li = $derived(liveQuery(async () => {
}
// if (event_session_id_random_li.length) {
results = await db_events.sessions
results = await db_events.session
.bulkGet(event_session_id_random_li);
// }
} else if (link_to_type && link_to_id) {
console.log(`Trying where: ${dq__where_type_id_val}; equals: ${dq__where_eq_id_val}`);
event_session_id_random_li = [];
results = await db_events.sessions
results = await db_events.session
.where(dq__where_type_id_val)
.equals(dq__where_eq_id_val)
.sortBy('name');
@@ -96,13 +96,13 @@ let lq__event_session_obj_li = $derived(liveQuery(async () => {
return results;
// if (event_session_id_random_li.length) {
// let results = await db_events.sessions
// let results = await db_events.session
// .bulkGet(event_session_id_random_li);
// return results;
// } else if (link_to_type && link_to_id) {
// console.log(`Trying where: ${dq__where_type_id_val}; equals: ${dq__where_eq_id_val}`);
// let results = await db_events.sessions
// let results = await db_events.session
// .where(dq__where_type_id_val)
// .equals(dq__where_eq_id_val)
// .sortBy('name')