fix: now we can create standing instruction by using both destinantion
This commit is contained in:
committed by
Adam Saghy
parent
b03b172d9e
commit
11098c60b1
+3
-3
@@ -95,7 +95,7 @@
|
|||||||
|
|
||||||
<mat-form-field fxFlex="48%">
|
<mat-form-field fxFlex="48%">
|
||||||
<mat-label>{{"labels.inputs.To Office" | translate}}</mat-label>
|
<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">
|
<mat-option *ngFor="let toOfficeType of toOfficeTypeData" [value]="toOfficeType.id">
|
||||||
{{ toOfficeType.name }}
|
{{ toOfficeType.name }}
|
||||||
</mat-option>
|
</mat-option>
|
||||||
@@ -107,7 +107,7 @@
|
|||||||
|
|
||||||
<mat-form-field fxFlex="48%">
|
<mat-form-field fxFlex="48%">
|
||||||
<mat-label>{{"labels.inputs.Beneficiary" | translate}}</mat-label>
|
<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">
|
<mat-option *ngFor="let toClientType of toClientTypeData" [value]="toClientType.id">
|
||||||
{{ toClientType.displayName }}
|
{{ toClientType.displayName }}
|
||||||
</mat-option>
|
</mat-option>
|
||||||
@@ -234,7 +234,7 @@
|
|||||||
<mat-card-actions fxLayout="row" fxLayout.xs="column" fxLayoutAlign="center" fxLayoutGap="5px">
|
<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 type="button" mat-raised-button [routerLink]="['../']">{{"labels.buttons.Cancel" | translate}}</button>
|
||||||
<button mat-raised-button color="primary" [disabled]="!createStandingInstructionsForm.valid" *mifosxHasPermission="'CREATE_STANDINGINSTRUCTION'"
|
<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>
|
</mat-card-actions>
|
||||||
|
|
||||||
</form>
|
</form>
|
||||||
|
|||||||
+7
-3
@@ -58,6 +58,10 @@ export class CreateStandingInstructionsComponent implements OnInit {
|
|||||||
accountTypeId: any;
|
accountTypeId: any;
|
||||||
/** Office Id */
|
/** Office Id */
|
||||||
officeId: any;
|
officeId: any;
|
||||||
|
/** ToOffice Id Boolean for disabling the officeId formControl */
|
||||||
|
ToOfficeId: any;
|
||||||
|
/** ToClient Id Boolean for disabling the officeId formControl */
|
||||||
|
ToClientId: any;
|
||||||
/** Account Type */
|
/** Account Type */
|
||||||
accountType: any;
|
accountType: any;
|
||||||
/** Client Id */
|
/** Client Id */
|
||||||
@@ -119,7 +123,7 @@ export class CreateStandingInstructionsComponent implements OnInit {
|
|||||||
createCreateStandingInstructionsForm() {
|
createCreateStandingInstructionsForm() {
|
||||||
this.createStandingInstructionsForm = this.formBuilder.group({
|
this.createStandingInstructionsForm = this.formBuilder.group({
|
||||||
'name': ['', Validators.required],
|
'name': ['', Validators.required],
|
||||||
'applicant': [{value: '', disabled: true}],
|
'applicant': [{ value: '', disabled: true }],
|
||||||
'transferType': ['', Validators.required],
|
'transferType': ['', Validators.required],
|
||||||
'priority': ['', Validators.required],
|
'priority': ['', Validators.required],
|
||||||
'status': ['', Validators.required],
|
'status': ['', Validators.required],
|
||||||
@@ -169,8 +173,8 @@ export class CreateStandingInstructionsComponent implements OnInit {
|
|||||||
'toOfficeId': this.officeId,
|
'toOfficeId': this.officeId,
|
||||||
'toClientId': this.clientId
|
'toClientId': this.clientId
|
||||||
});
|
});
|
||||||
this.createStandingInstructionsForm.controls['toOfficeId'].disable();
|
this.ToOfficeId = true;
|
||||||
this.createStandingInstructionsForm.controls['toClientId'].disable();
|
this.ToClientId = true;
|
||||||
this.changeEvent();
|
this.changeEvent();
|
||||||
} else {
|
} else {
|
||||||
this.allowclientedit = true;
|
this.allowclientedit = true;
|
||||||
|
|||||||
Reference in New Issue
Block a user