Skip to content

WEB 460 Shares per Client Field Allows Zero and Negative Values in Share Product Creation Form #2880

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
JaySoni1 wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

WEB 460 Shares per Client Field Allows Zero and Negative Values in Share Product Creation Form #2880

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
47 changes: 41 additions & 6 deletions ...re-product-stepper/share-product-settings-step/share-product-settings-step.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,56 @@ <h4 class="mat-h4 flex-98">

<mat-form-field class="flex-31">
<mat-label>{{ 'labels.inputs.Minimum' | translate }}</mat-label>
<input type="number" matInput formControlName="minimumShares" />
<input type="number" matInput formControlName="minimumShares" min="1" step="1" required />
<mat-error *ngIf="shareProductSettingsForm.get('minimumShares').hasError('required')">
Minimum is <strong>required</strong>
</mat-error>
<mat-error *ngIf="shareProductSettingsForm.get('minimumShares').hasError('min')">
{{ 'labels.inputs.Minimum Shares per Client' | translate }}
{{ 'labels.commons.must be greater than zero' | translate }}
</mat-error>
<mat-error *ngIf="shareProductSettingsForm.get('minimumShares').hasError('pattern')">
{{ 'labels.inputs.Minimum Shares per Client' | translate }}
{{ 'labels.commons.must be an integer' | translate }}
</mat-error>
</mat-form-field>

<mat-form-field class="flex-31">
<mat-label>{{ 'labels.inputs.Default' | translate }}</mat-label>
<input type="number" matInput formControlName="nominalShares" required />
<mat-error>
{{ 'labels.inputs.Default Shares per Client' | translate }} {{ 'labels.commons.is' | translate }}
<strong>{{ 'labels.commons.required' | translate }}</strong>
<input type="number" matInput formControlName="nominalShares" min="1" step="1" required />
<mat-error *ngIf="shareProductSettingsForm.get('nominalShares').hasError('required')">
Default is <strong>required</strong>
</mat-error>
<mat-error *ngIf="shareProductSettingsForm.get('nominalShares').hasError('min')">
{{ 'labels.inputs.Default Shares per Client' | translate }}
{{ 'labels.commons.must be greater than zero' | translate }}
</mat-error>
<mat-error *ngIf="shareProductSettingsForm.get('nominalShares').hasError('pattern')">
{{ 'labels.inputs.Default Shares per Client' | translate }}
{{ 'labels.commons.must be an integer' | translate }}
</mat-error>
</mat-form-field>

<mat-form-field class="flex-31">
<mat-label>{{ 'labels.inputs.Maximum' | translate }}</mat-label>
<input type="number" matInput formControlName="maximumShares" />
<input type="number" matInput formControlName="maximumShares" min="1" step="1" required />
<mat-error *ngIf="shareProductSettingsForm.get('maximumShares').hasError('required')">
Maximum is <strong>required</strong>
</mat-error>
<mat-error *ngIf="shareProductSettingsForm.get('maximumShares').hasError('min')">
{{ 'labels.inputs.Maximum Shares per Client' | translate }}
{{ 'labels.commons.must be greater than zero' | translate }}
</mat-error>
<mat-error *ngIf="shareProductSettingsForm.get('maximumShares').hasError('pattern')">
{{ 'labels.inputs.Maximum Shares per Client' | translate }}
{{ 'labels.commons.must be an integer' | translate }}
</mat-error>
<mat-error *ngIf="shareProductSettingsForm.hasError('sharesOrder')">
{{
'labels.commons.minimum must be less than or equal to default and default must be less than or equal to maximum'
| translate
}}
</mat-error>
</mat-form-field>

<h4 class="mat-h4 flex-98">
Expand Down
61 changes: 48 additions & 13 deletions ...hare-product-stepper/share-product-settings-step/share-product-settings-step.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,19 +53,54 @@ export class ShareProductSettingsStepComponent implements OnInit {
}

createShareProductSettingsForm() {
this.shareProductSettingsForm = this.formBuilder.group({
minimumShares: [''],
nominalShares: [
'',
Validators.required
],
maximumShares: [''],
minimumActivePeriodForDividends: [''],
minimumactiveperiodFrequencyType: [''],
lockinPeriodFrequency: [''],
lockinPeriodFrequencyType: [''],
allowDividendCalculationForInactiveClients: [false]
});
this.shareProductSettingsForm = this.formBuilder.group(
{
minimumShares: [
'',
[
Validators.required,
Validators.min(1),
Validators.pattern(/^[0-9]+$/)
]
],
nominalShares: [
'',
[
Validators.required,
Validators.min(1),
Validators.pattern(/^[0-9]+$/)
]
],
maximumShares: [
'',
[
Validators.required,
Validators.min(1),
Validators.pattern(/^[0-9]+$/)
]
],
minimumActivePeriodForDividends: [''],
minimumactiveperiodFrequencyType: [''],
lockinPeriodFrequency: [''],
lockinPeriodFrequencyType: [''],
allowDividendCalculationForInactiveClients: [false]
},
{
validators: this.validateSharesOrder
}
);
}

private validateSharesOrder(group: UntypedFormGroup): { [key: string]: any } | null {
const min = Number(group.get('minimumShares')?.value);
const nominal = Number(group.get('nominalShares')?.value);
const max = Number(group.get('maximumShares')?.value);
if (min && nominal && max) {
if (min > nominal || nominal > max) {
return { sharesOrder: true };
}
}
return null;
}

get shareProductSettings() {
Expand Down
Loading