Skip to content

feat(app-space): checkpoint prize barcode + capped scanner handover #2861

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jung-thomas merged 15 commits into from
Oct 20, 2026
Merged

feat(app-space): checkpoint prize barcode + capped scanner handover #2861

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
a5d1d1f
docs: app-space checkpoint prize-barcode design spec
jung-thomas Oct 20, 2026
5bc5cdf
docs: correct binding/verification note in checkpoint barcode design
jung-thomas Oct 20, 2026
6896f84
docs: app-space checkpoint prize-barcode implementation plan
jung-thomas Oct 20, 2026
2657651
fix(app-space): resolve CHECKPOINT title from checkpointTitle
jung-thomas Oct 20, 2026
fdfa143
feat(app-space): authenticated prize-barcode QR endpoint
jung-thomas Oct 20, 2026
29cd317
feat(app-space): render checkpoint barcode on track completion
jung-thomas Oct 20, 2026
5578fbc
fix(app-space): remove unlock-rule duplication in checkpoint-barcode …
jung-thomas Oct 20, 2026
db01830
feat(scanner): resolve by user UUID, return event-scoped claimed count
jung-thomas Oct 20, 2026
2b3aed1
feat(scanner): atomic capped prize handover (max 2 per user/event)
jung-thomas Oct 20, 2026
aca2143
fix(scanner): update stale auth test to use UUID accountNumber (Task …
jung-thomas Oct 20, 2026
f3f79ca
docs(scanner): clarify atomic-cap forUpdate transaction boundary comment
jung-thomas Oct 20, 2026
d049f58
feat(scanner): show N-of-2 count and capped handover button
jung-thomas Oct 20, 2026
297dfce
fix(test): reset-tutorial getContestant calls use UUID accountNumber …
jung-thomas Oct 20, 2026
309af3d
fix(scanner): update UI5 scanner to new UUID barcode contract + fix h…
jung-thomas Oct 20, 2026
d0f11d2
Merge remote-tracking branch 'origin/DEV' into worktree-app-space-che…
jung-thomas Oct 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 19 additions & 15 deletions app/scanner/webapp/controller/App.controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ sap.ui.define([

var CONTESTANT_DEFAULTS = {
uid: null,
recordId: null,
status: null,
eventId: null,
claimedCount: 0,
tutorialsCompleted: "",
groupsCompleted: "",
missionsCompleted: "",
Expand All @@ -33,18 +33,20 @@ sap.ui.define([
this._oContestantModel.setData(Object.assign({}, CONTESTANT_DEFAULTS));
},

_getContestant: async function (uid) {
_getContestant: async function (uid, eventId) {
this._oContestantModel.setProperty("/loading", true);
try {
var oModel = this.getView().getModel();
var oContext = oModel.bindContext("/getContestant(...)");
oContext.setParameter("accountNumber", uid);
oContext.setParameter("eventId", eventId);
await oContext.execute();
var result = oContext.getBoundContext().getObject();
this._oContestantModel.setProperty("/tutorialsCompleted", result.tutorialsCompleted || "");
this._oContestantModel.setProperty("/groupsCompleted", result.groupsCompleted || "");
this._oContestantModel.setProperty("/missionsCompleted", result.missionsCompleted || "");
this._oContestantModel.setProperty("/prizeRecords", result.prizeRecords || "");
this._oContestantModel.setProperty("/claimedCount", result.claimedCount || 0);
this._oContestantModel.setProperty("/loaded", true);
this._oContestantModel.setProperty("/loading", false);
} catch (e) {
Expand Down Expand Up @@ -74,12 +76,14 @@ sap.ui.define([

var payload = scanResult.payload || {};
this._oContestantModel.setProperty("/uid", scanResult.uid || null);
this._oContestantModel.setProperty("/recordId", payload.recordId || null);
this._oContestantModel.setProperty("/status", payload.status || null);
this._oContestantModel.setProperty("/eventId", payload.eventId ? Number(payload.eventId) : null);
this._oContestantModel.setProperty("/loaded", false);

try {
await this._getContestant(this._oContestantModel.getProperty("/uid"));
await this._getContestant(
this._oContestantModel.getProperty("/uid"),
this._oContestantModel.getProperty("/eventId")
);
} catch (e) {
MessageBox.error("Could not load contestant: " + (e.message || "Unknown error"));
this._resetContestantModel();
Expand Down Expand Up @@ -118,11 +122,12 @@ sap.ui.define([

onClaimPrize: async function () {
var oContestantModel = this._oContestantModel;
var recordId = oContestantModel.getProperty("/recordId");
var uid = oContestantModel.getProperty("/uid");
var eventId = oContestantModel.getProperty("/eventId");
var claimedCount = oContestantModel.getProperty("/claimedCount");

if (!recordId) {
MessageBox.warning("No prize record found. Please re-scan.");
if (claimedCount >= 2) {
MessageBox.warning("Cap reached (2 of 2). No further prizes can be recorded.");
return;
}

Expand All @@ -131,16 +136,15 @@ sap.ui.define([

try {
var oModel = this.getView().getModel();
var oContext = oModel.bindContext("/claimPrize(...)");
oContext.setParameter("recordId", recordId);
// #889: accountNumber is required so the server can verify
// the prize belongs to the scanned contestant.
var oContext = oModel.bindContext("/claimPrizeForContestant(...)");
oContext.setParameter("accountNumber", uid);
oContext.setParameter("eventId", eventId);
await oContext.execute();
MessageToast.show("Prize claimed!", { duration: 2000 });
var result = oContext.getBoundContext().getObject();
MessageToast.show(result.message || "Prize recorded!", { duration: 2000 });

try {
await this._getContestant(uid);
await this._getContestant(uid, eventId);
} catch (e) {
MessageBox.error("Could not refresh contestant: " + (e.message || "Unknown error"));
oContestantModel.setProperty("/loading", false);
Expand Down
10 changes: 3 additions & 7 deletions app/scanner/webapp/view/App.view.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,6 @@
<VBox id="vboxIdentity" class="sapUiSmallMarginBeginEnd sapUiSmallMarginTopBottom">
<Title id="resultUid" text="{contestant>uid}" level="H5"
class="sapUiTinyMarginBottom" />
<Text id="resultIdentitySub"
text="{= ${contestant>recordId} + ' · ' + ${contestant>status} }"
wrapping="false"
class="sapUiTinyMarginBottom" />
</VBox>

<!-- Prizes Claimed — highlighted row -->
Expand All @@ -56,7 +52,7 @@
justifyContent="SpaceBetween"
alignItems="Center">
<Label id="lblPrizesClaimed" text="Prizes Claimed" design="Bold" />
<Text id="prizeRecords" text="{contestant>prizeRecords}" />
<Text id="prizeCount" text="{= ${contestant>claimedCount} + ' of 2' }" />
</HBox>

<!-- Remaining stats as a list -->
Expand Down Expand Up @@ -89,11 +85,11 @@
<ToolbarSpacer id="footerSpacer" />
<Button
id="btnClaimPrize"
text="Claim Prize"
text="Record prize handover"
icon="sap-icon://gift"
type="Emphasized"
press="onClaimPrize"
enabled="{contestant>loaded}" />
enabled="{= ${contestant>loaded} &amp;&amp; ${contestant>claimedCount} &lt; 2 }" />
</OverflowToolbar>
</footer>

Expand Down
Loading
Loading