diff --git a/src/routes/events/[event_id]/(leads)/leads/+page.svelte b/src/routes/events/[event_id]/(leads)/leads/+page.svelte index 1c990267..09b556c2 100644 --- a/src/routes/events/[event_id]/(leads)/leads/+page.svelte +++ b/src/routes/events/[event_id]/(leads)/leads/+page.svelte @@ -2,7 +2,11 @@ import { onMount, untrack } from 'svelte'; import { liveQuery } from 'dexie'; import { db_events } from '$lib/ae_events/db_events'; - import { events_loc, events_sess, events_slct } from '$lib/stores/ae_events_stores'; + import { + events_loc, + events_sess, + events_slct + } from '$lib/stores/ae_events_stores'; import { ae_api, ae_loc } from '$lib/stores/ae_stores'; import { page } from '$app/state'; import { events_func } from '$lib/ae_events_functions'; @@ -11,10 +15,14 @@ // *** Initialization & Store Guard *** if ($events_loc.leads) { - if (typeof $events_loc.leads.search_version === 'undefined') $events_loc.leads.search_version = 0; - if (typeof $events_loc.leads.qry__remote_first === 'undefined') $events_loc.leads.qry__remote_first = false; - if (typeof $events_loc.leads.qry__search_text === 'undefined') $events_loc.leads.qry__search_text = ''; - if (typeof $events_loc.leads.qry__sort_order === 'undefined') $events_loc.leads.qry__sort_order = 'name_asc'; + if (typeof $events_loc.leads.search_version === 'undefined') + $events_loc.leads.search_version = 0; + if (typeof $events_loc.leads.qry__remote_first === 'undefined') + $events_loc.leads.qry__remote_first = false; + if (typeof $events_loc.leads.qry__search_text === 'undefined') + $events_loc.leads.qry__search_text = ''; + if (typeof $events_loc.leads.qry__sort_order === 'undefined') + $events_loc.leads.qry__sort_order = 'name_asc'; } let exhibit_id_li: Array = $state([]); @@ -27,14 +35,14 @@ let lq__event_exhibit_obj_li = $derived.by(() => { const ids = exhibit_id_li; const event_id = page.params.event_id; - + return liveQuery(async () => { // SCENARIO 1: Specific IDs provided (Search Results) if (Array.isArray(ids) && ids.length > 0) { const results = await db_events.exhibit.bulkGet(ids); - return results.filter(item => item !== undefined); + return results.filter((item) => item !== undefined); } - + // SCENARIO 2: Fallback broad search if (event_id && !$events_loc.leads.qry__search_text) { return await db_events.exhibit @@ -77,7 +85,7 @@ const current_search_id = ++last_search_id; const event_id = params.event_id; const remote_first = params.remote_first; - + if (!event_id) return; untrack(() => { @@ -92,11 +100,15 @@ let local_results = await db_events.exhibit .where('event_id_random') .equals(event_id) - .filter(exhibit => { + .filter((exhibit) => { if (qry_str) { const name = (exhibit.name ?? '').toLowerCase(); const code = (exhibit.code ?? '').toLowerCase(); - if (!name.includes(qry_str) && !code.includes(qry_str)) return false; + if ( + !name.includes(qry_str) && + !code.includes(qry_str) + ) + return false; } return true; }) @@ -104,16 +116,27 @@ local_results.sort((a, b) => { switch (params.sort) { - case 'name_asc': return (a.name ?? '').localeCompare(b.name ?? ''); - case 'name_desc': return (b.name ?? '').localeCompare(a.name ?? ''); - case 'code_asc': return (a.code ?? '').localeCompare(b.code ?? ''); - case 'code_desc': return (b.code ?? '').localeCompare(a.code ?? ''); - case 'updated_desc': return new Date(b.updated_on || 0).getTime() - new Date(a.updated_on || 0).getTime(); - default: return (a.name ?? '').localeCompare(b.name ?? ''); + case 'name_asc': + return (a.name ?? '').localeCompare(b.name ?? ''); + case 'name_desc': + return (b.name ?? '').localeCompare(a.name ?? ''); + case 'code_asc': + return (a.code ?? '').localeCompare(b.code ?? ''); + case 'code_desc': + return (b.code ?? '').localeCompare(a.code ?? ''); + case 'updated_desc': + return ( + new Date(b.updated_on || 0).getTime() - + new Date(a.updated_on || 0).getTime() + ); + default: + return (a.name ?? '').localeCompare(b.name ?? ''); } }); - const local_ids = local_results.map(e => String(e.id || e.event_exhibit_id_random)).filter(Boolean); + const local_ids = local_results + .map((e) => String(e.id || e.event_exhibit_id_random)) + .filter(Boolean); if (current_search_id === last_search_id) { untrack(() => { exhibit_id_li = local_ids; @@ -128,12 +151,23 @@ try { let order_by_li: any = {}; switch (params.sort) { - case 'name_asc': order_by_li = { name: 'ASC' }; break; - case 'name_desc': order_by_li = { name: 'DESC' }; break; - case 'code_asc': order_by_li = { code: 'ASC' }; break; - case 'code_desc': order_by_li = { code: 'DESC' }; break; - case 'updated_desc': order_by_li = { updated_on: 'DESC' }; break; - default: order_by_li = { name: 'ASC' }; + case 'name_asc': + order_by_li = { name: 'ASC' }; + break; + case 'name_desc': + order_by_li = { name: 'DESC' }; + break; + case 'code_asc': + order_by_li = { code: 'ASC' }; + break; + case 'code_desc': + order_by_li = { code: 'DESC' }; + break; + case 'updated_desc': + order_by_li = { updated_on: 'DESC' }; + break; + default: + order_by_li = { name: 'ASC' }; } const results = await events_func.search__exhibit({ @@ -145,7 +179,9 @@ }); if (current_search_id === last_search_id) { - const api_ids = results.map((e: any) => String(e.id || e.event_exhibit_id_random)).filter(Boolean); + const api_ids = results + .map((e: any) => String(e.id || e.event_exhibit_id_random)) + .filter(Boolean); untrack(() => { exhibit_id_li = api_ids; $events_sess.leads.submit_status__search = 'done'; @@ -161,33 +197,40 @@ } -
+

Exhibitor Leads

- + {#if $events_sess.leads.submit_status__search === 'searching' && exhibit_id_li.length === 0} -
+

Searching exhibits...

{:else if $lq__event_exhibit_obj_li && $lq__event_exhibit_obj_li.length > 0}

Select your exhibit from the list

-
+
{#each $lq__event_exhibit_obj_li as exhibit_obj} -
{exhibit_obj.name}
-
Booth #{exhibit_obj.code}
+
+ Booth #{exhibit_obj.code} +
{/each}
{:else}

No exhibits found matching your search.

{/if} -
\ No newline at end of file +
diff --git a/src/routes/events/[event_id]/(leads)/leads/ae_comp__exhibit_search.svelte b/src/routes/events/[event_id]/(leads)/leads/ae_comp__exhibit_search.svelte index 411fa41b..b6ca6068 100644 --- a/src/routes/events/[event_id]/(leads)/leads/ae_comp__exhibit_search.svelte +++ b/src/routes/events/[event_id]/(leads)/leads/ae_comp__exhibit_search.svelte @@ -4,10 +4,7 @@ log_lvl?: number; } - let { - event_id, - log_lvl = 0 - }: Props = $props(); + let { event_id, log_lvl = 0 }: Props = $props(); // *** Import other supporting libraries import { @@ -17,13 +14,8 @@ LoaderCircle } from 'lucide-svelte'; - import { - ae_loc - } from '$lib/stores/ae_stores'; - import { - events_loc, - events_sess - } from '$lib/stores/ae_events_stores'; + import { ae_loc } from '$lib/stores/ae_stores'; + import { events_loc, events_sess } from '$lib/stores/ae_events_stores'; function handle_search_trigger() { if ($events_loc.leads.search_version === undefined) { @@ -34,13 +26,15 @@ function prevent_default(fn: (event: T) => void) { return function (event: T) { - event.prevent_default(); + event.preventDefault(); fn(event); }; } -
+
{ handle_search_trigger(); @@ -48,7 +42,9 @@ autocomplete="off" class="search_form flex flex-row flex-wrap gap-1 items-center justify-center w-full max-w-7xl px-2 md:px-12 py-2 preset-tonal-success rounded-lg shadow-sm" > -
+
- + = $state([]); @@ -28,13 +38,13 @@ let lq__event_exhibit_tracking_obj_li = $derived.by(() => { const ids = tracking_id_li; const exhibit_id = page.params.exhibit_id; - + return liveQuery(async () => { if (Array.isArray(ids) && ids.length > 0) { const results = await db_events.exhibit_tracking.bulkGet(ids); - return results.filter(item => item !== undefined); + return results.filter((item) => item !== undefined); } - + if (exhibit_id && !$events_loc.leads.tracking__qry__search_text) { return await db_events.exhibit_tracking .where('event_exhibit_id_random') @@ -57,7 +67,9 @@ // Standardized Reactive Search Pattern let search_params = $derived({ v: $events_loc.leads.tracking__search_version, - str: ($events_loc.leads.tracking__qry__search_text ?? '').toLowerCase().trim(), + str: ($events_loc.leads.tracking__qry__search_text ?? '') + .toLowerCase() + .trim(), sort: $events_loc.leads.tracking__qry__sort_order, exhibit_id: page.params.exhibit_id, remote_first: $events_loc.leads.tracking__qry__remote_first @@ -84,7 +96,7 @@ const current_search_id = ++last_search_id; const exhibit_id = params.exhibit_id; const remote_first = params.remote_first; - + if (!exhibit_id) return; untrack(() => { @@ -99,12 +111,23 @@ let local_results = await db_events.exhibit_tracking .where('event_exhibit_id_random') .equals(exhibit_id) - .filter(tracking => { + .filter((tracking) => { if (qry_str) { - const name = (tracking.event_badge_full_name ?? '').toLowerCase(); - const email = (tracking.event_badge_email ?? '').toLowerCase(); - const notes = (tracking.exhibitor_notes ?? '').toLowerCase(); - if (!name.includes(qry_str) && !email.includes(qry_str) && !notes.includes(qry_str)) return false; + const name = ( + tracking.event_badge_full_name ?? '' + ).toLowerCase(); + const email = ( + tracking.event_badge_email ?? '' + ).toLowerCase(); + const notes = ( + tracking.exhibitor_notes ?? '' + ).toLowerCase(); + if ( + !name.includes(qry_str) && + !email.includes(qry_str) && + !notes.includes(qry_str) + ) + return false; } return true; }) @@ -112,15 +135,37 @@ local_results.sort((a, b) => { switch (params.sort) { - case 'name_asc': return (a.event_badge_full_name ?? '').localeCompare(b.event_badge_full_name ?? ''); - case 'name_desc': return (b.event_badge_full_name ?? '').localeCompare(a.event_badge_full_name ?? ''); - case 'created_asc': return new Date(a.created_on || 0).getTime() - new Date(b.created_on || 0).getTime(); - case 'created_desc': return new Date(b.created_on || 0).getTime() - new Date(a.created_on || 0).getTime(); - default: return new Date(b.created_on || 0).getTime() - new Date(a.created_on || 0).getTime(); + case 'name_asc': + return ( + a.event_badge_full_name ?? '' + ).localeCompare(b.event_badge_full_name ?? ''); + case 'name_desc': + return ( + b.event_badge_full_name ?? '' + ).localeCompare(a.event_badge_full_name ?? ''); + case 'created_asc': + return ( + new Date(a.created_on || 0).getTime() - + new Date(b.created_on || 0).getTime() + ); + case 'created_desc': + return ( + new Date(b.created_on || 0).getTime() - + new Date(a.created_on || 0).getTime() + ); + default: + return ( + new Date(b.created_on || 0).getTime() - + new Date(a.created_on || 0).getTime() + ); } }); - const local_ids = local_results.map(e => String(e.id || e.event_exhibit_tracking_id_random)).filter(Boolean); + const local_ids = local_results + .map((e) => + String(e.id || e.event_exhibit_tracking_id_random) + ) + .filter(Boolean); if (current_search_id === last_search_id) { untrack(() => { tracking_id_li = local_ids; @@ -135,11 +180,20 @@ try { let order_by_li: any = {}; switch (params.sort) { - case 'name_asc': order_by_li = { event_badge_full_name: 'ASC' }; break; - case 'name_desc': order_by_li = { event_badge_full_name: 'DESC' }; break; - case 'created_asc': order_by_li = { created_on: 'ASC' }; break; - case 'created_desc': order_by_li = { created_on: 'DESC' }; break; - default: order_by_li = { created_on: 'DESC' }; + case 'name_asc': + order_by_li = { event_badge_full_name: 'ASC' }; + break; + case 'name_desc': + order_by_li = { event_badge_full_name: 'DESC' }; + break; + case 'created_asc': + order_by_li = { created_on: 'ASC' }; + break; + case 'created_desc': + order_by_li = { created_on: 'DESC' }; + break; + default: + order_by_li = { created_on: 'DESC' }; } const results = await events_func.search__exhibit_tracking({ @@ -151,7 +205,11 @@ }); if (current_search_id === last_search_id) { - const api_ids = results.map((e: any) => String(e.id || e.event_exhibit_tracking_id_random)).filter(Boolean); + const api_ids = results + .map((e: any) => + String(e.id || e.event_exhibit_tracking_id_random) + ) + .filter(Boolean); untrack(() => { tracking_id_li = api_ids; $events_sess.leads.submit_status__search = 'done'; @@ -169,7 +227,7 @@ async function handle_export() { const exhibit_id = page.params.exhibit_id; if (!exhibit_id) return; - + await events_func.handle_download_export__event_exhibit_tracking({ api_cfg: $ae_api, exhibit_id: exhibit_id, @@ -178,34 +236,45 @@ } -
-
+
+
-

Leads for {$lq__exhibit_obj?.name ?? 'Exhibitor'}

+

+ Leads for {$lq__exhibit_obj?.name ?? 'Exhibitor'} +

Booth #{$lq__exhibit_obj?.code ?? '...'}

- - + Add Lead
- + {#if $events_sess.leads.submit_status__search === 'searching' && tracking_id_li.length === 0} -
+

Searching leads...

{:else} - + {/if} -
\ No newline at end of file +
diff --git a/src/routes/events/[event_id]/(leads)/leads/exhibit/[exhibit_id]/ae_comp__exhibit_tracking_obj_li.svelte b/src/routes/events/[event_id]/(leads)/leads/exhibit/[exhibit_id]/ae_comp__exhibit_tracking_obj_li.svelte index b0832f40..615480bd 100644 --- a/src/routes/events/[event_id]/(leads)/leads/exhibit/[exhibit_id]/ae_comp__exhibit_tracking_obj_li.svelte +++ b/src/routes/events/[event_id]/(leads)/leads/exhibit/[exhibit_id]/ae_comp__exhibit_tracking_obj_li.svelte @@ -6,11 +6,11 @@ let { lq__event_exhibit_tracking_obj_li, log_lvl = 0 }: Props = $props(); - import { - User, - Mail, - MapPin, - Clock, + import { + User, + Mail, + MapPin, + Clock, FileText, ChevronRight } from 'lucide-svelte'; @@ -32,7 +32,9 @@ {:else if $lq__event_exhibit_tracking_obj_li.length === 0}

No leads found yet.

-

Start scanning badges to collect leads!

+

+ Start scanning badges to collect leads! +

{:else}
@@ -44,7 +46,7 @@
{#each $lq__event_exhibit_tracking_obj_li as tracking_obj} - @@ -52,11 +54,15 @@
- {tracking_obj.event_badge_full_name || tracking_obj.event_badge_full_name_override || 'Unknown Attendee'} + {tracking_obj.event_badge_full_name || + tracking_obj.event_badge_full_name_override || + 'Unknown Attendee'}
- -
+ +
{#if tracking_obj.event_badge_email}
@@ -76,9 +82,14 @@
{#if tracking_obj.exhibitor_notes} -
+
- {ae_util.shorten_string({ string: tracking_obj.exhibitor_notes, max_length: 100 })} + {ae_util.shorten_string({ + string: tracking_obj.exhibitor_notes, + max_length: 100 + })}
{/if}
diff --git a/src/routes/events/[event_id]/(leads)/leads/exhibit/[exhibit_id]/ae_comp__exhibit_tracking_search.svelte b/src/routes/events/[event_id]/(leads)/leads/exhibit/[exhibit_id]/ae_comp__exhibit_tracking_search.svelte index 20b59d0e..83e20433 100644 --- a/src/routes/events/[event_id]/(leads)/leads/exhibit/[exhibit_id]/ae_comp__exhibit_tracking_search.svelte +++ b/src/routes/events/[event_id]/(leads)/leads/exhibit/[exhibit_id]/ae_comp__exhibit_tracking_search.svelte @@ -4,10 +4,7 @@ log_lvl?: number; } - let { - exhibit_id, - log_lvl = 0 - }: Props = $props(); + let { exhibit_id, log_lvl = 0 }: Props = $props(); // *** Import other supporting libraries import { @@ -17,13 +14,8 @@ LoaderCircle } from 'lucide-svelte'; - import { - ae_loc - } from '$lib/stores/ae_stores'; - import { - events_loc, - events_sess - } from '$lib/stores/ae_events_stores'; + import { ae_loc } from '$lib/stores/ae_stores'; + import { events_loc, events_sess } from '$lib/stores/ae_events_stores'; function handle_search_trigger() { if ($events_loc.leads.tracking__search_version === undefined) { @@ -34,13 +26,15 @@ function prevent_default(fn: (event: T) => void) { return function (event: T) { - event.prevent_default(); + event.preventDefault(); fn(event); }; } -
+
{ handle_search_trigger(); @@ -48,7 +42,9 @@ autocomplete="off" class="search_form flex flex-row flex-wrap gap-1 items-center justify-center w-full max-w-7xl px-2 md:px-12 py-2 preset-tonal-primary rounded-lg shadow-sm" > -
+
- +