diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.html index c49296b7b..cd013ead9 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.html @@ -17,7 +17,7 @@
-
+
@@ -404,7 +404,33 @@ Bonus Type Others Required - +
+ + + Select + Yes + No + + Is there any relationship between applicant and employer ? Required + + + + + Total working Experience is Lower + + + + + Total working Experience is Lower + +
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.ts index 454b4ca9a..4ac9d934a 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.ts @@ -194,7 +194,12 @@ export class EmploymentInfoComponent implements OnInit { this.employmentForm.controls['bonus_frequency'].setValue(value.records.bonus_frequency); this.employmentForm.controls['bonus_type'].setValue(value.records.bonus_type); this.employmentForm.controls['bonus_type_other'].setValue(value.records.bonus_type_other); + this.employmentForm.controls['employer_applicant_relation'].setValue(value.records.employer_applicant_relation); + this.employmentForm.controls['employer_applicant_relation_type'].setValue(value.records.employer_applicant_relation_type); + + this.employmentForm.controls['no_of_employee_in_firm'].setValue(value.records.no_of_employee_in_firm); this.employmentForm.controls['id_card_issued_company'].setValue(value.records.id_card_issued_company); + if(value.records.id_card_issued_company == 'no'){ this.employmentForm.controls['why_company_id_proof_not_available'].setValue(value.records.why_company_id_proof_not_available); } @@ -310,6 +315,9 @@ export class EmploymentInfoComponent implements OnInit { bonus_frequency: [''], bonus_type: [''], bonus_type_other: [''], + employer_applicant_relation:[], + employer_applicant_relation_type:[], + no_of_employee_in_firm:[], id_card_issued_company: [''], why_company_id_proof_not_available: [''], // employment_details: this.fb.array([]), @@ -679,7 +687,10 @@ export class EmploymentInfoComponent implements OnInit { records.bonus_frequency = this.employmentForm.controls['bonus_frequency'].value; records.bonus_type = this.employmentForm.controls['bonus_type'].value; records.bonus_type_other = this.employmentForm.controls['bonus_type_other'].value; - + records.employer_applicant_relation = this.employmentForm.controls['employer_applicant_relation'].value; + records.employer_applicant_relation_type = this.employmentForm.controls['employer_applicant_relation_type'].value; + + records.no_of_employee_in_firm = this.employmentForm.controls['no_of_employee_in_firm'].value; records.id_card_issued_company = this.employmentForm.controls['id_card_issued_company'].value; if(this.employmentForm.controls['id_card_issued_company'].value == 'no'){ records.why_company_id_proof_not_available = this.employmentForm.controls['why_company_id_proof_not_available'].value;