diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.html
index 6729a36d9..f632b397b 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.html
@@ -25,8 +25,8 @@
-
- {{person.name}}
+
+ {{person.applicant_name}}
@@ -144,102 +144,6 @@
-
-
-
-
-
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.ts
index 0567b13c9..895d77031 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.ts
@@ -36,14 +36,14 @@ export class FamilyDetailsComponent implements OnInit {
private notifier: NotifierService;
public familyForm: FormGroup;
-
- selectPerson = [{
- name : 'person 1',
- id : 111
- }, {
- name : 'person 2',
- id : 222
- }];
+ public selectPerson;
+ // selectPerson = [{
+ // name : 'person 1',
+ // id : 111
+ // }, {
+ // name : 'person 2',
+ // id : 222
+ // }];
earningStatus = [{
type: 'Earning',
@@ -65,6 +65,8 @@ export class FamilyDetailsComponent implements OnInit {
private router: Router,
private _pd: PdTrigerService,
@Inject(MAT_DIALOG_DATA) public pd_all_details: any) {
+ console.log(pd_all_details);
+ this.selectPerson = this.pd_all_details.pdapplicants_detials;
this.pdid = this.pd_all_details.pdmaster_details.pd_id;
this.form_id = 6;
this.notifier = notifier;
@@ -136,8 +138,6 @@ export class FamilyDetailsComponent implements OnInit {
public initFamilyForm(): void {
this.familyForm = this.fb.group({
selected_person: ['', Validators.compose([Validators.required])],
- // personOther: [''],
- // members: ['', Validators.compose([Validators.required])],
residence_place: ['', Validators.compose([])],
residence_city: ['', Validators.compose([])],
residence_state: ['', Validators.compose([])],
@@ -146,12 +146,8 @@ export class FamilyDetailsComponent implements OnInit {
residence_ownership: ['', Validators.compose([])],
ownershipOther: [''],
rent: [''],
-
total_number_of_family_members: ['', Validators.compose([Validators.min(1), Validators.max(20)])],
-
family_members_details: this.fb.array([]),
- // earningMembers: this.fb.array([]),
- // nonEarningMembers: this.fb.array([]),
family_details_form_remark: ['']
});
}