fix: now we can create standing instruction by using both destinantion

This commit is contained in:
Pushpendra Kumar
2023-12-15 15:17:53 +01:00
committed by Adam Saghy
parent b03b172d9e
commit 11098c60b1
2 changed files with 10 additions and 6 deletions
@@ -95,7 +95,7 @@
<mat-form-field fxFlex="48%">
<mat-label>{{"labels.inputs.To Office" | translate}}</mat-label>
<mat-select required formControlName="toOfficeId" (selectionChange)="changeEvent()">
<mat-select [disabled]="ToOfficeId" required formControlName="toOfficeId" (selectionChange)="changeEvent()">
<mat-option *ngFor="let toOfficeType of toOfficeTypeData" [value]="toOfficeType.id">
{{ toOfficeType.name }}
</mat-option>
@@ -107,7 +107,7 @@
<mat-form-field fxFlex="48%">
<mat-label>{{"labels.inputs.Beneficiary" | translate}}</mat-label>
<mat-select required formControlName="toClientId" (selectionChange)="changeEvent()">
<mat-select [disabled]="ToClientId" required formControlName="toClientId" (selectionChange)="changeEvent()">
<mat-option *ngFor="let toClientType of toClientTypeData" [value]="toClientType.id">
{{ toClientType.displayName }}
</mat-option>
@@ -234,7 +234,7 @@
<mat-card-actions fxLayout="row" fxLayout.xs="column" fxLayoutAlign="center" fxLayoutGap="5px">
<button type="button" mat-raised-button [routerLink]="['../']">{{"labels.buttons.Cancel" | translate}}</button>
<button mat-raised-button color="primary" [disabled]="!createStandingInstructionsForm.valid" *mifosxHasPermission="'CREATE_STANDINGINSTRUCTION'"
(click)="submit()">{{"labels.buttons.Submit | translate}}</button>
(click)="submit()">{{"labels.buttons.Submit" | translate}}</button>
</mat-card-actions>
</form>
@@ -58,6 +58,10 @@ export class CreateStandingInstructionsComponent implements OnInit {
accountTypeId: any;
/** Office Id */
officeId: any;
/** ToOffice Id Boolean for disabling the officeId formControl */
ToOfficeId: any;
/** ToClient Id Boolean for disabling the officeId formControl */
ToClientId: any;
/** Account Type */
accountType: any;
/** Client Id */
@@ -119,7 +123,7 @@ export class CreateStandingInstructionsComponent implements OnInit {
createCreateStandingInstructionsForm() {
this.createStandingInstructionsForm = this.formBuilder.group({
'name': ['', Validators.required],
'applicant': [{value: '', disabled: true}],
'applicant': [{ value: '', disabled: true }],
'transferType': ['', Validators.required],
'priority': ['', Validators.required],
'status': ['', Validators.required],
@@ -169,8 +173,8 @@ export class CreateStandingInstructionsComponent implements OnInit {
'toOfficeId': this.officeId,
'toClientId': this.clientId
});
this.createStandingInstructionsForm.controls['toOfficeId'].disable();
this.createStandingInstructionsForm.controls['toClientId'].disable();
this.ToOfficeId = true;
this.ToClientId = true;
this.changeEvent();
} else {
this.allowclientedit = true;