Skip to content

Commit b5a1535

Browse files
committed
Fix java application (compiling was failing) + add screen for no enrollments to frotnend
1 parent 8392907 commit b5a1535

File tree

3 files changed

+38
-25
lines changed

3 files changed

+38
-25
lines changed

application/backend-credit-card-enrollment/backend-java/src/main/java/cloud/ambar/creditcard/enrollment/controller/EnrollmentReactionController.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package cloud.ambar.creditcard.enrollment.controller;
22

33
import cloud.ambar.common.ambar.AmbarHttpRequest;
4+
import cloud.ambar.common.eventstore.EventStore;
45
import cloud.ambar.common.reaction.ReactionController;
56
import cloud.ambar.common.serializedevent.Deserializer;
67
import cloud.ambar.creditcard.enrollment.reaction.ReviewEnrollmentReactionHandler;
@@ -19,9 +20,10 @@ public class EnrollmentReactionController extends ReactionController {
1920
private final ReviewEnrollmentReactionHandler reviewEnrollmentReactionHandler;
2021

2122
public EnrollmentReactionController(
23+
EventStore eventStore,
2224
Deserializer deserializer,
2325
ReviewEnrollmentReactionHandler reviewEnrollmentReactionHandler) {
24-
super(deserializer);
26+
super(eventStore, deserializer);
2527
this.reviewEnrollmentReactionHandler = reviewEnrollmentReactionHandler;
2628
}
2729

application/frontend-javascript/src/handlebarsHelpers.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,8 @@ export const helpers = {
2121
};
2222

2323
return date.toLocaleString('en-GB', options);
24+
},
25+
isNonEmptyArray: function (array) {
26+
return Array.isArray(array) && array.length > 0;
2427
}
2528
};

application/frontend-javascript/src/views/card/enrollments.handlebars

Lines changed: 32 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -6,30 +6,38 @@
66
<div class="order-last md:order-first pt-8 pr-0 md:pr-16 md:pt-0 flex justify-center w-full md:w-auto">
77
<img src="/assets/images/card.png" class="mx-auto" style="width: 200px; height: fit-content; transform: rotate(-11deg)">
88
</div>
9-
<ul class="order-first md:order-last">
10-
{{#each locals.enrollments}}
11-
<li class="p-3 hover:bg-slate-400/25 focus:bg-slate-400/25 active:bg-slate-400/25">
12-
<div class="flex items-center space-x-4 rtl:space-x-reverse">
13-
<div class="flex-1 min-w-0">
14-
<p class="text-md font-large text-gray-900 truncate">
15-
{{this.productName}}
16-
</p>
17-
<p class="text-xs font-medium {{#if (equals this.status "ACCEPTED")}} text-green-700 {{ else }} text-red-700 {{/if}}">
18-
Status: {{this.status}}
19-
</p>
20-
<p class="text-xs font-medium text-gray-700">
21-
Status Reason: {{this.statusReason}}
22-
</p>
23-
<p class="text-xs font-medium text-gray-700">
24-
Requested: {{prettyPrintDate this.requestedDate}}
25-
</p>
26-
<p class="text-xs font-medium text-gray-700">
27-
Reviewed: {{prettyPrintDate this.reviewedOn}}
28-
</p>
9+
{{#if (isNonEmptyArray locals.enrollments) }}
10+
11+
<ul class="order-first md:order-last">
12+
{{#each locals.enrollments}}
13+
<li class="p-3 hover:bg-slate-400/25 focus:bg-slate-400/25 active:bg-slate-400/25">
14+
<div class="flex items-center space-x-4 rtl:space-x-reverse">
15+
<div class="flex-1 min-w-0">
16+
<p class="text-md font-large text-gray-900 truncate">
17+
{{this.productName}}
18+
</p>
19+
<p class="text-xs font-medium {{#if (equals this.status "ACCEPTED")}} text-green-700 {{ else }} text-red-700 {{/if}}">
20+
Status: {{this.status}}
21+
</p>
22+
<p class="text-xs font-medium text-gray-700">
23+
Status Reason: {{this.statusReason}}
24+
</p>
25+
<p class="text-xs font-medium text-gray-700">
26+
Requested: {{prettyPrintDate this.requestedDate}}
27+
</p>
28+
<p class="text-xs font-medium text-gray-700">
29+
Reviewed: {{prettyPrintDate this.reviewedOn}}
30+
</p>
31+
</div>
2932
</div>
30-
</div>
31-
</li>
32-
{{/each}}
33-
</ul>
33+
</li>
34+
{{/each}}
35+
</ul>
36+
{{else}}
37+
<div class="order-first md:order-last">
38+
<h2 class="text-2xl font-bold text-gray-900">No Enrollments</h2>
39+
<p class="text-sm font-medium text-gray-700">You have no enrollments</p>
40+
</div>
41+
{{/if}}
3442
</div>
3543
</div>

0 commit comments

Comments
 (0)