diff --git a/src/lib/ae_events/ae_events__event.ts b/src/lib/ae_events/ae_events__event.ts index c60ab8b2..feea8a91 100644 --- a/src/lib/ae_events/ae_events__event.ts +++ b/src/lib/ae_events/ae_events__event.ts @@ -669,7 +669,7 @@ export async function delete_ae_obj_id__event( if (log_lvl) { console.log(`Attempting to remove IDB entry for event_id=${event_id}`); } - db_events.events.delete(event_id); // Delete from the DB no matter what. + db_events.event.delete(event_id); // Delete from the DB no matter what. } }); @@ -870,7 +870,7 @@ export async function db_save_ae_obj_li__event( let id_random = null; try { - id_random = await db_events.events.update(obj_record.id, obj_record); + id_random = await db_events.event.update(obj_record.id, obj_record); } catch (error) { console.error(`Error: Failed to update ${obj_record.id}: ${error}`); } @@ -880,7 +880,7 @@ export async function db_save_ae_obj_li__event( console.log(`Failed to update record with ID: ${obj_record.id}. Trying put...`); } try { - id_random = await db_events.events.put(obj_record); + id_random = await db_events.event.put(obj_record); } catch (error) { console.error(`Error: Failed to put ${obj.event_id_random}: ${error}`); } diff --git a/src/lib/ae_events/ae_events__event_badge.ts b/src/lib/ae_events/ae_events__event_badge.ts index 64d52eed..bb4a8cbd 100644 --- a/src/lib/ae_events/ae_events__event_badge.ts +++ b/src/lib/ae_events/ae_events__event_badge.ts @@ -225,7 +225,7 @@ export async function delete_ae_obj_id__event_badge({ if (log_lvl) { console.log(`Attempting to remove IDB entry for event_badge_id=${event_badge_id}`); } - db_events.badges.delete(event_badge_id); + db_events.badge.delete(event_badge_id); } }); return ae_promises.delete__event_badge_obj; diff --git a/src/lib/ae_events/ae_events__event_device.ts b/src/lib/ae_events/ae_events__event_device.ts index 1e4a46d8..ff8f9c7b 100644 --- a/src/lib/ae_events/ae_events__event_device.ts +++ b/src/lib/ae_events/ae_events__event_device.ts @@ -362,7 +362,7 @@ export async function delete_ae_obj_id__event_device( if (log_lvl) { console.log(`Attempting to remove IDB entry for event_device_id=${event_device_id}`); } - db_events.devices.delete(event_device_id); + db_events.device.delete(event_device_id); } }); @@ -604,7 +604,7 @@ export function db_save_ae_obj_li__event_device( } try { - const id_random = await db_events.devices.put({ + const id_random = await db_events.device.put({ id: obj.event_device_id_random, event_device_id: obj.event_device_id_random, // event_device_id_random: obj.event_device_id_random, @@ -673,7 +673,7 @@ export function db_save_ae_obj_li__event_device( console.log(status); } - // const id_random = await db_events.devices.put(obj); + // const id_random = await db_events.device.put(obj); // console.log(`Put obj with ID: ${obj.event_device_id_random}`); }); diff --git a/src/lib/ae_events/ae_events__event_file.ts b/src/lib/ae_events/ae_events__event_file.ts index f3909af4..fb5a3fda 100644 --- a/src/lib/ae_events/ae_events__event_file.ts +++ b/src/lib/ae_events/ae_events__event_file.ts @@ -291,7 +291,7 @@ export async function delete_ae_obj_id__event_file( if (log_lvl) { console.log(`Attempting to remove IDB entry for event_file_id=${event_file_id}`); } - db_events.files.delete(event_file_id); // Delete from the DB no matter what. + db_events.file.delete(event_file_id); // Delete from the DB no matter what. } }); @@ -699,7 +699,7 @@ export function db_save_ae_obj_li__event_file( } try { - const id_random = await db_events.files.put({ + const id_random = await db_events.file.put({ id: obj.event_file_id_random, id_random: obj.event_file_id_random, event_file_id: obj.event_file_id_random, @@ -771,7 +771,7 @@ export function db_save_ae_obj_li__event_file( console.log(status); } - // const id_random = await db_events.files.put(obj); + // const id_random = await db_events.file.put(obj); // console.log(`Put obj with ID: ${obj.event_file_id_random}`); }); @@ -798,8 +798,8 @@ export function db_update_ae_obj_id__event_file( console.log(`ae_obj ${obj_type}:`, obj_id); try { - // db_events.files.update(obj_id, data_kv); - db_events.files.update(obj_id, + // db_events.file.update(obj_id, data_kv); + db_events.file.update(obj_id, { // for_type: data_kv.for_type, // for_id: data_kv.for_id_id_random, @@ -856,7 +856,7 @@ export function db_update_ae_obj_id__event_file( console.log(status); } - // const id_random = await db_events.files.put(obj); + // const id_random = await db_events.file.put(obj); // console.log(`Put obj with ID: ${data_kv.event_file_id_random}`); return true; } diff --git a/src/lib/ae_events/ae_events__event_location.ts b/src/lib/ae_events/ae_events__event_location.ts index 73ee7a94..612aa673 100644 --- a/src/lib/ae_events/ae_events__event_location.ts +++ b/src/lib/ae_events/ae_events__event_location.ts @@ -465,7 +465,7 @@ export async function delete_ae_obj_id__event_location( if (log_lvl) { console.log(`Attempting to remove IDB entry for event_location_id=${event_location_id}`); } - db_events.locations.delete(event_location_id); + db_events.location.delete(event_location_id); } }); @@ -706,7 +706,7 @@ export function db_save_ae_obj_li__event_location( } try { - const id_random = await db_events.locations.put({ + const id_random = await db_events.location.put({ id: obj.event_location_id_random, event_location_id: obj.event_location_id_random, event_location_id_random: obj.event_location_id_random, @@ -761,7 +761,7 @@ export function db_save_ae_obj_li__event_location( console.log(status); } - // const id_random = await db_events.locations.put(obj); + // const id_random = await db_events.location.put(obj); // console.log(`Put obj with ID: ${obj.event_location_id_random}`); }); diff --git a/src/lib/ae_events/ae_events__event_presentation.ts b/src/lib/ae_events/ae_events__event_presentation.ts index a322806c..0d7b7eee 100644 --- a/src/lib/ae_events/ae_events__event_presentation.ts +++ b/src/lib/ae_events/ae_events__event_presentation.ts @@ -470,7 +470,7 @@ export async function delete_ae_obj_id__event_presentation( if (log_lvl) { console.log(`Attempting to remove IDB entry for event_presentation_id=${event_presentation_id}`); } - db_events.presentations.delete(event_presentation_id); + db_events.presentation.delete(event_presentation_id); } }); @@ -587,7 +587,7 @@ export function db_save_ae_obj_li__event_presentation( } try { - const id_random = await db_events.presentations.put({ + const id_random = await db_events.presentation.put({ id: obj.event_presentation_id_random, // id_random: obj.event_presentation_id_random, event_presentation_id: obj.event_presentation_id_random, @@ -643,7 +643,7 @@ export function db_save_ae_obj_li__event_presentation( console.log(status); } - // const id_random = await db_events.presentations.put(obj); + // const id_random = await db_events.presentation.put(obj); // console.log(`Put obj with ID: ${obj.event_presentation_id_random}`); }); diff --git a/src/lib/ae_events/ae_events__event_presenter.ts b/src/lib/ae_events/ae_events__event_presenter.ts index eb3dea99..c9504eb8 100644 --- a/src/lib/ae_events/ae_events__event_presenter.ts +++ b/src/lib/ae_events/ae_events__event_presenter.ts @@ -389,7 +389,7 @@ export async function delete_ae_obj_id__event_presenter( if (log_lvl) { console.log(`Attempting to remove IDB entry for event_presenter_id=${event_presenter_id}`); } - db_events.presenters.delete(event_presenter_id); + db_events.presenter.delete(event_presenter_id); } }); @@ -657,7 +657,7 @@ export function db_save_ae_obj_li__event_presenter( } try { - const id_random = await db_events.presenters.put({ + const id_random = await db_events.presenter.put({ id: obj.event_presenter_id_random, // id_random: obj.event_presenter_id_random, event_presenter_id: obj.event_presenter_id_random, @@ -744,7 +744,7 @@ export function db_save_ae_obj_li__event_presenter( console.log(status); } - // const id_random = await db_events.presenters.put(obj); + // const id_random = await db_events.presenter.put(obj); // console.log(`Put obj with ID: ${obj.event_presenter_id_random}`); }); diff --git a/src/lib/ae_events/ae_events__event_session.ts b/src/lib/ae_events/ae_events__event_session.ts index ac2a4df3..0d373e2d 100644 --- a/src/lib/ae_events/ae_events__event_session.ts +++ b/src/lib/ae_events/ae_events__event_session.ts @@ -486,7 +486,7 @@ export async function delete_ae_obj_id__event_session( if (log_lvl) { console.log(`Attempting to remove IDB entry for event_session_id=${event_session_id}`); } - db_events.sessions.delete(event_session_id); + db_events.session.delete(event_session_id); } }); @@ -1046,7 +1046,7 @@ export async function db_save_ae_obj_li__event_session( let id_random = null; try { - id_random = await db_events.sessions.update(obj_record.id, obj_record); + id_random = await db_events.session.update(obj_record.id, obj_record); } catch (error) { console.error(`Error: Failed to update ${obj_record.id}: ${error}`); } @@ -1056,7 +1056,7 @@ export async function db_save_ae_obj_li__event_session( console.log(`Failed to update record with ID: ${obj_record.id}. Trying put...`); } try { - id_random = await db_events.sessions.put(obj_record); + id_random = await db_events.session.put(obj_record); } catch (error) { console.error(`Error: Failed to put ${obj.event_session_id_random}: ${error}`); } diff --git a/src/lib/ae_events/ae_events__exhibit.ts b/src/lib/ae_events/ae_events__exhibit.ts index 0d05d149..a5309abb 100644 --- a/src/lib/ae_events/ae_events__exhibit.ts +++ b/src/lib/ae_events/ae_events__exhibit.ts @@ -435,7 +435,7 @@ export function handle_db_save_ae_obj_li__exhibitor( } try { - const id_random = await db_events.exhibits.put({ + const id_random = await db_events.exhibit.put({ id_random: obj.event_exhibit_id_random, event_exhibit_id_random: obj.event_exhibit_id_random, @@ -469,7 +469,7 @@ export function handle_db_save_ae_obj_li__exhibitor( console.log(status); } - // const id_random = await db_events.exhibits.put(obj); + // const id_random = await db_events.exhibit.put(obj); // console.log(`Put obj with ID: ${obj.event_exhibit_id_random}`); }); diff --git a/src/lib/element_manage_event_file_li.svelte b/src/lib/element_manage_event_file_li.svelte index 7a539abf..543f3eef 100644 --- a/src/lib/element_manage_event_file_li.svelte +++ b/src/lib/element_manage_event_file_li.svelte @@ -65,7 +65,7 @@ let clipboard_success = $state(false); onclick={() => { console.log('*** Refresh button clicked ***'); - db_events.files.clear(); + db_events.file.clear(); // let params = { // qry__enabled: 'all', diff --git a/src/lib/element_manage_event_file_li_all.svelte b/src/lib/element_manage_event_file_li_all.svelte index 8434d135..e896cf9b 100644 --- a/src/lib/element_manage_event_file_li_all.svelte +++ b/src/lib/element_manage_event_file_li_all.svelte @@ -47,7 +47,7 @@ let dq__where_eq_val: string = link_to_id; // This should include all files that are associated with an object (event, location, session, presenter, etc.) // I am not sure why, but doing reverse() and then sortBy() seems to sort in descending order. let lq__event_file_obj_li = $derived(liveQuery(async () => { - let results = await db_events.files + let results = await db_events.file .where(dq__where_val) .equals(dq__where_eq_val) .reverse() diff --git a/src/lib/element_manage_event_file_li_direct.svelte b/src/lib/element_manage_event_file_li_direct.svelte index a9110ace..7991ed52 100644 --- a/src/lib/element_manage_event_file_li_direct.svelte +++ b/src/lib/element_manage_event_file_li_direct.svelte @@ -49,7 +49,7 @@ let dq__where_for_id_eq_val: string = link_to_id; // This should only include files that are directly linked to an object (event, location, session, presenter, etc.). // I am not sure why, but doing reverse() and then sortBy() seems to sort in descending order. let lq__event_file_obj_li = $derived(liveQuery(async () => { - let results = await db_events.files + let results = await db_events.file .where(dq__where_val) .equals(dq__where_eq_val) .and(file => file.for_id_random == dq__where_for_id_eq_val) diff --git a/src/routes/events/+page.svelte b/src/routes/events/+page.svelte index 55dbe996..a70c06b7 100644 --- a/src/routes/events/+page.svelte +++ b/src/routes/events/+page.svelte @@ -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() diff --git a/src/routes/events/[event_id]/(badges)/badges/+layout.svelte b/src/routes/events/[event_id]/(badges)/badges/+layout.svelte new file mode 100644 index 00000000..377b4cc0 --- /dev/null +++ b/src/routes/events/[event_id]/(badges)/badges/+layout.svelte @@ -0,0 +1,50 @@ + + + + + + Æ: + {ae_util.shorten_string({string: $lq__event_obj?.name ?? '-- not set --', max_length: 12})} + + + \ No newline at end of file diff --git a/src/routes/events/[event_id]/(badges)/badges/+page.svelte b/src/routes/events/[event_id]/(badges)/badges/+page.svelte new file mode 100644 index 00000000..e69de29b diff --git a/src/routes/events/[event_id]/(badges)/badges/[badge_id]/+page.svelte b/src/routes/events/[event_id]/(badges)/badges/[badge_id]/+page.svelte new file mode 100644 index 00000000..e69de29b diff --git a/src/routes/events/[event_id]/(launcher)/launcher/+layout.svelte b/src/routes/events/[event_id]/(launcher)/launcher/+layout.svelte index faddc657..1122779b 100644 --- a/src/routes/events/[event_id]/(launcher)/launcher/+layout.svelte +++ b/src/routes/events/[event_id]/(launcher)/launcher/+layout.svelte @@ -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') diff --git a/src/routes/events/[event_id]/(launcher)/launcher_presenter_view.svelte b/src/routes/events/[event_id]/(launcher)/launcher_presenter_view.svelte index 1f5b3a73..d97f36e5 100644 --- a/src/routes/events/[event_id]/(launcher)/launcher_presenter_view.svelte +++ b/src/routes/events/[event_id]/(launcher)/launcher_presenter_view.svelte @@ -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) diff --git a/src/routes/events/[event_id]/(launcher)/launcher_presenter_view_posters.svelte b/src/routes/events/[event_id]/(launcher)/launcher_presenter_view_posters.svelte index 0b53f7f5..15179a3f 100644 --- a/src/routes/events/[event_id]/(launcher)/launcher_presenter_view_posters.svelte +++ b/src/routes/events/[event_id]/(launcher)/launcher_presenter_view_posters.svelte @@ -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) diff --git a/src/routes/events/[event_id]/(launcher)/launcher_session_view.svelte b/src/routes/events/[event_id]/(launcher)/launcher_session_view.svelte index eec2ff89..b5095dad 100644 --- a/src/routes/events/[event_id]/(launcher)/launcher_session_view.svelte +++ b/src/routes/events/[event_id]/(launcher)/launcher_session_view.svelte @@ -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') diff --git a/src/routes/events/[event_id]/+page.svelte b/src/routes/events/[event_id]/+page.svelte index 410cd687..317e06fa 100644 --- a/src/routes/events/[event_id]/+page.svelte +++ b/src/routes/events/[event_id]/+page.svelte @@ -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 = $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 = $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') diff --git a/src/routes/events/[event_id]/device/ae_comp__event_device_obj_li_wrapper.svelte b/src/routes/events/[event_id]/device/ae_comp__event_device_obj_li_wrapper.svelte index 184665bc..13d2f3cc 100644 --- a/src/routes/events/[event_id]/device/ae_comp__event_device_obj_li_wrapper.svelte +++ b/src/routes/events/[event_id]/device/ae_comp__event_device_obj_li_wrapper.svelte @@ -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; diff --git a/src/routes/events/[event_id]/location/[event_location_id]/+page.svelte b/src/routes/events/[event_id]/location/[event_location_id]/+page.svelte index 365310b0..b7de1e52 100644 --- a/src/routes/events/[event_id]/location/[event_location_id]/+page.svelte +++ b/src/routes/events/[event_id]/location/[event_location_id]/+page.svelte @@ -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') diff --git a/src/routes/events/[event_id]/location/[event_location_id]/location_view.svelte b/src/routes/events/[event_id]/location/[event_location_id]/location_view.svelte index 9041704f..ddad7bdb 100644 --- a/src/routes/events/[event_id]/location/[event_location_id]/location_view.svelte +++ b/src/routes/events/[event_id]/location/[event_location_id]/location_view.svelte @@ -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; })); diff --git a/src/routes/events/[event_id]/locations/+page.svelte b/src/routes/events/[event_id]/locations/+page.svelte index c8c7fa51..302c5d8b 100644 --- a/src/routes/events/[event_id]/locations/+page.svelte +++ b/src/routes/events/[event_id]/locations/+page.svelte @@ -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') diff --git a/src/routes/events/[event_id]/presenter/[presenter_id]/+page.svelte b/src/routes/events/[event_id]/presenter/[presenter_id]/+page.svelte index 86ec9eb7..944f02c1 100644 --- a/src/routes/events/[event_id]/presenter/[presenter_id]/+page.svelte +++ b/src/routes/events/[event_id]/presenter/[presenter_id]/+page.svelte @@ -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; })); diff --git a/src/routes/events/[event_id]/presenter/ae_comp__event_presenter_obj_li_wrapper.svelte b/src/routes/events/[event_id]/presenter/ae_comp__event_presenter_obj_li_wrapper.svelte index ef754959..49c18f69 100644 --- a/src/routes/events/[event_id]/presenter/ae_comp__event_presenter_obj_li_wrapper.svelte +++ b/src/routes/events/[event_id]/presenter/ae_comp__event_presenter_obj_li_wrapper.svelte @@ -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; diff --git a/src/routes/events/[event_id]/presenter/ae_comp__event_presenter_obj_tbl.svelte b/src/routes/events/[event_id]/presenter/ae_comp__event_presenter_obj_tbl.svelte index 5cb729a9..c9faf9f4 100644 --- a/src/routes/events/[event_id]/presenter/ae_comp__event_presenter_obj_tbl.svelte +++ b/src/routes/events/[event_id]/presenter/ae_comp__event_presenter_obj_tbl.svelte @@ -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) // ); diff --git a/src/routes/events/[event_id]/presenter/ae_comp__event_presenter_obj_tbl_wrapper.svelte b/src/routes/events/[event_id]/presenter/ae_comp__event_presenter_obj_tbl_wrapper.svelte index 0fc62cb6..1c75485e 100644 --- a/src/routes/events/[event_id]/presenter/ae_comp__event_presenter_obj_tbl_wrapper.svelte +++ b/src/routes/events/[event_id]/presenter/ae_comp__event_presenter_obj_tbl_wrapper.svelte @@ -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'); diff --git a/src/routes/events/[event_id]/reports/+page.svelte b/src/routes/events/[event_id]/reports/+page.svelte index db9a7eff..0d81a250 100644 --- a/src/routes/events/[event_id]/reports/+page.svelte +++ b/src/routes/events/[event_id]/reports/+page.svelte @@ -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; })); diff --git a/src/routes/events/[event_id]/session/[session_id]/+page.svelte b/src/routes/events/[event_id]/session/[session_id]/+page.svelte index 247d8304..a855f000 100644 --- a/src/routes/events/[event_id]/session/[session_id]/+page.svelte +++ b/src/routes/events/[event_id]/session/[session_id]/+page.svelte @@ -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; })); diff --git a/src/routes/events/ae_comp__event_file_obj_tbl_wrapper.svelte b/src/routes/events/ae_comp__event_file_obj_tbl_wrapper.svelte index 4a3cbc12..00cdaa5d 100644 --- a/src/routes/events/ae_comp__event_file_obj_tbl_wrapper.svelte +++ b/src/routes/events/ae_comp__event_file_obj_tbl_wrapper.svelte @@ -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'); diff --git a/src/routes/events/ae_comp__event_files_upload.svelte b/src/routes/events/ae_comp__event_files_upload.svelte index d789491b..e0da6a5d 100644 --- a/src/routes/events/ae_comp__event_files_upload.svelte +++ b/src/routes/events/ae_comp__event_files_upload.svelte @@ -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, diff --git a/src/routes/events/ae_comp__event_session_obj_li_wrapper.svelte b/src/routes/events/ae_comp__event_session_obj_li_wrapper.svelte index 0f0c044d..4981379d 100644 --- a/src/routes/events/ae_comp__event_session_obj_li_wrapper.svelte +++ b/src/routes/events/ae_comp__event_session_obj_li_wrapper.svelte @@ -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; diff --git a/src/routes/events/ae_comp__event_session_obj_tbl_wrapper.svelte b/src/routes/events/ae_comp__event_session_obj_tbl_wrapper.svelte index 9cb790c5..e9e849a8 100644 --- a/src/routes/events/ae_comp__event_session_obj_tbl_wrapper.svelte +++ b/src/routes/events/ae_comp__event_session_obj_tbl_wrapper.svelte @@ -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') diff --git a/src/routes/events_badges/review/+page.svelte b/src/routes/events_badges/review/+page.svelte index 13f8d801..06d35d20 100644 --- a/src/routes/events_badges/review/+page.svelte +++ b/src/routes/events_badges/review/+page.svelte @@ -21,7 +21,7 @@ import { goto } from '$app/navigation'; // The lq__ prefix is used to indicate that this is a liveQuery object and it should use the $ prefix when referencing the object. let lq__event_badge_li = liveQuery( - () => db_events.badges.toArray() + () => db_events.badge.toArray() ); // import Edit_modal_event_badge from '../10_edit_modal__event_badge_obj.svelte'; diff --git a/src/routes/events_badges/stats/+page.svelte b/src/routes/events_badges/stats/+page.svelte index 07b9c75f..0d559fd1 100644 --- a/src/routes/events_badges/stats/+page.svelte +++ b/src/routes/events_badges/stats/+page.svelte @@ -28,7 +28,7 @@ import { goto } from '$app/navigation'; // The lq__ prefix is used to indicate that this is a liveQuery object and it should use the $ prefix when referencing the object. let lq__event_badge_li = liveQuery( - () => db_events.badges.toArray() + () => db_events.badge.toArray() ); // import Edit_modal_event_badge from '../10_edit_modal__event_badge_obj.svelte'; diff --git a/src/routes/events_leads/+page.svelte b/src/routes/events_leads/+page.svelte index ce304575..c397a61a 100644 --- a/src/routes/events_leads/+page.svelte +++ b/src/routes/events_leads/+page.svelte @@ -17,8 +17,8 @@ import Element_data_store from '$lib/element_data_store_v2.svelte'; let event_exhibit_obj_li = liveQuery( - // () => db_events.exhibits.toArray() - () => db_events.exhibits + // () => db_events.exhibit.toArray() + () => db_events.exhibit .where('license_max') // .aboveOrEqual(0) // .equals('99999') @@ -135,7 +135,7 @@ function handle_update_event_exhibit_staff_passcode(exhibit_id, reset_passcode) // $events_slct.exhibit_obj.staff_passcode = reset_passcode; // $events_sess.leads.entered_passcode = reset_passcode; - // db_events.exhibits.update($events_slct.exhibit_obj.id_random, { staff_passcode: reset_passcode }) + // db_events.exhibit.update($events_slct.exhibit_obj.id_random, { staff_passcode: reset_passcode }) // .then(function (updated) { // console.log(`Updated passcode for exhibit ${$events_slct.exhibit_obj.id_random} or ${$events_slct.exhibit_id}`); // disable_open_lead_retrieval_btn = false; diff --git a/src/routes/events_leads/exhibit/[slug]/+page.svelte b/src/routes/events_leads/exhibit/[slug]/+page.svelte index 62b526e1..f05aff2a 100644 --- a/src/routes/events_leads/exhibit/[slug]/+page.svelte +++ b/src/routes/events_leads/exhibit/[slug]/+page.svelte @@ -34,10 +34,10 @@ import Leads_manage from './leads_manage.svelte'; import Leads_payment from './leads_payment.svelte'; let event_exhibit_obj = liveQuery( - () => db_events.exhibits.get($events_slct.exhibit_id) - // () => db_events.exhibits.get(param_slug_event_exhibit_id) - // () => db_events.exhibits.toArray() - // () => db_events.exhibits + () => db_events.exhibit.get($events_slct.exhibit_id) + // () => db_events.exhibit.get(param_slug_event_exhibit_id) + // () => db_events.exhibit.toArray() + // () => db_events.exhibit // .where('id_random') // .equals($events_slct.exhibit_id) // // .orderBy('name') @@ -45,7 +45,7 @@ let event_exhibit_obj = liveQuery( // .toArray() ); -let event_exhibit_obj_v2 = db_events.exhibits.get($events_slct.exhibit_id); +let event_exhibit_obj_v2 = db_events.exhibit.get($events_slct.exhibit_id); // Load the Event Exhibit Obj with ID based on the slug param. // $events_slct.exhibit_id = param_slug_event_exhibit_id; @@ -258,7 +258,7 @@ async function handle_submit_form_license_update(event) { // tmp_obj.license_li_json.push($events_sess.leads.tmp_license); // Save to local IDB - await db_events.exhibits.put(tmp_obj); + await db_events.exhibit.put(tmp_obj); // Save to the database // Data out @@ -680,7 +680,7 @@ function send_init_confirm_email({index, lic_key, lic_pass}) { }; // tmp_obj.license_li_json.push($events_sess.leads.tmp_license); // console.log('Add License:', tmp_obj); - // db_events.exhibits.put(tmp_obj); + // db_events.exhibit.put(tmp_obj); // This still needs to be saved to the database. $events_sess.leads.show_form__license = true; diff --git a/src/routes/events_leads/exhibit/[slug]/leads_add_scan backup.svelte b/src/routes/events_leads/exhibit/[slug]/leads_add_scan backup.svelte index 6cd14aed..fbfec909 100644 --- a/src/routes/events_leads/exhibit/[slug]/leads_add_scan backup.svelte +++ b/src/routes/events_leads/exhibit/[slug]/leads_add_scan backup.svelte @@ -19,7 +19,7 @@ import Element_qr_scanner from '$lib/element_qr_scanner.svelte'; $: event_exhibit_obj = liveQuery( - () => db_events.exhibits.get($events_slct.exhibit_id) + () => db_events.exhibit.get($events_slct.exhibit_id) ); $: event_exhibit_tracking_obj = liveQuery( @@ -33,13 +33,13 @@ let tmp_search_terms = $events_sess.leads.entered_search_str.split(' ') $: event_badge_obj = liveQuery( - () => db_events.badges.get($events_slct.badge_id) + () => db_events.badge.get($events_slct.badge_id) ); // Version 2: This does not work yet let event_badge_obj_li = liveQuery( - // () => db_events.exhibits.toArray() - () => db_events.badges + // () => db_events.exhibit.toArray() + () => db_events.badge // .where({event_exhibit_id_random: $events_slct.exhibit_id, enable: true, hide: false}) // .where({event_id_random: $events_loc.event_id}) .where('event_id_random').equals($events_loc.event_id) @@ -60,8 +60,8 @@ let event_badge_obj_li = liveQuery( // We are using Dexie.js for the database. This liveQuery should only show records that match the event_id and contain the search string. // Version 3: This does not work yet let event_badge_obj_li_v3 = liveQuery( - // () => db_events.exhibits.toArray() - () => db_events.badges + // () => db_events.exhibit.toArray() + () => db_events.badge .where({event_exhibit_id_random: $events_slct.exhibit_id, full_name: $events_sess.leads.entered_search_str}) ); diff --git a/src/routes/events_leads/exhibit/[slug]/leads_add_scan.svelte b/src/routes/events_leads/exhibit/[slug]/leads_add_scan.svelte index cd7dcd4a..4bc0d2ce 100644 --- a/src/routes/events_leads/exhibit/[slug]/leads_add_scan.svelte +++ b/src/routes/events_leads/exhibit/[slug]/leads_add_scan.svelte @@ -24,7 +24,7 @@ if ($events_loc.leads.default_to_scan ?? false) { $: event_exhibit_obj = liveQuery( - () => db_events.exhibits.get($events_slct.exhibit_id) + () => db_events.exhibit.get($events_slct.exhibit_id) ); $: event_exhibit_tracking_obj = liveQuery( @@ -38,13 +38,13 @@ let tmp_search_terms = $events_sess.leads.entered_search_str.split(' ') $: event_badge_obj = liveQuery( - () => db_events.badges.get($events_slct.badge_id) + () => db_events.badge.get($events_slct.badge_id) ); // Version 2: This does not work yet let event_badge_obj_li = liveQuery( - // () => db_events.exhibits.toArray() - () => db_events.badges + // () => db_events.exhibit.toArray() + () => db_events.badge // .where({event_exhibit_id_random: $events_slct.exhibit_id, enable: true, hide: false}) // .where({event_id_random: $events_loc.event_id}) .where('event_id_random').equals($events_loc.event_id) @@ -65,8 +65,8 @@ let event_badge_obj_li = liveQuery( // We are using Dexie.js for the database. This liveQuery should only show records that match the event_id and contain the search string. // Version 3: This does not work yet let event_badge_obj_li_v3 = liveQuery( - // () => db_events.exhibits.toArray() - () => db_events.badges + // () => db_events.exhibit.toArray() + () => db_events.badge .where({event_exhibit_id_random: $events_slct.exhibit_id, full_name: $events_sess.leads.entered_search_str}) ); diff --git a/src/routes/events_leads/exhibit/[slug]/leads_list.svelte b/src/routes/events_leads/exhibit/[slug]/leads_list.svelte index 202bb43b..d66f82ed 100644 --- a/src/routes/events_leads/exhibit/[slug]/leads_list.svelte +++ b/src/routes/events_leads/exhibit/[slug]/leads_list.svelte @@ -24,7 +24,7 @@ let ae_triggers: key_val = { // The lq__ prefix is used to indicate that this is a liveQuery object and it should use the $ prefix when referencing the object. let lq__event_exhibit_obj = liveQuery( - () => db_events.exhibits.get($events_slct.exhibit_id) + () => db_events.exhibit.get($events_slct.exhibit_id) ); // let l_event_exhibit_tracking_obj = liveQuery( @@ -33,7 +33,7 @@ let lq__event_exhibit_obj = liveQuery( // Version 1: This is the version that works // let event_exhibit_tracking_obj_li = liveQuery( -// // () => db_events.exhibits.toArray() +// // () => db_events.exhibit.toArray() // () => db_events.exhibit_tracking // // .where('enable') // // .aboveOrEqual(0) @@ -64,7 +64,7 @@ let lq__event_exhibit_obj = liveQuery( // .reverse() // .sortBy('priority') // , 'sort', 'created_on', 'updated_on') -// () => db_events.exhibits.toArray() +// () => db_events.exhibit.toArray() // Version 2: This needs work... // This is using Dexie JS as a wrapper for IndexedDB diff --git a/src/routes/events_leads/exhibit/[slug]/leads_manage.svelte b/src/routes/events_leads/exhibit/[slug]/leads_manage.svelte index 7dffc2be..f9401f3b 100644 --- a/src/routes/events_leads/exhibit/[slug]/leads_manage.svelte +++ b/src/routes/events_leads/exhibit/[slug]/leads_manage.svelte @@ -17,7 +17,7 @@ let ae_triggers: key_val = {}; let ae_promises: key_val = {}; // Promise; $: event_exhibit_obj = liveQuery( - () => db_events.exhibits.get($events_slct.exhibit_id) + () => db_events.exhibit.get($events_slct.exhibit_id) ); // Quickly reload the data for this AE object from the API/DB diff --git a/src/routes/events_leads/exhibit/[slug]/leads_payment.svelte b/src/routes/events_leads/exhibit/[slug]/leads_payment.svelte index 2ffe7bac..9c4b288c 100644 --- a/src/routes/events_leads/exhibit/[slug]/leads_payment.svelte +++ b/src/routes/events_leads/exhibit/[slug]/leads_payment.svelte @@ -6,7 +6,7 @@ import { ae_loc, ae_sess, ae_api, slct, slct_trigger } from '$lib/ae_stores'; import { events_loc, events_sess, events_slct, events_trigger } from '$lib/ae_events_stores'; let event_exhibit_obj = liveQuery( - () => db_events.exhibits.get($events_slct.exhibit_id) + () => db_events.exhibit.get($events_slct.exhibit_id) ); if (!$events_sess.stripe) { diff --git a/src/routes/events_leads/exhibit/[slug]/leads_view_lead.svelte b/src/routes/events_leads/exhibit/[slug]/leads_view_lead.svelte index f56664b5..a5dc78e4 100644 --- a/src/routes/events_leads/exhibit/[slug]/leads_view_lead.svelte +++ b/src/routes/events_leads/exhibit/[slug]/leads_view_lead.svelte @@ -19,7 +19,7 @@ let ae_promises: key_val = {}; // Promise; let ae_triggers: key_val = {}; $: event_exhibit_obj = liveQuery( - () => db_events.exhibits.get($events_slct.exhibit_id) + () => db_events.exhibit.get($events_slct.exhibit_id) ); $: event_exhibit_tracking_obj = liveQuery( diff --git a/src/routes/idaa/(idaa)/recovery_meetings/+page.svelte b/src/routes/idaa/(idaa)/recovery_meetings/+page.svelte index f68abc4f..8e48d5c3 100644 --- a/src/routes/idaa/(idaa)/recovery_meetings/+page.svelte +++ b/src/routes/idaa/(idaa)/recovery_meetings/+page.svelte @@ -67,7 +67,7 @@ let event_id_random_li: Array = $state([]); // if (log_lvl) { // console.log(`Trying bulkGet:`, event_id_random_li); // } -// let results = await db_events.events +// let results = await db_events.event // .bulkGet(event_id_random_li); // return results; @@ -77,7 +77,7 @@ let event_id_random_li: Array = $state([]); // } // let results: any = null; // if ($idaa_loc.recovery_meetings.qry__order_by == 'name') { -// results = await db_events.events +// results = await db_events.event // .where(`${link_to_type}_id`) // .equals(link_to_id) // .and((event) => { @@ -88,7 +88,7 @@ let event_id_random_li: Array = $state([]); // }) // .sortBy('name') // } else { -// results = await db_events.events +// results = await db_events.event // .where(`${link_to_type}_id`) // .equals(link_to_id) // .and((event) => { @@ -110,7 +110,7 @@ let event_id_random_li: Array = $state([]); // })); // let lq__event_obj = $derived(liveQuery(async () => { -// let results = await db_events.events +// let results = await db_events.event // .get($idaa_slct.event_id ?? ''); // return results; @@ -129,7 +129,7 @@ let event_id_random_li: Array = $state([]); // if ($idaa_loc.recovery_meetings.qry__enabled !== 'all' || $idaa_loc.recovery_meetings.qry__hidden !== 'all') { // console.log(`Deleting disabled or hidden event.`); -// let results = db_events.events +// let results = db_events.event // .clear(); // console.log(`Deleted ${results} disabled event.`); @@ -177,7 +177,7 @@ $effect(() => { if (enabled !== 'all' || hidden !== 'all') { console.log(`Deleting disabled or hidden event.`); - let results = db_events.events + let results = db_events.event .clear(); console.log(`Deleted ${results} disabled event.`); diff --git a/src/routes/idaa/(idaa)/recovery_meetings/[event_id]/+page.svelte b/src/routes/idaa/(idaa)/recovery_meetings/[event_id]/+page.svelte index 2dd74985..50864248 100644 --- a/src/routes/idaa/(idaa)/recovery_meetings/[event_id]/+page.svelte +++ b/src/routes/idaa/(idaa)/recovery_meetings/[event_id]/+page.svelte @@ -44,7 +44,7 @@ let lq__event_obj = $derived(liveQuery(async () => { if (log_lvl) { console.log(`lq__event_obj: event_id = ${$idaa_slct?.event_id}`); } - let results = await db_events.events + let results = await db_events.event .get($idaa_slct?.event_id ?? ''); // null or undefined does not reset things like '' does // Check if results are different than the current $idaa_slct.event_obj 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 5998fc86..2a7c9ee6 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 @@ -63,7 +63,7 @@ let lq__event_obj_li = $derived(liveQuery(async () => { // if (!event_id_random_li.length) { // return []; // } - let results = await db_events.events + let results = await db_events.event .bulkGet(event_id_random_li); return results; @@ -73,7 +73,7 @@ let lq__event_obj_li = $derived(liveQuery(async () => { } let results: any = null; if (order_by == 'name') { - results = await db_events.events + results = await db_events.event .where(dq__where_type_id_val) .equals(dq__where_eq_id_val) .and((event) => { @@ -85,7 +85,7 @@ let lq__event_obj_li = $derived(liveQuery(async () => { .sortBy('name') // This should be sorted by a custom sort field } else { - results = await db_events.events + results = await db_events.event .where(dq__where_type_id_val) .equals(dq__where_eq_id_val) .and((event) => {