WEB-446: Validation of re-Age amount during submission with null value (#2876)
LGTM
This commit is contained in:
+2
-5
@@ -70,10 +70,7 @@
|
||||
<input matInput formControlName="note" />
|
||||
</mat-form-field>
|
||||
<div class="flex-fill">
|
||||
<span
|
||||
class="expandcollapsebutton m-l-10 m-t-5 m-b-5 flex-75"
|
||||
(click)="addTransactionAmount = !addTransactionAmount"
|
||||
>
|
||||
<span class="expandcollapsebutton m-l-10 m-t-5 m-b-5 flex-75" (click)="displayTransactionAmount()">
|
||||
<mat-slide-toggle>
|
||||
<div>
|
||||
<span class="m-l-10">{{ 'labels.inputs.Transaction Amount' | translate }}</span>
|
||||
@@ -87,7 +84,7 @@
|
||||
[isRequired]="false"
|
||||
[inputFormControl]="reagingLoanForm.controls.transactionAmount"
|
||||
[inputLabel]="'Transaction Amount'"
|
||||
[minVal]="0.01"
|
||||
[minVal]="loanTransactionData.amount"
|
||||
[maxVal]="loanTransactionData.amount"
|
||||
>
|
||||
</mifosx-input-amount>
|
||||
|
||||
+11
-1
@@ -88,7 +88,10 @@ export class LoanReagingComponent implements OnInit {
|
||||
],
|
||||
transactionAmount: [
|
||||
,
|
||||
[Validators.max(this.loanTransactionData.amount)]
|
||||
[
|
||||
Validators.min(this.loanTransactionData.amount),
|
||||
Validators.max(this.loanTransactionData.amount)
|
||||
]
|
||||
],
|
||||
note: '',
|
||||
externalId: '',
|
||||
@@ -145,6 +148,13 @@ export class LoanReagingComponent implements OnInit {
|
||||
});
|
||||
}
|
||||
|
||||
displayTransactionAmount(): void {
|
||||
this.addTransactionAmount = !this.addTransactionAmount;
|
||||
this.reagingLoanForm.patchValue({
|
||||
transactionAmount: null
|
||||
});
|
||||
}
|
||||
|
||||
submit(): void {
|
||||
const data = this.prepareReagingData();
|
||||
if (data['transactionAmount'] === null) {
|
||||
|
||||
Reference in New Issue
Block a user