Skip to content

SCRUM-387-Frontend--Rewards-Refactor-Delete-feature #367

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

Open
tigo24 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

SCRUM-387-Frontend--Rewards-Refactor-Delete-feature #367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 7 additions & 5 deletions ...nd/Front/src/app/features/rewards/components/reward-details/reward-details.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,23 +34,25 @@ <h1 class="reward-name">{{ reward.name }}</h1>
<div class="metric-row">
<div class="metric-card">
<span class="metric-label">{{ 'REWARD_MANAGEMENT.METRIC_REDEMPTION' | translate }}</span>
<span class="metric-value">{{ ctx.redemptionCount() }}</span>
<span class="metric-value">{{ ctx.kpiStats()?.redemptionCount ?? ctx.redemptionCount() }}</span>
</div>
<div class="metric-card">
<span class="metric-label">{{ 'REWARD_MANAGEMENT.METRIC_AVAILABILITY' | translate }}</span>
<span class="metric-value metric-value--accent">{{ ctx.availableCount() }} / {{ ctx.totalCount() }}</span>
<span class="metric-value metric-value--accent">{{
ctx.kpiStats()?.availableStock ?? ctx.availableCount() + ' / ' + ctx.totalCount()
}}</span>
</div>
<div class="metric-card">
<span class="metric-label">{{ 'REWARD_MANAGEMENT.METRIC_COST' | translate }}</span>
<span class="metric-value">${{ reward.cost }}</span>
<span class="metric-value">${{ ctx.kpiStats()?.totalCost ?? reward.cost }}</span>
</div>
<div class="metric-card">
<span class="metric-label">{{ 'REWARD_MANAGEMENT.METRIC_TOP' | translate }}</span>
<span class="metric-value">{{ ctx.topRedeemed() }}</span>
<span class="metric-value">{{ ctx.kpiStats()?.topRedeemed ?? ctx.topRedeemed() }}</span>
</div>
<div class="metric-card">
<span class="metric-label">{{ 'REWARD_MANAGEMENT.METRIC_POINTS' | translate }}</span>
<span class="metric-value">{{ reward.pointsValue }}</span>
<span class="metric-value">{{ ctx.kpiStats()?.pointsValue ?? reward.pointsValue }}</span>
</div>
</div>

Expand Down
73 changes: 21 additions & 52 deletions ...Frontend/Front/src/app/features/rewards/components/reward-form/reward-form.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,6 @@
<div class="field-row field-row--top">
<div class="field-label">
<span>{{ 'REWARD_MANAGEMENT.IMAGE' | translate }}</span>
@if (isEditMode) {
<small class="required-tag">{{ 'REWARD_MANAGEMENT.REQUIRED' | translate }}</small>
}
</div>
<div class="field-input">
<input
Expand Down Expand Up @@ -88,60 +85,22 @@
<small class="required-tag">{{ 'REWARD_MANAGEMENT.REQUIRED' | translate }}</small>
</div>
<div class="field-input">
@if (isEditMode) {
<select
class="form-control"
[class.invalid]="isInvalid('category')"
formControlName="category"
>
<option value="">{{ 'REWARD_MANAGEMENT.CATEGORY_PLACEHOLDER' | translate }}</option>
@for (category of categories(); track category.id) {
<option [value]="category.name">{{ category.name }}</option>
}
</select>
@if (isInvalid('category')) {
<small class="error-msg">{{ 'REWARD_MANAGEMENT.CATEGORY_REQUIRED' | translate }}</small>
}
} @else {
<select
class="form-control"
[class.invalid]="isInvalid('categoryId')"
formControlName="categoryId"
>
<option [ngValue]="null">{{ 'REWARD_MANAGEMENT.CATEGORY_PLACEHOLDER' | translate }}</option>
@for (category of seededCategories; track category.id) {
<option [ngValue]="category.id">{{ category.name }}</option>
}
</select>
@if (isInvalid('categoryId')) {
<small class="error-msg">{{ 'REWARD_MANAGEMENT.CATEGORY_REQUIRED' | translate }}</small>
<select
class="form-control"
[class.invalid]="isInvalid('categoryId')"
formControlName="categoryId"
>
<option [ngValue]="null">{{ 'REWARD_MANAGEMENT.CATEGORY_PLACEHOLDER' | translate }}</option>
@for (category of seededCategories; track category.id) {
<option [ngValue]="category.id">{{ category.name }}</option>
}
</select>
@if (isInvalid('categoryId')) {
<small class="error-msg">{{ 'REWARD_MANAGEMENT.CATEGORY_REQUIRED' | translate }}</small>
}
</div>
</div>

@if (isEditMode) {
<div class="field-row">
<div class="field-label">
<span>{{ 'REWARD_MANAGEMENT.COST' | translate }}</span>
<small class="required-tag">{{ 'REWARD_MANAGEMENT.REQUIRED' | translate }}</small>
</div>
<div class="field-input">
<input
type="number"
min="0"
class="form-control"
[class.invalid]="isInvalid('cost')"
formControlName="cost"
[placeholder]="'REWARD_MANAGEMENT.COST_PLACEHOLDER' | translate"
/>
@if (isInvalid('cost')) {
<small class="error-msg">{{ 'REWARD_MANAGEMENT.COST_REQUIRED' | translate }}</small>
}
</div>
</div>
}

<div class="field-row">
<div class="field-label">
<span>{{ 'REWARD_MANAGEMENT.PRICE' | translate }}</span>
Expand Down Expand Up @@ -186,26 +145,36 @@
<div class="field-row field-row--top">
<div class="field-label">
<span>{{ 'REWARD_MANAGEMENT.HOW_TO_REDEEM' | translate }}</span>
<small class="required-tag">{{ 'REWARD_MANAGEMENT.REQUIRED' | translate }}</small>
</div>
<div class="field-input">
<textarea
class="form-control form-textarea"
[class.invalid]="isInvalid('howToRedeem')"
formControlName="howToRedeem"
[placeholder]="'REWARD_MANAGEMENT.HOW_TO_REDEEM_PLACEHOLDER' | translate"
></textarea>
@if (isInvalid('howToRedeem')) {
<small class="error-msg">{{ 'REWARD_MANAGEMENT.HOW_TO_REDEEM_REQUIRED' | translate }}</small>
}
</div>
</div>

<div class="field-row field-row--top">
<div class="field-label">
<span>{{ 'REWARD_MANAGEMENT.TERMS' | translate }}</span>
<small class="required-tag">{{ 'REWARD_MANAGEMENT.REQUIRED' | translate }}</small>
</div>
<div class="field-input">
<textarea
class="form-control form-textarea"
[class.invalid]="isInvalid('termsOfUse')"
formControlName="termsOfUse"
[placeholder]="'REWARD_MANAGEMENT.TERMS_PLACEHOLDER' | translate"
></textarea>
@if (isInvalid('termsOfUse')) {
<small class="error-msg">{{ 'REWARD_MANAGEMENT.TERMS_REQUIRED' | translate }}</small>
}
</div>
</div>
</div>
Expand Down
Loading
Loading