From 5a56ac04a5b4a76e6a31a5e2c378abcf45b94919 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Sat, 8 Dec 2018 15:34:29 +0530 Subject: [PATCH] Small changes : ps --- .../general-info/general-info.component.html | 2 +- .../general-info/general-info.component.ts | 14 +- .../personal-info.component.html | 10 +- .../personal-info/personal-info.component.ts | 161 +++++++++++++++--- .../rental-info/rental-info.component.html | 1 + .../list-pd/start-pd/start-pd.component.ts | 12 +- 6 files changed, 159 insertions(+), 41 deletions(-) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html index 05167d934..3bcede64a 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html @@ -41,7 +41,7 @@ Select - + {{comrelShip.name | titlecase}} diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts index 58a8cb794..2ecd98a7c 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts @@ -17,6 +17,7 @@ export class GeneralInfoComponent implements OnInit { public _generalForm: FormGroup; public pd_applicants_details: any; relationShipList:any=[]; + companyRelationShipList:any=[]; errorMessage:any; fetch_related_details:any=[]; @@ -32,8 +33,7 @@ export class GeneralInfoComponent implements OnInit { ngOnInit() { this.initFormDetails(); this.getMasterDetails('RELATIONSHIPS',1); - - + this.getMasterDetails('COMPANYRELATIONSHIPS',2); } // init form @@ -55,6 +55,9 @@ export class GeneralInfoComponent implements OnInit { if(type==1){ this.relationShipList=data.records.filter(item => item.isactive == 1); } + if(type==2){ + this.companyRelationShipList=data.records.filter(item => item.isactive == 1); + } } }, error => this.errorMessage = error); @@ -124,6 +127,7 @@ export class GeneralInfoComponent implements OnInit { return this._fb.group({ pd_co_applicant_id: [elementValue.pd_co_applicant_id], applicant_name: [elementValue.applicant_name], + company_name: [elementValue.company_name], exist_status:[elementValue.exist_status==1 && elementValue.pd_co_applicant_id > 0 ? true : false] }); } @@ -141,7 +145,7 @@ export class GeneralInfoComponent implements OnInit { } // checkand un check function - checkboxChange(event, index, item) { + checkboxChange(event, index, item) { if(item.exist_status.value){ if(item.pd_co_applicant_id.value==0){ const dialogRef = this.dialog.open(OtherApplicantDetailsComponent, { @@ -154,7 +158,7 @@ export class GeneralInfoComponent implements OnInit { if(dataresult.data.length>0){ let relationControl = this._generalForm.controls['applicant_relation']; dataresult.data.forEach(element => { - let applicant_details: any= {'pd_co_applicant_id':element.pd_co_applicant_id,'applicant_name':element.applicant_name,'applicant_relation_to':'','relation':'','company_name':'','company_relation':'',}; + let applicant_details: any= {'pd_co_applicant_id':element.pd_co_applicant_id,'applicant_name':element.applicant_name,'applicant_relation_to':'','relation':'','company_name':element.company_name,'company_relation':''}; relationControl.push(this.createApplicantRelation(applicant_details)); // push related to details this.fetch_related_details.push(element.applicant_name); @@ -166,7 +170,7 @@ export class GeneralInfoComponent implements OnInit { } else{ let relationControl = this._generalForm.controls['applicant_relation']; - let applicant_details: any= {'pd_co_applicant_id':item.pd_co_applicant_id.value,'applicant_name':item.applicant_name.value,'applicant_relation_to':'','relation':'','company_name':'','company_relation':'',}; + let applicant_details: any= {'pd_co_applicant_id':item.pd_co_applicant_id.value,'applicant_name':item.applicant_name.value,'applicant_relation_to':'','relation':'','company_name':item.company_name.value,'company_relation':''}; relationControl.push(this.createApplicantRelation(applicant_details)); // push related to details this.fetch_related_details.push(item.applicant_name.value); diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.html index 1ab208e18..59e13fa12 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.html @@ -30,7 +30,7 @@ - + Individual Non-Individual @@ -118,7 +118,7 @@ - + Individual Non-Individual @@ -155,7 +155,7 @@ - Enter Valid Vintage. + Enter Valid Vintage. @@ -168,7 +168,7 @@ - + @@ -332,3 +332,5 @@ + + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.ts index 5ee16791d..d365533bc 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.ts @@ -206,13 +206,13 @@ removeCoApplicant(renoveIndex) { loadMainApplicant(applicant:any) { return this._fb.group({ name_ans: [applicant.name_ans, Validators.required], - age_ans: [applicant.age_ans, Validators.compose([Validators.required,Validators.minLength(1),Validators.maxLength(3),Validators.required,Validators.pattern('^[0-9]*$')])], - vintage_ans: [applicant.vintage_ans, Validators.compose([Validators.required,Validators.minLength(1),Validators.maxLength(3),Validators.required,Validators.pattern('^[0-9]*$')])], + age_ans: [applicant.age_ans, Validators.compose([Validators.minLength(1),Validators.maxLength(3),Validators.pattern('^[0-9]*$')])], + vintage_ans: [applicant.vintage_ans, Validators.compose([Validators.minLength(1),Validators.maxLength(3),Validators.pattern('^[0-9]*$')])], non_individual_entity_ans: [applicant.non_individual_entity_ans], other_non_individual_entity_ans:[applicant.other_non_individual_entity_ans], entity_ans: [applicant.entity_ans, Validators.required], - qualification_ans: [applicant.qualification_ans, Validators.required], - earning_ans: [applicant.earning_ans, Validators.required], + qualification_ans: [applicant.qualification_ans], + earning_ans: [applicant.earning_ans], edu_level_ans: [applicant.edu_level_ans], current_added_status: [applicant.current_added_status], }); @@ -222,13 +222,13 @@ loadMainApplicant(applicant:any) { loadCoApplicant(applicant:any) { return this._fb.group({ name_ans: [applicant.name_ans, Validators.required], - age_ans: [applicant.age_ans, Validators.compose([Validators.required,Validators.minLength(1),Validators.maxLength(3),Validators.required,Validators.pattern('^[0-9]*$')])], + age_ans: [applicant.age_ans, Validators.compose([Validators.minLength(1),Validators.maxLength(3),Validators.pattern('^[0-9]*$')])], entity_ans: [applicant.entity_ans, Validators.required], - qualification_ans: [applicant.qualification_ans, Validators.required], - vintage_ans: [applicant.vintage_ans, Validators.compose([Validators.required,Validators.minLength(1),Validators.maxLength(3),Validators.required,Validators.pattern('^[0-9]*$')])], + qualification_ans: [applicant.qualification_ans], + vintage_ans: [applicant.vintage_ans, Validators.compose([Validators.minLength(1),Validators.maxLength(3),Validators.pattern('^[0-9]*$')])], non_individual_entity_ans: [applicant.non_individual_entity_ans], other_non_individual_entity_ans:[applicant.other_non_individual_entity_ans], - earning_ans: [applicant.earning_ans, Validators.required], + earning_ans: [applicant.earning_ans], relation_ans: [applicant.relation_ans, Validators.required], edu_level_ans: [applicant.edu_level_ans], current_added_status: [applicant.current_added_status], @@ -239,13 +239,13 @@ loadCoApplicant(applicant:any) { loadDefaultMainApplicant(applicant:any){ return this._fb.group({ name_ans: [applicant.applicant_name, Validators.required], - age_ans: ['', Validators.compose([Validators.required,Validators.minLength(1),Validators.maxLength(3),Validators.required,Validators.pattern('^[0-9]*$')])], - vintage_ans:['', Validators.compose([Validators.required,Validators.minLength(1),Validators.maxLength(3),Validators.required,Validators.pattern('^[0-9]*$')])], + age_ans: ['', Validators.compose([Validators.minLength(1),Validators.maxLength(3),Validators.pattern('^[0-9]*$')])], + vintage_ans:['', Validators.compose([Validators.minLength(1),Validators.maxLength(3),Validators.pattern('^[0-9]*$')])], non_individual_entity_ans:[''], other_non_individual_entity_ans:[''], - entity_ans: [this.pd_all_details.pdmaster_details.customer_segment_abbr.substring(0,3).toUpperCase()==='SAL' ? 'Individual' : '', Validators.required], - qualification_ans: ['', Validators.required], - earning_ans: ['', Validators.required], + entity_ans: [this.pd_all_details.pdmaster_details.customer_segment_abbr.substring(0,3).toUpperCase()==='SAL' ? 'individual' : '', Validators.required], + qualification_ans: [''], + earning_ans: [''], edu_level_ans:[''], current_added_status: [applicant.current_added_status], }); @@ -255,28 +255,29 @@ loadDefaultMainApplicant(applicant:any){ loadDefaultCoApplicant(applicant:any){ return this._fb.group({ name_ans: [applicant.applicant_name, Validators.required], - age_ans: ['', Validators.compose([Validators.required,Validators.minLength(1),Validators.maxLength(3),Validators.required,Validators.pattern('^[0-9]*$')])], - vintage_ans:['', Validators.compose([Validators.required,Validators.minLength(1),Validators.maxLength(3),Validators.required,Validators.pattern('^[0-9]*$')])], + age_ans: ['', Validators.compose([Validators.minLength(1),Validators.maxLength(3),Validators.pattern('^[0-9]*$')])], + vintage_ans:['', Validators.compose([Validators.minLength(1),Validators.maxLength(3),Validators.pattern('^[0-9]*$')])], non_individual_entity_ans:[''], other_non_individual_entity_ans:[''], - entity_ans: [this.pd_all_details.pdmaster_details.customer_segment_abbr.substring(0,3).toUpperCase()==='SAL' ? 'Individual' : '', Validators.required], + entity_ans: [this.pd_all_details.pdmaster_details.customer_segment_abbr.substring(0,3).toUpperCase()==='SAL' ? 'individual' : '', Validators.required], edu_level_ans:[''], - qualification_ans: ['', Validators.required], - earning_ans: ['', Validators.required], + qualification_ans: [''], + earning_ans: [''], relation_ans: ['', Validators.required], current_added_status: [applicant.current_added_status], }); } // submit forms details submitPersonalForm(formData:any) { - if (this._personalForm.invalid) { - this.validateAllFormFields(this._personalForm); + // if (this._personalForm.invalid) { + // this.validateAllFormFields(this._personalForm); - // this.notifier.notify('warning', 'All Fields Are Required.!'); + // //this.notifier.notify('warning', 'All Fields Are Required.!'); - return; - } - else{ + // return; + // } + // else{ + //this.notifier.notify('warning', 'Fields Are Required.!'); let main_applicantDetails:any=[]; let co_applicantDetails:any=[]; let new_co_applicant:any=[]; @@ -348,7 +349,7 @@ submitPersonalForm(formData:any) { this.questionsSubmitCheck(save_details); } - } + //} } // submit and check all questions @@ -383,4 +384,114 @@ validateAllFormFields(formGroup: any) { } +// selectedAccTypeChanges(event: any){ +// console.log('First Time',event); +// console.log('First Time Value',event.value); +// if(event.value == 2) { +// const control = this.bankingForm.controls['itemRows']; +// console.log('Inside If Condition'); +// console.log(control); +// console.log(control.controls); + +// control.controls[0].get('limit').clearValidators(); +// control.controls[0].get('limit').updateValueAndValidity(); + +// //this.loanDetailsForm.controls['is_topup'].setValidators([Validators.required]); +// // this.bankingForm.controls['itemRows']. +// // this.bankingForm.controls.get('limit').clearValidators(); +// // this.bankingForm.controls.itemRows['controls'].get('limit').updateValueAndValidity(); +// // const control = this.bankingForm.controls['itemRows']; +// // console.log(control.controls['limit'].value); + +// } +// else{ +// //alert('sd'); +// }} + + selectedEntityChanges(event: any){ + const control = this._personalForm.controls['main_applicant_details']; + if(event.value == 'individual') { + + control.controls[0].get('vintage_ans').clearValidators(); + control.controls[0].get('vintage_ans').updateValueAndValidity(); + + control.controls[0].get('age_ans').setValidators([Validators.required]); + control.controls[0].get('age_ans').updateValueAndValidity(); + + control.controls[0].get('earning_ans').setValidators([Validators.required]); + control.controls[0].get('earning_ans').updateValueAndValidity(); + + control.controls[0].get('qualification_ans').setValidators([Validators.required]); + control.controls[0].get('qualification_ans').updateValueAndValidity(); + + control.controls[0].get('non_individual_entity_ans').clearValidators(); + control.controls[0].get('non_individual_entity_ans').updateValueAndValidity(); + + } + else if(event.value == 'non-individual'){ + + control.controls[0].get('vintage_ans').setValidators([Validators.required]); + control.controls[0].get('vintage_ans').updateValueAndValidity(); + + control.controls[0].get('age_ans').clearValidators(); + control.controls[0].get('age_ans').updateValueAndValidity(); + + control.controls[0].get('earning_ans').clearValidators(); + control.controls[0].get('earning_ans').updateValueAndValidity(); + + control.controls[0].get('qualification_ans').clearValidators(); + control.controls[0].get('qualification_ans').updateValueAndValidity(); + + control.controls[0].get('non_individual_entity_ans').setValidators([Validators.required]); + control.controls[0].get('non_individual_entity_ans').updateValueAndValidity(); + + } + +} + +selectedCoApplicantEntityChanges(event: any,c){ + + const control = this._personalForm.controls['co_applicant_details']; + + if(event.value == 'individual') { + + control.controls[0].get('vintage_ans').clearValidators(); + control.controls[0].get('vintage_ans').updateValueAndValidity(); + + control.controls[0].get('age_ans').setValidators([Validators.required]); + control.controls[0].get('age_ans').updateValueAndValidity(); + + control.controls[0].get('earning_ans').setValidators([Validators.required]); + control.controls[0].get('earning_ans').updateValueAndValidity(); + + control.controls[0].get('qualification_ans').setValidators([Validators.required]); + control.controls[0].get('qualification_ans').updateValueAndValidity(); + + control.controls[0].get('non_individual_entity_ans').clearValidators(); + control.controls[0].get('non_individual_entity_ans').updateValueAndValidity(); + + } + else if(event.value == 'non-individual'){ + + control.controls[0].get('vintage_ans').setValidators([Validators.required]); + control.controls[0].get('vintage_ans').updateValueAndValidity(); + + control.controls[0].get('age_ans').clearValidators(); + control.controls[0].get('age_ans').updateValueAndValidity(); + + control.controls[0].get('earning_ans').clearValidators(); + control.controls[0].get('earning_ans').updateValueAndValidity(); + + control.controls[0].get('qualification_ans').clearValidators(); + control.controls[0].get('qualification_ans').updateValueAndValidity(); + + control.controls[0].get('non_individual_entity_ans').setValidators([Validators.required]); + control.controls[0].get('non_individual_entity_ans').updateValueAndValidity(); + + } + +} + + + } diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-info/rental-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-info/rental-info.component.html index 9ac753a5a..6362fe0a1 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-info/rental-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-info/rental-info.component.html @@ -327,4 +327,5 @@ + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.ts index b16785bbf..ae390c0b5 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.ts @@ -324,12 +324,12 @@ pdFullDetails:any=[]; this.pdFullDetails = data.records - // manually push genral forms for test should remove code move - this.categoryFormButtons.unshift({ - "form_id":18, - "form_name": 'General Information', - "isAnswered":false - }) + // manually push genral forms for test should remove code move + // this.categoryFormButtons.unshift({ + // "form_id":18, + // "form_name": 'General Information', + // "isAnswered":false + // }) } else{