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 e4e50d7f4..7f83ff4c8 100644 --- 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 @@ -56,31 +56,8 @@ export class PersonalInfoComponent implements OnInit { } else if(data.status == 204){ - let defaultMainApp=[]; - let defaultCoApp=[]; - // generate default main applicant form details - if(this.mainApplicantDetails.length>0){ - for(let j=0;j new FormGroup({ name_ans:new FormControl(item.name_ans, Validators.required), age_ans:new FormControl(item.age_ans, Validators.required), @@ -106,9 +80,13 @@ var co_result = Object.keys(data.co_applicant_details).map(function(key) { earning_ans:new FormControl(item.earning_ans, Validators.required), }))); // co applicant - let iterateCoApp=[]; - - let coApplicantGroup = new FormArray(co_result.map((item,key) => new FormGroup({ + let coApplicantGroup; + if(data.co_applicant_details!=undefined){ + var co_result = Object.keys(data.co_applicant_details).map(function(key) { + return data.co_applicant_details[key]; + }); + + coApplicantGroup = new FormArray(co_result.map((item,key) => new FormGroup({ name_ans:new FormControl(item.name_ans, Validators.required), age_ans:new FormControl(item.age_ans, Validators.required), entity_ans:new FormControl(item.entity_ans, Validators.required), @@ -117,6 +95,32 @@ var co_result = Object.keys(data.co_applicant_details).map(function(key) { relation_ans:new FormControl(item.relation_ans, Validators.required), }))); + } + else{ + coApplicantGroup = new FormArray(this.coApplicantDetails.map((item,key) => new FormGroup({ + name_ques:new FormControl(this.coApplicantQuestions[0]), + name_ans:new FormControl(item.applicant_name, Validators.required), + name_id:new FormControl(0), + age_ques:new FormControl(this.coApplicantQuestions[1]), + age_id:new FormControl(1), + age_ans:new FormControl(null, Validators.required), + entity_ques: new FormControl(this.coApplicantQuestions[2]), + entity_id: new FormControl(2), + entity_ans:new FormControl(this.pd_all_details.pdmaster_details.customer_segment_abbr==='SP' ? 'Individual' : this.pd_all_details.pdmaster_details.customer_segment_abbr==='SNP' ? 'Individual' : '', Validators.required), + qualification_ques: new FormControl(this.coApplicantQuestions[3]), + qualification_id: new FormControl(3), + qualification_ans:new FormControl(null, Validators.required), + earningStatus_ques:new FormControl(this.coApplicantQuestions[4]), + earning_id: new FormControl(4), + earning_ans:new FormControl(null, Validators.required), + relationShip_ques:new FormControl(this.coApplicantQuestions[5]), + relation_id:new FormControl(5), + relation_ans:new FormControl(null, Validators.required), + + }))); + } + + this._personalForm = this._fb.group({ pdid:null, @@ -129,7 +133,8 @@ var co_result = Object.keys(data.co_applicant_details).map(function(key) { this.loadDataStatus = true; } - loadFormData(mainApp,coApp){ + loadFormData(){ + // main applicant let mainApplicantGroup = new FormArray(this.mainApplicantDetails.map((item,key) => new FormGroup({ name_ques:new FormControl(this.mainApplicantQuestions[0]), @@ -140,7 +145,7 @@ var co_result = Object.keys(data.co_applicant_details).map(function(key) { age_ans:new FormControl(null, Validators.required), entity_ques: new FormControl(this.mainApplicantQuestions[2]), entity_id: new FormControl(2), - entity_ans:new FormControl(null, Validators.required), + entity_ans:new FormControl(this.pd_all_details.pdmaster_details.customer_segment_abbr==='SP' ? 'Individual' : this.pd_all_details.pdmaster_details.customer_segment_abbr==='SNP' ? 'Individual' : '', Validators.required), qualification_ques: new FormControl(this.mainApplicantQuestions[3]), qualification_id: new FormControl(3), qualification_ans:new FormControl(null, Validators.required), @@ -149,9 +154,7 @@ var co_result = Object.keys(data.co_applicant_details).map(function(key) { earning_ans:new FormControl(null, Validators.required), }))); - // co applicant - let iterateCoApp=[]; - + // co applicant let coApplicantGroup = new FormArray(this.coApplicantDetails.map((item,key) => new FormGroup({ name_ques:new FormControl(this.coApplicantQuestions[0]), name_ans:new FormControl(item.applicant_name, Validators.required), @@ -161,7 +164,7 @@ var co_result = Object.keys(data.co_applicant_details).map(function(key) { age_ans:new FormControl(null, Validators.required), entity_ques: new FormControl(this.coApplicantQuestions[2]), entity_id: new FormControl(2), - entity_ans:new FormControl(null, Validators.required), + entity_ans:new FormControl(this.pd_all_details.pdmaster_details.customer_segment_abbr==='SP' ? 'Individual' : this.pd_all_details.pdmaster_details.customer_segment_abbr==='SNP' ? 'Individual' : '', Validators.required), qualification_ques: new FormControl(this.coApplicantQuestions[3]), qualification_id: new FormControl(3), qualification_ans:new FormControl(null, Validators.required),