diff --git a/award-definitions/was.json b/award-definitions/was.json
index 7f01bda..06598c6 100644
--- a/award-definitions/was.json
+++ b/award-definitions/was.json
@@ -13,9 +13,9 @@
"operator": "AND",
"filters": [
{
- "field": "entity",
+ "field": "entityId",
"operator": "eq",
- "value": "United States"
+ "value": 291
}
]
}
diff --git a/src/backend/services/awards.service.js b/src/backend/services/awards.service.js
index c869cc5..27602ab 100644
--- a/src/backend/services/awards.service.js
+++ b/src/backend/services/awards.service.js
@@ -647,7 +647,7 @@ export async function getAwardEntityBreakdown(userId, awardId) {
name: award.name,
description: award.description,
caption: award.caption,
- target: award.rules?.target || 0,
+ target: rules.target || 0,
},
entities: Array.from(entityMap.values()),
total: entityMap.size,
diff --git a/src/frontend/src/routes/awards/[id]/+page.svelte b/src/frontend/src/routes/awards/[id]/+page.svelte
index 3b90293..e6ffb01 100644
--- a/src/frontend/src/routes/awards/[id]/+page.svelte
+++ b/src/frontend/src/routes/awards/[id]/+page.svelte
@@ -140,7 +140,7 @@
- {#if award && award.target && award.target > 0}
+ {#if entities.length > 0 && entities[0].points !== undefined}
{@const earnedPoints = entities.reduce((sum, e) => sum + (e.confirmed ? e.points : 0), 0)}
{@const targetPoints = award.target}
{@const neededPoints = Math.max(0, targetPoints - earnedPoints)}
@@ -165,21 +165,24 @@
{targetPoints}
{:else}
+ {@const workedCount = entities.filter((e) => e.worked).length}
+ {@const confirmedCount = entities.filter((e) => e.confirmed).length}
+ {@const neededCount = award.target ? Math.max(0, award.target - workedCount) : entities.filter((e) => !e.worked).length}
Total:
{entities.length}
Confirmed:
- {entities.filter((e) => e.confirmed).length}
+ {confirmedCount}
Worked:
- {entities.filter((e) => e.worked).length}
+ {workedCount}
Needed:
- {entities.filter((e) => !e.worked).length}
+ {neededCount}
{/if}
diff --git a/src/frontend/static/award-definitions/was.json b/src/frontend/static/award-definitions/was.json
index 7f01bda..06598c6 100644
--- a/src/frontend/static/award-definitions/was.json
+++ b/src/frontend/static/award-definitions/was.json
@@ -13,9 +13,9 @@
"operator": "AND",
"filters": [
{
- "field": "entity",
+ "field": "entityId",
"operator": "eq",
- "value": "United States"
+ "value": 291
}
]
}