Scott.Idem/OSIT-AE-App-Svelte
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improved sorting for badges. Waiting on an API fix to include the missing badge fields. I think only the minimum is being returned. We need things like the print_count, print_first_datetime, and other fields.

Browse Source
This commit is contained in:
Scott Idem
2026-01-05 18:02:09 -05:00
parent cdca5d64be
commit 17589596bc
3 changed files with 206 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib/ae_events/ae_events__event_badge.ts
View File

@@ -466,7 +466,7 @@ export async function search__event_badge({
log_lvl?: number; log_lvl?: number;
}) { }) {
if (log_lvl) { if (log_lvl) {
console.log(`*** search__event_badge() *** event_id=${event_id} printed_status=${printed_status} affiliations=${affiliations_qry_str}`); console.log(`*** search__event_badge() *** event_id=${event_id} printed_status=${printed_status} affiliations=${affiliations_qry_str} order_by_li=`, order_by_li);
} }
if (!fulltext_search_qry_str && !like_search_qry_str && !affiliations_qry_str && !type_code && !external_event_id && printed_status === 'all') { if (!fulltext_search_qry_str && !like_search_qry_str && !affiliations_qry_str && !type_code && !external_event_id && printed_status === 'all') {
@@ -633,6 +633,8 @@ export const properties_to_save = [
'updated_on', 'updated_on',
'print_count', 'print_count',
'print_first_datetime',
'print_last_datetime',
// Generated fields for sorting locally only // Generated fields for sorting locally only
'tmp_sort_1', 'tmp_sort_1',

237
src/routes/events/[event_id]/(badges)/badges/ae_comp__badge_obj_li.svelte
View File

@@ -24,6 +24,7 @@
import { liveQuery } from 'dexie'; import { liveQuery } from 'dexie';
import { db_events, type Badge } from '$lib/ae_events/db_events'; import { db_events, type Badge } from '$lib/ae_events/db_events';
import { ae_loc } from '$lib/stores/ae_stores'; import { ae_loc } from '$lib/stores/ae_stores';
import { ae_util } from '$lib/ae_utils/ae_utils';
// let trusted_access = $derived(ae_loc.trusted_access); // This does NOT work with Svelte v5 // let trusted_access = $derived(ae_loc.trusted_access); // This does NOT work with Svelte v5
// let trusted_access = $ae_loc?.trusted_access; // This works with Svelte v5 // let trusted_access = $ae_loc?.trusted_access; // This works with Svelte v5
@@ -31,7 +32,16 @@
liveQuery(async () => { liveQuery(async () => {
if (badge_obj_li?.length) { if (badge_obj_li?.length) {
const ids = badge_obj_li.map((b) => b.event_badge_id_random); const ids = badge_obj_li.map((b) => b.event_badge_id_random);
return await db_events.badge.bulkGet(ids); const db_results = await db_events.badge.bulkGet(ids);
// Create a map for quick lookup by ID to restore order
// bulkGet does not guarantee order, so we must re-sort based on the input list
const db_results_map = new Map(
db_results.filter(Boolean).map((item) => [item.event_badge_id_random, item])
);
// Return items in the exact order of the original 'ids' array
return ids.map((id) => db_results_map.get(id)).filter(Boolean);
} }
return []; return [];
}) })
@@ -51,114 +61,157 @@
<!-- The email should only be the first 3 chars and then @domain name. --> <!-- The email should only be the first 3 chars and then @domain name. -->
<ul class="list-disc list-inside"> <ul class="list-disc list-inside w-full">
{#each $lq__event_badge_obj_li.filter(Boolean) as event_badge_obj: Badge (event_badge_obj?.event_badge_id)} {#each $lq__event_badge_obj_li.filter(Boolean) as event_badge_obj: Badge (event_badge_obj?.event_badge_id)}
{#if !event_badge_obj?.hide || $ae_loc.trusted_access} {#if !event_badge_obj?.hide || $ae_loc.trusted_access}
<li <li
class=" class="
border-b border-gray-300 dark:border-gray-600 py-0.5 border-b border-gray-300 dark:border-gray-600 py-0.5
flex flex-row gap-1 items-center justify-between w-full flex flex-row flex-wrap gap-1 items-center justify-between w-full
" "
> >
{#if event_badge_obj?.print_count < 1 || $ae_loc.trusted_access} <div class="flex flex-row flex-wrap gap-1 items-center justify-start grow">
<a {#if event_badge_obj?.print_count < 1 || $ae_loc.trusted_access}
href={`/events/${event_badge_obj?.event_id}/badges/${event_badge_obj?.event_badge_id}`} <a
class="flex flex-row gap-1 items-center justify-start min-w-fit" href={`/events/${event_badge_obj?.event_id}/badges/${event_badge_obj?.event_badge_id}`}
title={`Badge: ${event_badge_obj?.full_name ?? event_badge_obj?.given_name ?? '-- no name --'}\nID: ${event_badge_obj?.event_badge_id}`} class="flex flex-row gap-1 items-center justify-start min-w-fit"
> title={`Badge: ${event_badge_obj?.full_name ?? event_badge_obj?.given_name ?? '-- no name --'}\nID: ${event_badge_obj?.event_badge_id}`}
<span> >
{#if event_badge_obj?.hide} <span>
<span class="fas fa-eye-slash mx-1"></span> {#if event_badge_obj?.hide}
{:else} <span class="fas fa-eye-slash mx-1"></span>
<span class="fas fa-id-badge mx-1"></span> {:else}
{/if} <span class="fas fa-id-badge mx-1"></span>
{#if event_badge_obj?.print_count >= 1} {/if}
<!-- Show a green checkmark --> {#if event_badge_obj?.print_count >= 1}
<span class="fas fa-check text-green-500"></span> <!-- Show a green checkmark -->
<span class="fas fa-check text-green-500"></span>
<span class="print_count px-1" <span class="print_count px-1"
>{event_badge_obj?.print_count}&times;</span >{event_badge_obj?.print_count}&times;</span
> >
{/if}
</span>
<span class="font-bold">
{#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}
</span>
</a>
{:else}
<span
class="flex flex-row gap-1 items-center justify-start min-w-fit"
title={`Badge: ${event_badge_obj?.full_name ?? event_badge_obj?.given_name ?? '-- no name --'}\nID: ${event_badge_obj?.event_badge_id}`}
>
<span>
{#if event_badge_obj?.hide}
<span class="fas fa-eye-slash mx-1"></span>
{:else}
<span class="fas fa-id-badge mx-1"></span>
{/if}
{#if event_badge_obj?.print_count >= 1}
<!-- Show a green checkmark -->
<span class="fas fa-check text-green-500"></span>
<span class="print_count px-1"
>{event_badge_obj?.print_count}&times;</span
>
{/if}
</span>
<span class="font-bold">
{#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}
</span>
</span>
{/if}
{#if show_sensitive_fields}
<span class="mx-1 text-gray-400">|</span>
<span class="min-w-fit">
<span class="fas fa-envelope"></span>
{#if $ae_loc.trusted_access}
{event_badge_obj?.email}
{:else}
{event_badge_obj?.email
? event_badge_obj?.email.replace(/^(.{3}).*@/, '$1...@')
: ''}
{/if} {/if}
</span> </span>
{/if}
<span class="font-bold"> {#if !hide_affiliations}
{#if event_badge_obj?.full_name_override} <span class="mx-1 text-gray-400">|</span>
{event_badge_obj?.full_name_override} <span class="text-sm">
{:else if event_badge_obj?.full_name} {event_badge_obj?.affiliations ?? '-- no affiliations --'}
{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}
</span> </span>
</a> {/if}
{:else} {#if !hide_location}
<span <span class="mx-1 text-gray-400">|</span>
class="flex flex-row gap-1 items-center justify-start min-w-fit" <span class="text-sm">
title={`Badge: ${event_badge_obj?.full_name ?? event_badge_obj?.given_name ?? '-- no name --'}\nID: ${event_badge_obj?.event_badge_id}`} {event_badge_obj?.location ?? '-- no location --'}
>
<span>
{#if event_badge_obj?.hide}
<span class="fas fa-eye-slash mx-1"></span>
{:else}
<span class="fas fa-id-badge mx-1"></span>
{/if}
{#if event_badge_obj?.print_count >= 1}
<!-- Show a green checkmark -->
<span class="fas fa-check text-green-500"></span>
<span class="print_count px-1"
>{event_badge_obj?.print_count}&times;</span
>
{/if}
</span> </span>
{/if}
{#if !hide_badge_type}
<span class="mx-1 text-gray-400">|</span>
<span class="italic text-sm">{event_badge_obj?.badge_type}</span>
{/if}
<span class="font-bold"> {#if $ae_loc.edit_mode}
{#if event_badge_obj?.full_name_override} <div
{event_badge_obj?.full_name_override} class="flex flex-row flex-wrap gap-2 items-center justify-start w-full mt-1 p-1 bg-surface-100/50 dark:bg-surface-800/50 rounded text-[10px] font-mono border border-surface-200 dark:border-surface-700"
{:else if event_badge_obj?.full_name} >
{event_badge_obj?.full_name} <span title="Badge ID" class="bg-primary-500/10 px-1 rounded">
{:else if event_badge_obj?.given_name} ID: {event_badge_obj?.event_badge_id}
{event_badge_obj?.given_name} {event_badge_obj?.family_name} </span>
{:else} <span title="Created On">
-- no name -- CR: {event_badge_obj?.created_on
{/if} ? new Date(event_badge_obj.created_on).toLocaleString()
</span> : '--'}
</span> </span>
{/if} <span title="Updated On">
UP: {event_badge_obj?.updated_on
{#if show_sensitive_fields} ? new Date(event_badge_obj.updated_on).toLocaleString()
- : '--'}
<span class="min-w-fit"> </span>
<span class="fas fa-envelope"></span> <span title="First Printed">
{#if $ae_loc.trusted_access} FP: {event_badge_obj?.print_first_datetime
{event_badge_obj?.email} ? new Date(
{:else} event_badge_obj.print_first_datetime
{event_badge_obj?.email ).toLocaleString()
? event_badge_obj?.email.replace(/^(.{3}).*@/, '$1...@') : '--'}
: ''} </span>
{/if} <span title="Last Printed">
</span> LP: {event_badge_obj?.print_last_datetime
{/if} ? new Date(
{#if !hide_affiliations} event_badge_obj.print_last_datetime
- ).toLocaleString()
{event_badge_obj?.affiliations ?? '-- no affiliations --'} : '--'}
{/if} </span>
{#if !hide_location} <span title="Print Count">
- CNT: {event_badge_obj?.print_count ?? 0}
{event_badge_obj?.location ?? '-- no location --'} </span>
{/if} </div>
{#if !hide_badge_type} {/if}
- </div>
<span class="italic">{event_badge_obj?.badge_type}</span>
{/if}
{#if $ae_loc.trusted_access} {#if $ae_loc.trusted_access}
<a <a
href={`/events/${event_badge_obj?.event_id}/badges/${event_badge_obj?.event_badge_id}#review`} href={`/events/${event_badge_obj?.event_id}/badges/${event_badge_obj?.event_badge_id}#review`}
class="btn btn-sm variant-soft-primary">Review</a class="btn btn-sm variant-soft-primary min-w-fit">Review</a
> >
{/if} {/if}
</li> </li>

82
src/routes/events/[event_id]/(badges)/badges/ae_comp__badge_search.svelte
View File

@@ -122,28 +122,40 @@
{ code: 'test', name: 'Test' } { code: 'test', name: 'Test' }
]; ];
let computed_order_by_li = $derived(() => { let computed_order_by_li = $derived(
switch (qry_sort_order) { (() => {
case 'name_asc': switch (qry_sort_order) {
return { given_name: 'ASC', family_name: 'ASC' }; case 'name_asc':
case 'name_desc': return { given_name: 'ASC', family_name: 'ASC' };
return { given_name: 'DESC', family_name: 'DESC' }; case 'name_desc':
case 'updated_desc': return { given_name: 'DESC', family_name: 'DESC' };
return { updated_on: 'DESC' }; case 'updated_desc':
case 'updated_asc': return { updated_on: 'DESC' };
return { updated_on: 'ASC' }; case 'updated_asc':
default: return { updated_on: 'ASC' };
return { case 'print_count_desc':
// print_count: 'ASC', return { print_count: 'DESC' };
// priority: 'DESC', case 'print_first_desc':
// sort: 'DESC', return { print_first_datetime: 'DESC' };
given_name: 'ASC', case 'print_last_desc':
family_name: 'ASC', return { print_last_datetime: 'DESC' };
updated_on: 'DESC', case 'badge_type_asc':
created_on: 'DESC' return { badge_type: 'ASC' };
}; case 'affiliations_asc':
} return { affiliations: 'ASC' };
}); default:
return {
// print_count: 'ASC',
// priority: 'DESC',
// sort: 'DESC',
given_name: 'ASC',
family_name: 'ASC',
updated_on: 'DESC',
created_on: 'DESC'
};
}
})()
);
// *** Functions and Logic // *** Functions and Logic
function preventDefault<T extends Event>(fn: (event: T) => void) { function preventDefault<T extends Event>(fn: (event: T) => void) {
@@ -166,7 +178,8 @@
if (log_lvl) { if (log_lvl) {
console.log( console.log(
`Triggered: event_badge_qry: ft search qry str:=${$events_loc.badges.fulltext_search_qry_str}` `Triggered: event_badge_qry: ft search qry str:=${$events_loc.badges.fulltext_search_qry_str} sort order:=`,
computed_order_by_li
); );
} }
@@ -441,7 +454,7 @@
</select> </select>
{/if} {/if}
{#if $ae_loc.trusted_access} {#if $ae_loc.trusted_access}
<select <select
bind:value={qry_printed_status} bind:value={qry_printed_status}
onchange={() => { onchange={() => {
@@ -455,6 +468,27 @@
</select> </select>
{/if} {/if}
{#if $ae_loc.trusted_access}
<select
bind:value={qry_sort_order}
onchange={() => {
ae_triggers.event_badge_qry = true;
}}
class="select text-xs px-1 max-w-fit"
>
<option value="">-- Default Sort --</option>
<option value="name_asc">Name ASC</option>
<option value="name_desc">Name DESC</option>
<option value="updated_desc">Updated DESC</option>
<option value="updated_asc">Updated ASC</option>
<option value="print_count_desc">Print Count DESC</option>
<option value="print_first_desc">First Printed DESC</option>
<option value="print_last_desc">Last Printed DESC</option>
<option value="badge_type_asc">Badge Type ASC</option>
<option value="affiliations_asc">Affiliations ASC</option>
</select>
{/if}
{#if $ae_loc.trusted_access} {#if $ae_loc.trusted_access}
<input <input
type="search" type="search"