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 4975b3966..9871211b6 100644
--- 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,16 +30,16 @@
-
- {{education}}
+
+ {{education.qualification_name}}
-
- {{earning}}
+
+ {{earning.earning_member_status}}
@@ -83,8 +83,8 @@
-
- {{education}}
+
+ {{education.qualification_name}}
@@ -92,8 +92,8 @@
-
- {{earning}}
+
+ {{earning.earning_member_status}}
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 08bb05415..b4f00e5c2 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
@@ -11,9 +11,12 @@ import { Key } from 'protractor';
})
export class PersonalInfoComponent implements OnInit {
- qualifications:any=["Graduate","Under Graduate","Post Graduate","Professional"];
- earningStatus:any=["Earning Member","House Wife","Student","Retired","Pensioner","Other Non earning member"];
+ //qualifications:any=["Graduate","Under Graduate","Post Graduate","Professional"];
+ //earningStatus:any=["Earning Member","House Wife","Student","Retired","Pensioner","Other Non earning member"];
+ earningStatus:any=[];
+ qualifications:any=[];
relationShipList:any=[];
+
@Input() pdid : string;
@Input() pd_all_details:any;
form_id:number;
@@ -39,7 +42,9 @@ export class PersonalInfoComponent implements OnInit {
ngOnInit() {
this.loadPDDetails(this.pdid,this.form_id);
- this.getRelationMaster();
+ this.getMasterDetails('RELATIONSHIPS',1);
+ this.getMasterDetails('EARNINGMEMBERSSTATUS',2);
+ this.getMasterDetails('EDUQUALIFICATION',3);
this.mainApplicantDetails = this.pd_all_details.pdapplicants_detials.filter(item => item.applicant_type == 1);
// console.log(this.mainApplicantDetails)
this.coApplicantDetails = this.pd_all_details.pdapplicants_detials.filter(item => item.applicant_type == 0);
@@ -194,16 +199,26 @@ this.loadDataStatus = true;
get pdCoapplicant() {return this._personalForm.get('coItem') as FormArray;}
// get relation master details
- getRelationMaster(){
- let relation ="RELATIONSHIPS";
- this._pd.getAllMasterDatas(relation).subscribe(
+ getMasterDetails(table:string,type:number){
+ //let relation ="RELATIONSHIPS";
+ this._pd.getAllMasterDatas(table).subscribe(
data => {
if (data.status == 200) {
- this.relationShipList=data.records;
+ if(type==1){
+ this.relationShipList=data.records;
+ }
+ else if(type==2){
+ this.earningStatus=data.records;
+ }
+ else if(type==3){
+ this.qualifications=data.records;
+ }
+
}
}, error => this.errorMessage = error);
}
+// get earning master details
// submit forms details
submitPersonalForm(formData:any) {