Changes : ps

This commit is contained in:
venbatechnologies@gmail.com 2019-04-26 16:04:54 +05:30
parent 938aec7a63
commit dd1cb76487
4 changed files with 24 additions and 4 deletions

View File

@ -101,7 +101,7 @@
</mat-form-field> </mat-form-field>
<mat-form-field *ngIf="sup.get('residence_ownership').value == 3" style="width:43%;"> <mat-form-field *ngIf="sup.get('residence_ownership').value == 3" style="width:43%;">
<input matInput placeholder="Rent Amount" formControlName="rent" <input matInput placeholder=" Monthly Rent Amount" formControlName="rent"
OnlyNumber type="text"> OnlyNumber type="text">
<mat-hint align="start" style="font-size:90%" *ngIf="sup.get('rent').value != ''">{{"&#8377;"}} {{sup.get('rent').value | numberToWords}} Only</mat-hint> <mat-hint align="start" style="font-size:90%" *ngIf="sup.get('rent').value != ''">{{"&#8377;"}} {{sup.get('rent').value | numberToWords}} Only</mat-hint>
</mat-form-field> </mat-form-field>
@ -120,6 +120,16 @@
<mat-card> <mat-card>
<h5>Family Details of {{FamilyMemberAsLabel[ix]}}</h5> <h5>Family Details of {{FamilyMemberAsLabel[ix]}}</h5>
<div> <div>
<!-- <mat-form-field>
<input matInput >
</mat-form-field> -->
<mat-form-field style="width: 12%">
<mat-select placeholder="Title" formControlName="family_member_salutation">
<mat-option *ngFor="let tl of titleData" [value]="tl.title_id">
{{tl.name}}
</mat-option>
</mat-select>
</mat-form-field>
<mat-form-field> <mat-form-field>
<input matInput placeholder="Name" formControlName="family_member_name" <input matInput placeholder="Name" formControlName="family_member_name"
required> required>

View File

@ -52,6 +52,7 @@ export class FamilyDetailsComponent implements OnInit {
stateData: any = []; stateData: any = [];
cityData: any = []; cityData: any = [];
pincodeData: any = []; pincodeData: any = [];
titleData: any = [];
earningStatus = [{ id: 1, type: 'Earning' }, earningStatus = [{ id: 1, type: 'Earning' },
{ id: 2, type: 'Non Earning' }] { id: 2, type: 'Non Earning' }]
documentsAndFilesList : any = []; documentsAndFilesList : any = [];
@ -81,6 +82,8 @@ export class FamilyDetailsComponent implements OnInit {
this.getMasterDetails('RESIDENCEOWNERSHIP', 4); this.getMasterDetails('RESIDENCEOWNERSHIP', 4);
this.getMasterDetails('EARNINGMEMBERSSTATUS', 5); this.getMasterDetails('EARNINGMEMBERSSTATUS', 5);
this.getMasterDetails('STATE', 6); this.getMasterDetails('STATE', 6);
this.getMasterDetails('TITLES', 7);
this._pd.getFamilyDetails(this.pdid).subscribe(data => { this._pd.getFamilyDetails(this.pdid).subscribe(data => {
if (data.dataStatus == true) { if (data.dataStatus == true) {
@ -183,6 +186,7 @@ export class FamilyDetailsComponent implements OnInit {
} }
initgenerateFamilyMembersDetailsGet(val): FormGroup { initgenerateFamilyMembersDetailsGet(val): FormGroup {
return this.fb.group({ return this.fb.group({
family_member_salutation:[val.family_member_salutation || ''],
family_member_name: [val.family_member_name, Validators.compose([])], family_member_name: [val.family_member_name, Validators.compose([])],
family_member_relationship: [val.family_member_relationship, Validators.compose([])], family_member_relationship: [val.family_member_relationship, Validators.compose([])],
family_member_age: [val.family_member_age, Validators.compose([])], family_member_age: [val.family_member_age, Validators.compose([])],
@ -355,6 +359,7 @@ export class FamilyDetailsComponent implements OnInit {
// this.IncomePerMonth[index] = this._pd.convertNumberToWords(vals.earning_gross_income_per_month); // this.IncomePerMonth[index] = this._pd.convertNumberToWords(vals.earning_gross_income_per_month);
// } // }
let datas = this.fb.group({ let datas = this.fb.group({
family_member_salutation: [vals.family_member_salutation || null ],
family_member_name: [vals.family_member_name || null, Validators.compose([])], family_member_name: [vals.family_member_name || null, Validators.compose([])],
family_member_relationship: [vals.family_member_relationship || null, Validators.compose([])], family_member_relationship: [vals.family_member_relationship || null, Validators.compose([])],
family_member_age: [vals.family_member_age || null, Validators.compose([])], family_member_age: [vals.family_member_age || null, Validators.compose([])],
@ -421,6 +426,7 @@ export class FamilyDetailsComponent implements OnInit {
// // this.isReadOnly[inx] = false; // // this.isReadOnly[inx] = false;
// } // }
arraydata = { arraydata = {
'family_member_salutation':'',
'family_member_name': val.name, 'family_member_name': val.name,
'family_member_relationship': val.relationship, 'family_member_relationship': val.relationship,
'family_member_age': val.age, 'family_member_age': val.age,
@ -489,6 +495,7 @@ export class FamilyDetailsComponent implements OnInit {
generateFamilyMembersDetailsGet(): FormGroup { generateFamilyMembersDetailsGet(): FormGroup {
return this.fb.group({ return this.fb.group({
family_member_salutation:[''],
family_member_name: ['', Validators.compose([])], family_member_name: ['', Validators.compose([])],
family_member_relationship: ['', Validators.compose([])], family_member_relationship: ['', Validators.compose([])],
family_member_age: ['', Validators.compose([])], family_member_age: ['', Validators.compose([])],
@ -525,6 +532,9 @@ export class FamilyDetailsComponent implements OnInit {
else if (type == 6) { else if (type == 6) {
this.stateData = data.records.filter(item => item.isactive == 1); this.stateData = data.records.filter(item => item.isactive == 1);
} }
else if (type == 7) {
this.titleData = data.records.filter(item => item.isactive == 1);
}
} }
}); });
} }

View File

@ -136,7 +136,7 @@
<div align="right"> <div align="right">
<button type="button" matTooltip="Delete" class="mr-1 mb-1 hover-icon" <button type="button" matTooltip="Delete" class="mr-1 mb-1 hover-icon"
matTooltipPosition="above" mat-raised-button mat-icon-button matTooltipPosition="above" mat-raised-button mat-icon-button
(click)="deleteIncomeDetails(i)" *ngIf="!last"> (click)="deleteIncomeDetails(i)" *ngIf="otherIncomeForm.controls.income_details.length > 1">
<mat-icon>delete</mat-icon> <mat-icon>delete</mat-icon>
</button> </button>
</div> </div>

View File

@ -37,7 +37,7 @@ export class OtherIncomeComponent implements OnInit {
subproduct_abbr: any; subproduct_abbr: any;
lender_applicant_id: any; lender_applicant_id: any;
main_applicant: any; main_applicant: any;
pageTitle: string = "Other Income Details"; pageTitle: string = "Other Income of Loan Applicants";
loadDataStatus: boolean = true; loadDataStatus: boolean = true;
@ -77,7 +77,7 @@ export class OtherIncomeComponent implements OnInit {
this.customer_segment_abbr = this.pd_all_details.pdmaster_details.customer_segment_abbr; this.customer_segment_abbr = this.pd_all_details.pdmaster_details.customer_segment_abbr;
this.applicants = this.pd_all_details.pdapplicants_detials; this.applicants = this.pd_all_details.pdapplicants_detials;
this.applicants = this.applicants.filter(val => val.applicant_type == 0 || val.applicant_type == 1); this.applicants = this.applicants.filter(val => val.applicant_type == 0 || val.applicant_type == 1);
this.applicants.push({ 'pd_co_applicant_id': '0', 'applicant_name': 'Others' }); // this.applicants.push({ 'pd_co_applicant_id': '0', 'applicant_name': 'Others' });
} }
pdf(fileURL){ pdf(fileURL){
window.open(fileURL); window.open(fileURL);