changes : ps
This commit is contained in:
venbatechnologies@gmail.com
parent
b841737cc9
commit
9d562aa0fb
@ -30,7 +30,7 @@
|
||||
|
||||
<mat-card *ngIf="currentLoanForm.controls.existing_loan.value == 'Yes'">
|
||||
<mat-card-header>
|
||||
<p>Loan Details<p>
|
||||
<mat-card-title><p>Loan Details</p></mat-card-title>
|
||||
</mat-card-header>
|
||||
<div formArrayName="loan_details">
|
||||
<div *ngFor="let details of currentLoanForm.get('loan_details').controls; let i=index"
|
||||
@ -38,7 +38,8 @@
|
||||
<!-- {{frequencyData | json}} -->
|
||||
<mat-card-content class="matcard">
|
||||
<mat-form-field>
|
||||
<input matInput autocomplete="off" placeholder="Loan Amount" formControlName="loan_amount" (keypress)="keyPress($event)" >
|
||||
<input matInput autocomplete="off" placeholder="Loan Amount" formControlName="loan_amount" (keypress)="keyPress($event)" (keyup)="inWords($event,i,1)">
|
||||
<mat-hint align="start" style="font-size:70%" *ngIf="details.get('loan_amount').value != ''">{{"₹"}} {{amtInwords[i]}} Only</mat-hint>
|
||||
</mat-form-field>
|
||||
<mat-form-field>
|
||||
<mat-select (selectionChange)="selectedfrequency($event.value,i)" placeholder="Frequency"
|
||||
@ -46,8 +47,9 @@
|
||||
<mat-option *ngFor="let freq of frequencyData" value="{{freq.frequency_id}}">{{freq.name}}</mat-option>
|
||||
</mat-select>
|
||||
</mat-form-field>
|
||||
<mat-form-field *ngIf="details.get('frequency').value != ''" >
|
||||
<input matInput autocomplete="off" [placeholder]="placeholderName[i] != '' ? placeholderName[i] : 'Instalment Amount' " formControlName="emi" (keypress)="keyPress($event)" >
|
||||
<mat-form-field *ngIf="details.get('frequency').value != ''" style="width:35%">
|
||||
<input matInput autocomplete="off" [placeholder]="placeholderName[i] != '' ? placeholderName[i] : 'Instalment Amount' " formControlName="emi" (keypress)="keyPress($event)" (keyup)="inWords($event,i,2)">
|
||||
<mat-hint align="start" style="font-size:70%" *ngIf="details.get('emi').value != ''">{{"₹"}} {{emiAmtInwords[i]}} Only</mat-hint>
|
||||
</mat-form-field>
|
||||
<mat-form-field>
|
||||
<mat-select placeholder="Loan Type" formControlName="loan_type" >
|
||||
@ -56,16 +58,18 @@
|
||||
<!-- <input matInput autocomplete="off" placeholder="Loan Type" formControlName="loan_type" > -->
|
||||
</mat-form-field>
|
||||
<mat-form-field *ngIf="details.get('loan_type').value == 9 ">
|
||||
<input matInput autocomplete="off" placeholder="Specify Others Loan Type" formControlName="others_loan_type">
|
||||
<input matInput autocomplete="off" placeholder="Specify Loan Type" formControlName="others_loan_type">
|
||||
</mat-form-field>
|
||||
<mat-form-field>
|
||||
<mat-select placeholder="Loan Taken By" formControlName="loan_taken_by">
|
||||
<mat-select placeholder="Loan Taken By" formControlName="loan_taken_by" (selectionChange)="selectedBorrower($event.value,i)">
|
||||
<mat-option value="{{owner.pd_co_applicant_id}}" *ngFor="let owner of applicants">{{owner.applicant_name}}</mat-option>
|
||||
<!-- <mat-option value= 0 >Others</mat-option> -->
|
||||
</mat-select>
|
||||
</mat-form-field>
|
||||
<mat-form-field *ngIf="details.get('loan_taken_by').value == 0">
|
||||
<input matInput autocomplete="off" placeholder="Specify Others Loan Taken" formControlName="others_loan_taken">
|
||||
<!-- {{details.get('loan_taken_by').value}} -->
|
||||
<!-- <mat-form-field *ngIf="details.get('loan_taken_by').value == 0"> -->
|
||||
<mat-form-field *ngIf="this.OtherFlag[i]">
|
||||
<input matInput autocomplete="off" placeholder="Specify Borrower" formControlName="others_loan_taken">
|
||||
</mat-form-field>
|
||||
<mat-form-field>
|
||||
<mat-select placeholder="Lender" formControlName="lender" >
|
||||
@ -73,17 +77,19 @@
|
||||
</mat-select>
|
||||
</mat-form-field>
|
||||
<mat-form-field *ngIf="details.get('lender').value == 3">
|
||||
<input matInput autocomplete="off" placeholder="Specify Others Lender" formControlName="others_lender" >
|
||||
<input matInput autocomplete="off" placeholder="Specify Lender" formControlName="others_lender" >
|
||||
</mat-form-field>
|
||||
<!-- <mat-form-field>
|
||||
<input matInput autocomplete="off" placeholder="Lender" formControlName="lender" >
|
||||
</mat-form-field> -->
|
||||
<mat-form-field>
|
||||
<div style="width:100%">
|
||||
<mat-form-field style="width:35%">
|
||||
<input matInput autocomplete="off" placeholder="Original Tenure in Months" formControlName="original_tenure" >
|
||||
</mat-form-field>
|
||||
<mat-form-field>
|
||||
<mat-form-field style="width:35%">
|
||||
<input matInput autocomplete="off" placeholder="Current Balance Tenure in Months" formControlName="current_balance_tenure" >
|
||||
</mat-form-field>
|
||||
</div>
|
||||
<button type="button" class="mr-1 mb-1 hover-icon" mat-raised-button mat-icon-button matTooltip="Add More Loan Details" matTooltipPosition="above" color="primary" (click)="addLoanDetails()"
|
||||
*ngIf="i==0">
|
||||
<mat-icon>add</mat-icon>
|
||||
|
||||
@ -44,7 +44,9 @@ export class CurrentLoanComponent implements OnInit {
|
||||
applicants: any;
|
||||
placeholderName : any = [];
|
||||
IDXval : any;
|
||||
OtherFlag : boolean = false;
|
||||
OtherFlag : any = [];
|
||||
amtInwords : any = [];
|
||||
emiAmtInwords : any = [];
|
||||
|
||||
constructor(notifier: NotifierService, private fb: FormBuilder, private route: ActivatedRoute,
|
||||
private router: Router,
|
||||
@ -55,6 +57,7 @@ export class CurrentLoanComponent implements OnInit {
|
||||
this.notifier = notifier;
|
||||
this.applicants = this.pd_all_details.pdapplicants_detials;
|
||||
this.applicants.push({'pd_co_applicant_id':'0','applicant_name':'Others'});
|
||||
//this.OtherFlag[0] = false;
|
||||
}
|
||||
public viewerOptions: any = {
|
||||
navbar: false,
|
||||
@ -98,6 +101,8 @@ export class CurrentLoanComponent implements OnInit {
|
||||
});
|
||||
if (result.length > 0) {
|
||||
result.forEach((val,index) => {
|
||||
this.amtInwords[index] = this._pd.convertNumberToWords(val.loan_amount);
|
||||
this.emiAmtInwords[index] = this._pd.convertNumberToWords(val.emi);
|
||||
control.push(this.createLoanDetail());
|
||||
this.selectedfrequency(val.frequency,index);
|
||||
//this.selectedLoanTakenBy(val.loan_taken_by,index);
|
||||
@ -133,6 +138,14 @@ export class CurrentLoanComponent implements OnInit {
|
||||
arr.removeAt(0);
|
||||
}
|
||||
}
|
||||
selectedBorrower(e,i){
|
||||
if(e == 0){
|
||||
this.OtherFlag[i] = true;
|
||||
}
|
||||
else{
|
||||
this.OtherFlag[i] = false;
|
||||
}
|
||||
}
|
||||
|
||||
selectedfrequency(e,i){
|
||||
|
||||
@ -227,4 +240,18 @@ export class CurrentLoanComponent implements OnInit {
|
||||
event.preventDefault();
|
||||
}
|
||||
}
|
||||
|
||||
/** Amount InWords */
|
||||
inWords(e,i,flag){
|
||||
switch(flag){
|
||||
case 1 :
|
||||
this.amtInwords[i] = this._pd.convertNumberToWords(e.target.value);
|
||||
break;
|
||||
case 2 :
|
||||
this.emiAmtInwords[i] = this._pd.convertNumberToWords(e.target.value);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,6 +1,7 @@
|
||||
<form [formGroup]="_neighbourhoodForm" novalidate>
|
||||
<h2 mat-dialog-title class="paragraph_change">
|
||||
<div fxFlex="70" align="left">
|
||||
<!-- <div fxFlex="70" align="left"> -->
|
||||
<div fxFlex="70" align="left" style="padding: 10px !important;">
|
||||
<div fxLayout="row wrap">
|
||||
<div fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="100" fxFlex.lg="100" fxFlex.xl="100">
|
||||
{{pageTitle}}
|
||||
@ -9,7 +10,7 @@
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div fxFlex="30" align="end">
|
||||
<div fxFlex="30" align="end" style="padding: 10px !important;">
|
||||
<button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Close" matTooltipPosition="right" mat-dialog-close><mat-icon>close</mat-icon></button>
|
||||
</div>
|
||||
</h2>
|
||||
@ -17,6 +18,7 @@
|
||||
<mat-dialog-content>
|
||||
<mat-card>
|
||||
<mat-card-header>
|
||||
<br>
|
||||
<div fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="100" fxFlex.lg="100" fxFlex.xl="100">
|
||||
<mat-radio-group formControlName="check_type" class="example-radio-group">
|
||||
<mat-radio-button class="example-radio-button" color="primary" [value]="types.id" *ngFor="let types of check_type; let t = index">{{types.type_name}}</mat-radio-button>
|
||||
@ -27,17 +29,17 @@
|
||||
<mat-card *ngFor="let neighbourhood of _neighbourhoodForm.controls.neighbourhood_list['controls']; let n = index;" [formGroupName]="n">
|
||||
<mat-card-content>
|
||||
<mat-form-field style="width: 42%">
|
||||
<input matInput placeholder="Neighbour Name" formControlName="neighbourhood_name" type="text">
|
||||
<input matInput autocomplete="off" placeholder="Neighbour Name" formControlName="neighbourhood_name" type="text">
|
||||
</mat-form-field>
|
||||
<mat-form-field style="width: 40%">
|
||||
<mat-select placeholder="Do You Know" formControlName="do_know">
|
||||
<mat-select placeholder="Do You Know the Applicant" formControlName="do_know">
|
||||
<mat-option value="Yes">Yes</mat-option>
|
||||
<mat-option value="No">No</mat-option>
|
||||
</mat-select>
|
||||
</mat-form-field>
|
||||
|
||||
<mat-form-field style="width: 42%" *ngIf="neighbourhood.controls.do_know.value=='Yes'">
|
||||
<input matInput placeholder="How Long to Know the Applicant " formControlName="how_long_do_know" type="text" (keypress)="keyPress($event)">
|
||||
<input matInput autocomplete="off" placeholder="How Long to Know the Applicant " formControlName="how_long_do_know" type="text" (keypress)="keyPress($event)">
|
||||
</mat-form-field>
|
||||
<mat-form-field style="width: 42%" *ngIf="neighbourhood.controls.do_know.value=='Yes'">
|
||||
<mat-select placeholder="Is the Applicant Owner" formControlName="is_applicant_owner">
|
||||
@ -55,22 +57,24 @@
|
||||
<mat-card *ngFor="let reference of _neighbourhoodForm.controls.referencecheck_list['controls']; let r = index;" [formGroupName]="r">
|
||||
<mat-card-content>
|
||||
<mat-form-field style="width: 28%">
|
||||
<input matInput placeholder="Name" formControlName="reference_name" type="text">
|
||||
<input matInput autocomplete="off" placeholder="Name" formControlName="reference_name" type="text">
|
||||
</mat-form-field>
|
||||
<mat-form-field style="width: 24%">
|
||||
<input matInput placeholder="Mobile Number" formControlName="mobile" type="text" (keypress)="keyPress($event)">
|
||||
<input matInput autocomplete="off" placeholder="Mobile Number" formControlName="mobile" type="text" (keypress)="keyPress($event)">
|
||||
<mat-error *ngIf="reference['controls'].mobile.hasError('maxlength') || reference['controls'].mobile.hasError('minlength')">Enter Valid Mobile Number. </mat-error>
|
||||
</mat-form-field>
|
||||
<mat-form-field style="width: 10%">
|
||||
<input matInput placeholder="STD" formControlName="std_code" type="text" (keypress)="keyPress($event)">
|
||||
|
||||
<mat-form-field style="width: 12%">
|
||||
<input matInput autocomplete="off" placeholder="STD Code" formControlName="std_code" type="text" (keypress)="keyPress($event)">
|
||||
<span matPrefix>+91</span>
|
||||
<mat-error *ngIf="reference['controls'].std_code.hasError('maxlength') || reference['controls'].std_code.hasError('minlength')">Enter Valid STD Code. </mat-error>
|
||||
</mat-form-field> <span>-</span>
|
||||
<mat-form-field style="width: 20%">
|
||||
<input matInput placeholder="Landline Number" formControlName="landline" type="text" (keypress)="keyPress($event)">
|
||||
<input matInput autocomplete="off" placeholder="Landline Number" formControlName="landline" type="text" (keypress)="keyPress($event)">
|
||||
<mat-error *ngIf="reference['controls'].landline.hasError('maxlength') || reference['controls'].landline.hasError('minlength')">Enter Valid Landline Number. </mat-error>
|
||||
</mat-form-field>
|
||||
<mat-form-field style="width: 28%">
|
||||
<textarea matInput placeholder="Location" formControlName="location"></textarea>
|
||||
<textarea matInput autocomplete="off" placeholder="Location" formControlName="location"></textarea>
|
||||
</mat-form-field>
|
||||
<mat-form-field style="width: 28%">
|
||||
|
||||
@ -82,17 +86,18 @@
|
||||
</mat-select>
|
||||
</mat-form-field>
|
||||
<mat-form-field style="width: 30%" *ngIf="reference.controls.relationship_with.value==5">
|
||||
<input matInput placeholder="Others" formControlName="others" type="text">
|
||||
<input matInput autocomplete="off" placeholder="Others" formControlName="others" type="text">
|
||||
</mat-form-field>
|
||||
<p #period_paragraph>Period of Relationship</p>
|
||||
<mat-form-field style="width: 12%">
|
||||
<input matInput placeholder="Year" formControlName="year_relation_applicant" type="text" (keypress)="keyPress($event)">
|
||||
<input matInput autocomplete="off" placeholder="Year" formControlName="year_relation_applicant" type="text" (keypress)="keyPress($event)">
|
||||
</mat-form-field>
|
||||
<mat-form-field style="width: 12%">
|
||||
<input matInput placeholder="Month" formControlName="months_relation_applicant" type="text" (keypress)="keyPress($event)">
|
||||
<input matInput autocomplete="off" placeholder="Month" formControlName="months_relation_applicant" type="text" (keypress)="keyPress($event)">
|
||||
</mat-form-field>
|
||||
<mat-form-field style="width: 28%">
|
||||
<input matInput [placeholder]="reference.controls.relationship_with.value ==4 ? 'Rent Amount' : 'Volume of Business'" formControlName="business_volume_amount" type="text" (keypress)="keyPress($event)">
|
||||
<input matInput autocomplete="off" [placeholder]="reference.controls.relationship_with.value ==4 ? 'Rent Amount' : 'Volume of Business'" formControlName="business_volume_amount" type="text" (keypress)="keyPress($event)" (keyup)="inWords($event,r)">
|
||||
<mat-hint align="start" style="font-size:70%" *ngIf="reference.controls.business_volume_amount.value != ''">{{"₹"}} {{amtInwords[r]}} Only</mat-hint>
|
||||
</mat-form-field>
|
||||
<mat-form-field style="width: 22%">
|
||||
<mat-select placeholder="Unit" formControlName="business_volume_unit">
|
||||
@ -102,6 +107,20 @@
|
||||
</mat-option>
|
||||
</mat-select>
|
||||
</mat-form-field>
|
||||
<span style="width:100%">
|
||||
<mat-form-field style="width: 45%">
|
||||
<mat-select placeholder=" Final remarks of PD officer on Reference Check done" formControlName="reference_final_remarks">
|
||||
<mat-option>Select</mat-option>
|
||||
<mat-option *ngFor="let remark of finalRemarksList" [value]="remark.id">
|
||||
{{remark.name}}
|
||||
</mat-option>
|
||||
</mat-select>
|
||||
</mat-form-field>
|
||||
<mat-form-field style="width: 25%" *ngIf="reference.controls.reference_final_remarks.value != '' ">
|
||||
<input matInput autocomplete="off" placeholder="Specify Remarks" formControlName="specify_final_remark" type="text">
|
||||
</mat-form-field>
|
||||
|
||||
</span>
|
||||
<button type="button" mat-raised-button mat-icon-button (click)="removeReferencecheck(r)"
|
||||
matTooltip="Remove Reference Check" matTooltipPosition="above" class="mr-1 mb-1 hover-icon" *ngIf="r!=0">
|
||||
<mat-icon>delete</mat-icon></button>
|
||||
@ -122,7 +141,7 @@
|
||||
<div fxFlex="60" class="pb-0 text-sm-left" align="left">
|
||||
<mat-form-field appearance="outline" style="width: 100%">
|
||||
<mat-label>Remarks</mat-label>
|
||||
<textarea matInput placeholder="Remarks" formControlName="neighbour_reference_remark" required></textarea>
|
||||
<textarea matInput autocomplete="off" placeholder="Remarks" formControlName="neighbour_reference_remark" required></textarea>
|
||||
</mat-form-field>
|
||||
</div>
|
||||
<div fxFlex="40" align="end">
|
||||
|
||||
@ -16,12 +16,16 @@ export class NeighbourHoodComponent implements OnInit {
|
||||
form_id:number;
|
||||
private notifier: NotifierService;
|
||||
check_type:any=[{'id':0,'type_name':'Neighbourhood'},{'id':1,'type_name':'Reference Check'}]
|
||||
default_reference_details: any= {'reference_name':'','mobile':'','landline':'-','location':'','relationship_with':'','year_relation_applicant':'','months_relation_applicant':'','business_volume_amount':'','business_volume_unit':''};
|
||||
default_reference_details: any= {'reference_name':'','mobile':'','landline':'-','location':'','relationship_with':'','year_relation_applicant':'','months_relation_applicant':'','business_volume_amount':'','business_volume_unit':'','reference_final_remarks':'','positive_remark':'','negative_remark':'','insufficient_info_remark':''};
|
||||
default_neighbourhood_details: any= {'neighbourhood_name':'','do_know':'','how_long_do_know':'','is_applicant_owner':''};
|
||||
|
||||
busineesRelationshipList:any=[];
|
||||
volumeunitList:any=[];
|
||||
errorMessage:any;
|
||||
finalRemarksList : any = [{'id': 1,'name': "Positive"},
|
||||
{'id': 2,'name': "Negative"},
|
||||
{'id': 3,'name': "Insufficient information provided"}];
|
||||
amtInwords : any = [];
|
||||
constructor(notifier: NotifierService, private _pd: PdTrigerService ,private _fb: FormBuilder, @Inject(MAT_DIALOG_DATA) public data: any,) {
|
||||
this.pdid = this.data.pdmaster_details.pd_id;
|
||||
this.notifier = notifier;
|
||||
@ -90,7 +94,8 @@ export class NeighbourHoodComponent implements OnInit {
|
||||
});
|
||||
}
|
||||
else if(exist_ref_details.length>0 && data.records.check_type==1){
|
||||
exist_ref_details.forEach(element => {
|
||||
exist_ref_details.forEach((element,index) => {
|
||||
this.amtInwords[index] = this._pd.convertNumberToWords(element.business_volume_amount);
|
||||
referencecheckControl.push(this.createReerenceCheck(element));
|
||||
});
|
||||
}
|
||||
@ -143,6 +148,11 @@ export class NeighbourHoodComponent implements OnInit {
|
||||
months_relation_applicant:[elementValue.months_relation_applicant,Validators.required],
|
||||
business_volume_amount:[elementValue.business_volume_amount,Validators.required],
|
||||
business_volume_unit:[elementValue.business_volume_unit, Validators.required],
|
||||
reference_final_remarks:[elementValue.reference_final_remarks],
|
||||
specify_final_remark : [elementValue.specify_final_remark],
|
||||
// positive_remark:[elementValue.positive_remark],
|
||||
// negative_remark:[elementValue.negative_remark],
|
||||
// insufficient_info_remark:[elementValue.insufficient_info_remark]
|
||||
});
|
||||
}
|
||||
|
||||
@ -229,6 +239,11 @@ export class NeighbourHoodComponent implements OnInit {
|
||||
"months_relation_applicant":element.months_relation_applicant,
|
||||
"business_volume_amount":element.business_volume_amount,
|
||||
"business_volume_unit":element.business_volume_unit,
|
||||
"reference_final_remarks":element.reference_final_remarks,
|
||||
"specify_final_remark":element.specify_final_remark
|
||||
// "positive_remark":element.positive_remark,
|
||||
// "negative_remark":element.negative_remark,
|
||||
// "insufficient_info_remark":element.insufficient_info_remark
|
||||
})
|
||||
});
|
||||
saveRecords.referencecheck_list=referencecheck_list;
|
||||
@ -270,5 +285,10 @@ validateAllFormFields(formGroup: any) {
|
||||
});
|
||||
}
|
||||
|
||||
/** Amount InWords */
|
||||
inWords(e,i){
|
||||
this.amtInwords[i] = this._pd.convertNumberToWords(e.target.value);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
@ -31,32 +31,34 @@
|
||||
</mat-card>
|
||||
|
||||
<mat-card *ngIf="otherIncomeForm.controls.other_income.value == 'Yes'">
|
||||
<mat-card-header><p>Income Details<p></mat-card-header>
|
||||
<mat-card-header><mat-card-title><p>Income Details</p></mat-card-title></mat-card-header>
|
||||
<div formArrayName="income_details">
|
||||
<div *ngFor="let details of otherIncomeForm.get('income_details').controls; let i=index"
|
||||
[formGroupName]="i">
|
||||
<mat-card-content class="matcard">
|
||||
<mat-form-field>
|
||||
<mat-form-field style="width:25%">
|
||||
<mat-select placeholder="Source"
|
||||
formControlName="source" required>
|
||||
<mat-option value="rental_income">Rental Income</mat-option>
|
||||
<mat-option value="{{src.id}}" *ngFor="let src of sourceData">{{src.name}}</mat-option>
|
||||
<!-- <mat-option value="rental_income">Rental Income</mat-option>
|
||||
<mat-option value="interest_income">Interest Income</mat-option>
|
||||
<mat-option value="agricultural_income">Agricultural Income</mat-option>
|
||||
<mat-option value="dividend_income">Dividend Income</mat-option>
|
||||
<mat-option value="others">Others</mat-option>
|
||||
<mat-option value="others">Others</mat-option> -->
|
||||
</mat-select>
|
||||
</mat-form-field>
|
||||
|
||||
<mat-form-field *ngIf="details.get('source').value == 'others'">
|
||||
<input matInput placeholder="Specify Others Source"
|
||||
<mat-form-field style="width:25%" *ngIf="details.get('source').value == 5">
|
||||
<input matInput autocomplete="off" placeholder="Specify Source"
|
||||
formControlName="others_source">
|
||||
</mat-form-field>
|
||||
|
||||
<mat-form-field>
|
||||
<input matInput placeholder="Amount" formControlName="amount" (keypress)="keyPress($event)" required>
|
||||
<mat-form-field style="width:25%">
|
||||
<input matInput autocomplete="off" placeholder="Amount" formControlName="amount" (keypress)="keyPress($event)" required (keyup)="inWords($event,i)">
|
||||
<mat-hint align="start" style="font-size:70%" *ngIf="details.get('amount').value != ''">{{"₹"}} {{amtInwords[i]}} Only</mat-hint>
|
||||
</mat-form-field>
|
||||
|
||||
<mat-form-field>
|
||||
<mat-form-field style="width:25%">
|
||||
<mat-select placeholder="Frequency" formControlName="frequency" required>
|
||||
<mat-option value="{{frq.frequency_id}}" *ngFor="let frq of frequencyData">{{frq.name}}</mat-option>
|
||||
</mat-select>
|
||||
@ -64,8 +66,8 @@
|
||||
|
||||
<!-- {{otherIncomeForm.controls.frequency.value}} -->
|
||||
|
||||
<mat-form-field *ngIf="details.get('frequency').value == 8">
|
||||
<input matInput placeholder="Specify Others Frequency"
|
||||
<mat-form-field style="width:25%" *ngIf="details.get('frequency').value == 8">
|
||||
<input matInput autocomplete="off" placeholder="Specify Frequency"
|
||||
formControlName="others_frequency">
|
||||
</mat-form-field>
|
||||
|
||||
@ -196,7 +198,7 @@
|
||||
<div fxFlex="60" class="pb-0 text-sm-left" align="left">
|
||||
<mat-form-field appearance="outline" style="width: 100%">
|
||||
<mat-label>Remarks</mat-label>
|
||||
<textarea matInput placeholder="Remarks" formControlName="otherincome_remarks" required></textarea>
|
||||
<textarea matInput autocomplete="off" placeholder="Remarks" formControlName="otherincome_remarks" required></textarea>
|
||||
</mat-form-field>
|
||||
</div>
|
||||
<div fxFlex="40" align="end">
|
||||
@ -241,7 +243,7 @@
|
||||
</mat-form-field>-->
|
||||
|
||||
<!--<mat-form-field>-->
|
||||
<!--<input matInput placeholder="Amount" formControlName="amount">-->
|
||||
<!--<input matInput autocomplete="off" placeholder="Amount" formControlName="amount">-->
|
||||
<!--</mat-form-field>-->
|
||||
<!--<mat-form-field>-->
|
||||
<!--<mat-select placeholder="Frequency" formControlName="frequency">-->
|
||||
@ -261,7 +263,7 @@
|
||||
<!--</div>-->
|
||||
<!--</mat-card>-->
|
||||
<!--<mat-form-field>-->
|
||||
<!--<input matInput placeholder="Remarks" formControlName="otherincome_remarks">-->
|
||||
<!--<input matInput autocomplete="off" placeholder="Remarks" formControlName="otherincome_remarks">-->
|
||||
<!--</mat-form-field>-->
|
||||
<!--<button mat-raised-button type="submit" class="button" (click)="submitCurrentDetails()">Submit</button>-->
|
||||
<!--</form>-->
|
||||
@ -289,12 +291,12 @@
|
||||
<!-- </mat-select>
|
||||
</mat-form-field>
|
||||
<mat-form-field *ngIf="details.get('source').value == 5 ">
|
||||
<input matInput placeholder="Specify Others Source"
|
||||
<input matInput autocomplete="off" placeholder="Specify Others Source"
|
||||
formControlName="others_source">
|
||||
</mat-form-field>
|
||||
|
||||
<mat-form-field>
|
||||
<input matInput placeholder="Amount" formControlName="amount" (keypress)="keyPress($event)" required>
|
||||
<input matInput autocomplete="off" placeholder="Amount" formControlName="amount" (keypress)="keyPress($event)" required>
|
||||
</mat-form-field>
|
||||
<mat-form-field>
|
||||
<mat-select placeholder="Frequency" formControlName="frequency" required>
|
||||
@ -305,7 +307,7 @@
|
||||
<!-- {{otherIncomeForm.controls.frequency.value}} -->
|
||||
|
||||
<!-- <mat-form-field *ngIf="details.get('frequency').value == 8">
|
||||
<input matInput placeholder="Specify Others Frequency"
|
||||
<input matInput autocomplete="off" placeholder="Specify Others Frequency"
|
||||
formControlName="others_frequency">
|
||||
</mat-form-field>
|
||||
<button type="button" matTooltip="Add More Income Details" class="mr-1 mb-1 hover-icon" matTooltipPosition="above" mat-raised-button mat-icon-button (click)="addIncomeDetails()"
|
||||
@ -324,7 +326,7 @@
|
||||
<div fxFlex="60" class="pb-0 text-sm-left">
|
||||
<mat-form-field appearance="outline" style="width: 100%">
|
||||
<mat-label>Remarks</mat-label>
|
||||
<textarea matInput placeholder="Remarks" formControlName="otherincome_remarks" required></textarea>
|
||||
<textarea matInput autocomplete="off" placeholder="Remarks" formControlName="otherincome_remarks" required></textarea>
|
||||
</mat-form-field>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -43,6 +43,7 @@ export class OtherIncomeComponent implements OnInit {
|
||||
private notifier: NotifierService;
|
||||
frequencyData: any = [];
|
||||
sourceData : any = [];
|
||||
amtInwords : any = [];
|
||||
|
||||
constructor(notifier: NotifierService,
|
||||
private fb: FormBuilder,
|
||||
@ -95,7 +96,8 @@ public viewerOptions: any = {
|
||||
return value.records.income_details[key];
|
||||
});
|
||||
if (result.length > 0) {
|
||||
result.forEach(val => {
|
||||
result.forEach((val,index) => {
|
||||
this.amtInwords[index] = this._pd.convertNumberToWords(val.amount);
|
||||
control.push(this.createDetail());
|
||||
});
|
||||
this.otherIncomeForm.controls['income_details'].setValue(result);
|
||||
@ -208,4 +210,9 @@ public viewerOptions: any = {
|
||||
event.preventDefault();
|
||||
}
|
||||
}
|
||||
/** Amount InWords */
|
||||
inWords(e,i){
|
||||
this.amtInwords[i] = this._pd.convertNumberToWords(e.target.value);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user