From b126685d1275f582816e9b16993c490e22301efa Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Fri, 29 Oct 2021 21:21:02 +0530 Subject: [PATCH] form clubed --- .../banking-details.component.html | 166 +++++++++++++++++- .../banking-details.component.ts | 134 +++++++++++++- 2 files changed, 287 insertions(+), 13 deletions(-) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html index 4e194b85c..4313fd5a6 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html @@ -81,11 +81,12 @@ - + +
@@ -183,17 +184,27 @@
- + Year - + Month + formControlName="vintage_month" OnlyNumber type="text" (change)="ConvertMonthintoYear(itemrow1,$event.target.value)"> + + + + Select + Personal + Business + Both +
+
@@ -229,6 +240,152 @@
+ +
+ + + + Select + Yes + No + + +
+ + + + +

Business Details {{l+1}} +

+ + + + + Select + + + {{val.group_id != 2 ? val.name : val.name | titlecase}} + + + + + + + Applicant Name Required + + + + + + + + Select + {{ + btLen.lender_name }} + + + + + Bank Name Required + + + + + + Select + {{ + prop.name }} + + + + + +
+ + + Select + Yes + No + NA + + + + + + + {{"₹"}} {{itemrow1.get('limit').value | numberToWords}} Only + +
+
+ +
+
+ + Year + + + + Month + + +
+
+ +
+ +
+ +
+ +
+ + + + + + + + + + +
+ + +
@@ -285,6 +442,7 @@ +
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.ts index 07f062ed7..c7c02219e 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.ts @@ -38,6 +38,7 @@ export class BankingDetailsComponent implements OnInit { pdid: number; pageTitle: string = "Banking Details of Individuals"; public bankingForm: FormGroup; + public businessForm: FormGroup; step: number; private notifier: NotifierService; public pd_cus_segment: string; @@ -104,18 +105,19 @@ export class BankingDetailsComponent implements OnInit { ngOnInit() { this.step = 0; this.initBankingForm(); + // this.initBusinessForm(); this._pd.getCompaniesListsForBusiness(this.pdid).subscribe(data => { if (data.dataStatus) { this.existCompanyList = data.records.filter(val => val.is_active === true); } - // let modifyCompanyList : any=[]; - // if(this.existCompanyList.length>0){ - // modifyCompanyList = this.existCompanyList.map(element => { - // return {id:element.company_order_id.toString(),name:element.company_name,group_id:1}; - // }); - // this.mergeCompanyApplicant.push({groupName:'COMPANIES',groupValues:modifyCompanyList}) - // } + let modifyCompanyList : any=[]; + if(this.existCompanyList.length>0){ + modifyCompanyList = this.existCompanyList.map(element => { + return {id:element.company_order_id.toString(),name:element.company_name,group_id:1}; + }); + this.mergeCompanyApplicant.push({groupName:'COMPANIES',groupValues:modifyCompanyList}) + } }); let modifyApplicantList: any = []; @@ -150,7 +152,14 @@ export class BankingDetailsComponent implements OnInit { params.pd_id = this.pdid; params.pd_form_id = '7'; this._pd.retriveForm(params).subscribe(data => { + console.log('itemrows'); + console.log(this.bankingForm); + console.log(this.businessForm); const control = this.bankingForm.controls['itemRows']; + const control1=this.bankingForm.controls['itemRows1']; + console.log('test'); + console.log(control); + console.log(control1); if (data.status == 200) { this.bankingForm.controls.banking_form_remark.setValue(data.records.banking_form_remark); let bank_info=data.records.hasOwnProperty('bank_info_available') ? data.records.bank_info_available == true ? 'Yes' : 'No' : 'Yes' @@ -167,8 +176,24 @@ export class BankingDetailsComponent implements OnInit { this.selectedAccTypeChanges(+datas.account_type, index) // this.emiAmtInwords[index] = this._pd.convertNumberToWords(val.emi); control.push(this.createBankarray()); + control1.push(this.createBusinessarray()); }); + let reeult1=[{account_type: "1",bank_name: "60", + limit: "", + other_applicant: "", + other_bank: "", + salary: "", + vintage_month: "", + same_ac_used_for:"", + vintage_year: 18,applicant_name:{group_id: 2, + id: "5521", + name: "Test1"}}] + this.bankingForm.controls.itemRows.setValue(result); + //this.businessForm.controls.itemRows1.setValue(result); + // console.log(result); + //console.log('1va'); + //console.log(this.bankingForm.controls.itemRows); } } else { // control.push(this.createBankarray()); @@ -227,9 +252,18 @@ export class BankingDetailsComponent implements OnInit { this.bankingForm = this.fb.group({ banking_form_remark: [''], bank_info_available:[''], - itemRows: this.fb.array([]) + bank_info_available_business:[''], + itemRows: this.fb.array([]), + itemRows1: this.fb.array([]), }); } + // public initBusinessForm():void{ + // this.businessForm = this.fb.group({ + // banking_form_remark_business: [''], + // bank_info_available_business:[''], + // itemRows1: this.fb.array([]), + // }); + // } createBankarray() { return this.fb.group({ @@ -238,6 +272,7 @@ export class BankingDetailsComponent implements OnInit { bank_name: [''], other_bank: [''], account_type: [''], + //salary: [''], salary: this.pd_cus_segment.substring(0, 2) == 'SE' ? [''] : [''], limit: [''], @@ -247,6 +282,26 @@ export class BankingDetailsComponent implements OnInit { // is_main: this.pd_cus_segment == 'SAL' ? [''] : [''], vintage_year: [''], vintage_month: [''], + same_ac_used_for:[''], + }) + } + createBusinessarray() + { + return this.fb.group({ + applicant_name_business: [''], + other_applicant_business: [''], + bank_name_business: [''], + other_bank_business: [''], + account_type_business: [''], + //salary: [''], + salary_business: this.pd_cus_segment.substring(0, 2) == 'SE' ? [''] : [''], + limit_business: [''], + //is_main: [''], + //is_main: [this.pd_cus_segment == 'SAL' ? '' : ''], + //is_main:[''], + // is_main: this.pd_cus_segment == 'SAL' ? [''] : [''], + vintage_year_business: [''], + vintage_month_business: [''], }); } @@ -262,12 +317,30 @@ export class BankingDetailsComponent implements OnInit { // this.bankingForm.controls.is_main.updateValueAndValidity(); // } } + addBusinessdetails(index, event) + { + event.stopPropagation(); + const control = this.bankingForm.controls['itemRows1']; + let length = control.length; + this.step = length; + control.push(this.createBusinessarray()); + // if(this.pd_cus_segment != 'SAL') { + // this.bankingForm.controls.is_main.setValidators([Validators.required]); + // this.bankingForm.controls.is_main.updateValueAndValidity(); + // } + } + deleteBankdetails(index: number) { const control = this.bankingForm.controls['itemRows']; control.removeAt(index); } + deleteBusinessdetails(index: number) { + + const control = this.bankingForm.controls['itemRows1']; + control.removeAt(index); + } setStep(index: number) { @@ -277,6 +350,8 @@ export class BankingDetailsComponent implements OnInit { bankSubmit() { const control = this.bankingForm.controls.itemRows; + console.log('controlll'); + console.log(control); let CtrlLength = control.controls.length; if (CtrlLength > 0) { @@ -327,7 +402,10 @@ export class BankingDetailsComponent implements OnInit { records.bank_info_available=this.bankingForm.controls.bank_info_available.value == 'Yes' ? true : this.bankingForm.controls.bank_info_available.value == 'No' ? false : '' // records.fk_createdby = '252'; records.banking_details = this.bankingForm.controls['itemRows'].value; - + records.business_details=this.bankingForm.controls['itemRows1'].value; + console.log('record'); + console.log(records); + return this._pd.saveForm(records).subscribe(data => { if (data.status == 200) { this.notifier.notify('success', 'Saved Successfully.'); @@ -385,6 +463,15 @@ export class BankingDetailsComponent implements OnInit { return false; } + } + checkOthers1(values) { + if (values != null) { + return values.id == 0 ? true : false; + } + else { + return false; + } + } selectedAccTypeChanges(event: any, i) { @@ -415,6 +502,16 @@ export class BankingDetailsComponent implements OnInit { itemrow.controls.vintage_month.setValue(Math.floor(converted_month)); } + ConvertMonthintoYear_business(itemrow1, e) + { + let year = itemrow1.controls.vintage_year_business.value; + + let converted_month: number = e % 12; + let converted_year: number = e / 12; + + itemrow1.controls.vintage_year_business.setValue(+year + +Math.floor(converted_year)); + itemrow1.controls.vintage_month_business.setValue(Math.floor(converted_month)); + } pdf(fileURL){ window.open(fileURL); @@ -464,12 +561,31 @@ export class BankingDetailsComponent implements OnInit { onChangeAvailable(value){ console.log(value) const control = this.bankingForm.controls['itemRows']; + // const control1 = this.businessForm.controls['itemRows1']; if(value == 'Yes'){ control.push(this.createBankarray()) + // control1.push(this.createBusinessarray()) } else{ while(control.length!=0){ control.removeAt(0) + // control1.removeAt(0) + } + } + + } + onChangeAvailablebusiness(value){ + console.log(value) + const control1 = this.bankingForm.controls['itemRows1']; + // const control1 = this.businessForm.controls['itemRows1']; + if(value == 'Yes'){ + + control1.push(this.createBusinessarray()) + } + else{ + while(control1.length!=0){ + control1.removeAt(0) + // control1.removeAt(0) } }