diff --git a/src/routes/events/[event_id]/(badges)/badges/+page.svelte b/src/routes/events/[event_id]/(badges)/badges/+page.svelte index c43c37c2..b6a9232e 100644 --- a/src/routes/events/[event_id]/(badges)/badges/+page.svelte +++ b/src/routes/events/[event_id]/(badges)/badges/+page.svelte @@ -50,16 +50,20 @@ let url_test_val = data.url.searchParams.get('test_val'); console.log(`URL test_val = ${url_test_val}`); - 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.event.get($events_slct?.event_id ?? ''); + import { onMount } from 'svelte'; - return results; - }) - ); + let lq__event_obj = $state(null); + + onMount(() => { + const observable = liveQuery(() => db_events.event.get($events_slct?.event_id ?? '')); + const subscription = observable.subscribe((value) => { + lq__event_obj = value; + }); + + return () => { + subscription.unsubscribe(); + }; + }); let event_badge_id_li: Array = $state([]); // let dq__where_type_id_val: string = `event_id_random`; @@ -95,7 +99,7 @@ Badges - - {ae_util.shorten_string({ string: $lq__event_obj?.name ?? '-- not set --', max_length: 12 })} + {ae_util.shorten_string({ string: lq__event_obj?.name ?? '-- not set --', max_length: 12 })} - OSIT's Æ Events @@ -106,7 +110,6 @@ {#if $events_sess?.badges?.search_status != 'loading' && $events_sess?.badges?.search_status != 'processing'} + // Page for printing badges + + +

Print Badges

+ +

This page will be used for printing badges.

diff --git a/src/routes/events/[event_id]/(badges)/badges/[badge_id]/review/+page.svelte b/src/routes/events/[event_id]/(badges)/badges/[badge_id]/review/+page.svelte new file mode 100644 index 00000000..163d7bf3 --- /dev/null +++ b/src/routes/events/[event_id]/(badges)/badges/[badge_id]/review/+page.svelte @@ -0,0 +1,7 @@ + + +

Review Badges

+ +

This page will be used for reviewing badges.

diff --git a/src/routes/events/[event_id]/(badges)/badges/ae_comp__badge_obj_li.svelte b/src/routes/events/[event_id]/(badges)/badges/ae_comp__badge_obj_li.svelte index f92717cc..5f06f7f2 100644 --- a/src/routes/events/[event_id]/(badges)/badges/ae_comp__badge_obj_li.svelte +++ b/src/routes/events/[event_id]/(badges)/badges/ae_comp__badge_obj_li.svelte @@ -21,12 +21,7 @@ let { container_class_li = [], - use_id_li = $bindable(true), - event_badge_id_li = $bindable([]), - qry_idb = false, - qry_str = '', - qry_type_code = '', - // event_badge_obj_li = $bindable(), + badge_obj_li = [], link_to_type, link_to_id, log_lvl = $bindable(0), @@ -40,9 +35,12 @@ // import { goto } from '$app/navigation'; // *** Import other supporting libraries - import { liveQuery } from 'dexie'; + // import { liveQuery } from 'dexie'; // No longer needed // *** Import Aether specific variables and functions + // import type { key_val } from '$lib/stores/ae_stores'; + // import { ae_util } from '$lib/ae_utils/ae_utils'; // No longer needed + // import { api } from '$lib/api/api'; // No longer needed import { ae_snip, ae_loc, @@ -59,177 +57,26 @@ events_slct, events_trigger } from '$lib/stores/ae_events_stores'; - import { db_events } from '$lib/ae_events/db_events'; + // import { db_events } from '$lib/ae_events/db_events'; // No longer needed - if (log_lvl) { - if (link_to_type && link_to_id) { - console.log(`link_to_type: ${link_to_type}; link_to_id: ${link_to_id}`); - } else { - console.log(`No link_to_type or link_to_id defined.`); - } - } - - // Variables - // let ae_promises: key_val = {}; - // let ae_tmp: key_val = {}; - // let ae_triggers: key_val = {}; - - // let event_badge_id_li: Array = $state([]); - - // *** Functions and Logic - let lq__event_badge_obj_li = $derived( - liveQuery(async () => { - let results: any; - log_lvl = 1; - - if (use_id_li && event_badge_id_li?.length) { - if (log_lvl) { - console.log(`LQ - Using event_badge_id_li to get event badges.`, event_badge_id_li); - } - - results = await db_events.badge.bulkGet(event_badge_id_li); - } else if (qry_str && qry_str?.length) { - if (log_lvl) { - console.log(`LQ - Using qry_str to get event badges. qry_str=${qry_str}`); - } - - // let ft_query = ae_util.sanitize_fulltext_search(qry_str); - // let ft_query = qry_str; - if (log_lvl) { - console.log(`Fulltext search query: ${qry_str}`); - } - - if (qry_type_code && qry_type_code !== 'all') { - if (log_lvl) { - console.log(`Also filtering by badge type code: ${qry_type_code}`); - } - results = await db_events.badge - .where('default_qry_string') - .equalsIgnoreCase(qry_str) - // .equals(ft_query) - // .and((badge) => badge.badge_type_code === qry_type_code && badge.event_id === $events_slct.event_id) - .sortBy('tmp_sort_2'); - } else { - // .matches(/testing/i).toArray() - // .matches(/middle_text/i).toArray() - - results = await db_events.badge - .where('full_name') - .startsWithIgnoreCase(qry_str) - // .startsWithIgnoreCase(qry_str) - // .where('default_qry_string') - // .equalsIgnoreCase(qry_str) - // .equals(ft_query) - // .and((badge) => badge.event_id === $events_slct.event_id) - .sortBy('tmp_sort_2'); - } - - // event_badge_id_li = results.map((badge) => badge.event_badge_id); - - // } else if (event_badge_obj_li?.length) { - // if (log_lvl) { - // console.log(`LQ - Using event_badge_obj_li to get event badges.`); - // } - - // event_badge_id_li = []; // This is to prevent the array from constantly updating and triggering the liveQuery. - - // for (let i = 0; i < event_badge_obj_li.length; i++) { - // let event_badge_obj = event_badge_obj_li[i]; - // let event_badge_id_random = event_badge_obj.event_badge_id_random; - // event_badge_id_li.push(event_badge_id_random); - // } - - // results = await db_events.badge - // .bulkGet(event_badge_id_li); - } else if (link_to_type && link_to_id) { - let dq__where_type_id_val: string = `${link_to_type}_id_random`; - let dq__where_eq_id_val: string = link_to_id ?? ''; - - if (log_lvl) { - console.log( - `LQ - Trying where: ${dq__where_type_id_val}; equals: ${dq__where_eq_id_val}` - ); - } - // event_badge_id_li = []; - results = await db_events.badge - .where(dq__where_type_id_val) - .equals(dq__where_eq_id_val) - .sortBy('tmp_sort_2'); - - // event_badge_id_li = results.map((badge) => badge.event_badge_id); - - // } else { - // event_badge_id_li = []; - // results = []; - } - - // log_lvl = 1; - // Check if results are different than the current badge version stored under $events_slct - if ( - $events_slct.event_badge_obj_li && - JSON.stringify($events_slct.event_badge_obj_li) !== JSON.stringify(results) - ) { - $events_slct.event_badge_obj_li = [...results]; - if (log_lvl) { - console.log( - `Session slct li stored version has changed for ID = ${$events_slct.event_id}`, - $events_slct.event_badge_obj_li - ); - } - } else if (!$events_slct?.event_badge_obj_li) { - $events_slct.event_badge_obj_li = [...results]; - if (log_lvl) { - console.log( - `Session slct li stored version was not set for ID = ${$events_slct.event_id}`, - $events_slct.event_badge_obj_li - ); - } - } else { - if (log_lvl > 1) { - console.log( - `Session slct li stored version has not changed for ID = ${$events_slct.event_id}`, - $events_slct.event_badge_obj_li - ); - } - } - - return results; - - // if (event_badge_id_li.length) { - // let results = await db_events.badge - // .bulkGet(event_badge_id_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.badge - // .where(dq__where_type_id_val) - // .equals(dq__where_eq_id_val) - // .sortBy('name') - - // return results; - // } else { - // return null; - // } - }) - ); + let trusted_access = $derived($ae_loc.trusted_access);
- {#if $lq__event_badge_obj_li?.length} + {#if badge_obj_li?.length}

Results:

- {$lq__event_badge_obj_li.length}× + {badge_obj_li.length}×
    - {#each $lq__event_badge_obj_li as event_badge_obj (event_badge_obj.event_badge_id_random)} + {#each badge_obj_li as event_badge_obj (event_badge_obj.event_badge_id_random)}
  • - {#if $ae_loc.trusted_access} + {#if trusted_access} {event_badge_obj.print_count}×{event_badge_obj.print_count}× {/if} {/if} - - {#if event_badge_obj.full_name_override} - {event_badge_obj.full_name_override} - {:else if event_badge_obj.full_name} - {event_badge_obj.full_name} - {:else if event_badge_obj.given_name} - {event_badge_obj.given_name} {event_badge_obj.family_name} - {:else} - -- no name -- - {/if} - + + {#if event_badge_obj.full_name_override} + {event_badge_obj.full_name_override} + {:else if event_badge_obj.full_name} + {event_badge_obj.full_name} + {:else if event_badge_obj.given_name} + {event_badge_obj.given_name} {event_badge_obj.family_name} + {:else} + -- no name -- + {/if} + {#if show_sensitive_fields} @@ -315,4 +162,4 @@

    No results available to show.

    {/if} -
+ \ No newline at end of file diff --git a/src/routes/events/[event_id]/(badges)/badges/ae_comp__badge_search.svelte b/src/routes/events/[event_id]/(badges)/badges/ae_comp__badge_search.svelte index f4793046..15ff26a4 100644 --- a/src/routes/events/[event_id]/(badges)/badges/ae_comp__badge_search.svelte +++ b/src/routes/events/[event_id]/(badges)/badges/ae_comp__badge_search.svelte @@ -164,6 +164,9 @@ for (let i = 0; i < search_results.length; i++) { let event_badge_obj = search_results[i]; let event_badge_id_random = event_badge_obj.event_badge_id_random; + if (log_lvl) { + console.log(`Found badge: ${event_badge_obj.full_name}, id_random: ${event_badge_id_random}`); + } tmp_event_badge_id_li.push(event_badge_id_random); } event_badge_id_li = tmp_event_badge_id_li; diff --git a/src/routes/events/[event_id]/(badges)/badges/stats/+page.svelte b/src/routes/events/[event_id]/(badges)/badges/stats/+page.svelte new file mode 100644 index 00000000..73ded6af --- /dev/null +++ b/src/routes/events/[event_id]/(badges)/badges/stats/+page.svelte @@ -0,0 +1,7 @@ + + +

Badge Stats

+ +

This page will show statistics for badges.

diff --git a/src/routes/events/[event_id]/(leads)/leads/+layout.svelte b/src/routes/events/[event_id]/(leads)/leads/+layout.svelte new file mode 100644 index 00000000..3ce70918 --- /dev/null +++ b/src/routes/events/[event_id]/(leads)/leads/+layout.svelte @@ -0,0 +1,7 @@ + + +
+ +
diff --git a/src/routes/events/[event_id]/(leads)/leads/+page.svelte b/src/routes/events/[event_id]/(leads)/leads/+page.svelte new file mode 100644 index 00000000..0992292f --- /dev/null +++ b/src/routes/events/[event_id]/(leads)/leads/+page.svelte @@ -0,0 +1,32 @@ + + +
+

Exhibitor Leads

+ + {#if $event_exhibit_obj_li && $event_exhibit_obj_li.length > 0} +

Select your exhibit from the list

+ + {:else} +

No exhibits found for this event.

+ {/if} +
\ No newline at end of file diff --git a/src/routes/events/[event_id]/(leads)/leads/[lead_id]/+page.svelte b/src/routes/events/[event_id]/(leads)/leads/[lead_id]/+page.svelte new file mode 100644 index 00000000..24ef67ab --- /dev/null +++ b/src/routes/events/[event_id]/(leads)/leads/[lead_id]/+page.svelte @@ -0,0 +1,7 @@ + + +

Lead Details

+ +

This page will show the details for a single lead.

diff --git a/src/routes/events/[event_id]/(leads)/leads/exhibit/[exhibit_id]/+page.svelte b/src/routes/events/[event_id]/(leads)/leads/exhibit/[exhibit_id]/+page.svelte new file mode 100644 index 00000000..436b81ed --- /dev/null +++ b/src/routes/events/[event_id]/(leads)/leads/exhibit/[exhibit_id]/+page.svelte @@ -0,0 +1,7 @@ + + +

Exhibitor Leads

+ +

This page will list all leads for a specific exhibitor.