diff --git a/src/backend/services/awards.service.js b/src/backend/services/awards.service.js index f0630c8..91b3126 100644 --- a/src/backend/services/awards.service.js +++ b/src/backend/services/awards.service.js @@ -280,6 +280,7 @@ export async function getAwardEntityBreakdown(userId, awardId) { entityMap.set(entity, { entity, entityId: qso.entityId, + entityName: qso.entity || qso.state || qso.grid || qso.callsign || String(entity), worked: false, confirmed: false, qsoDate: qso.qsoDate, diff --git a/src/frontend/src/routes/awards/[id]/+page.svelte b/src/frontend/src/routes/awards/[id]/+page.svelte index dd71fef..273408d 100644 --- a/src/frontend/src/routes/awards/[id]/+page.svelte +++ b/src/frontend/src/routes/awards/[id]/+page.svelte @@ -67,8 +67,8 @@ switch (sort) { case 'name': filtered.sort((a, b) => { - const aName = String(a.entity || ''); - const bName = String(b.entity || ''); + const aName = String(a.entityName || a.entity || ''); + const bName = String(b.entityName || b.entity || ''); return aName.localeCompare(bName); }); break; @@ -78,8 +78,8 @@ if (!a.confirmed && b.confirmed) return 1; if (a.worked && !b.worked) return -1; if (!a.worked && b.worked) return 1; - const aName = String(a.entity || ''); - const bName = String(b.entity || ''); + const aName = String(a.entityName || a.entity || ''); + const bName = String(b.entityName || b.entity || ''); return aName.localeCompare(bName); }); break; @@ -162,7 +162,12 @@ {#each getFilteredEntities() as entity (entity.entity)}
-
{entity.entity || 'Unknown'}
+
+ {entity.entityName || entity.entity || 'Unknown'} + {#if entity.entityId && entity.entityId !== entity.entityName} + ({entity.entityId}) + {/if} +
{#if entity.callsign} {entity.callsign} @@ -356,6 +361,13 @@ margin-bottom: 0.5rem; } + .entity-id { + font-size: 0.85rem; + font-weight: 400; + color: #999; + margin-left: 0.5rem; + } + .entity-details { display: flex; flex-wrap: wrap;