From 2e837324b9b78f39fd9e37776b6de0ca356823ce Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Thu, 15 Nov 2018 19:03:23 +0530 Subject: [PATCH] employement form changes --- .../employment-info.component.html | 12 ++++++------ .../employment-info/employment-info.component.ts | 15 +++++++++------ .../list-pd/start-pd/start-pd.component.html | 2 +- 3 files changed, 16 insertions(+), 13 deletions(-) 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 182110f24..6ace32f28 100644 --- 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 @@ -16,7 +16,7 @@ - + Yes @@ -31,7 +31,7 @@ - + Yes @@ -41,14 +41,14 @@ - + Yes No - + Yes @@ -67,8 +67,8 @@ - + { - console.log('value', value); if (value.status == 200) { this.employmentForm.controls['employer_name'].setValue(value.records.employer_name); this.employmentForm.controls['how_long_year'].setValue(value.records.how_long_year); @@ -76,13 +79,13 @@ export class EmploymentInfoComponent implements OnInit { employer_name: ['', Validators.compose([Validators.required])], how_long_year: ['', Validators.compose([Validators.required])], how_long_month: ['', Validators.compose([Validators.required])], - was_met: ['', Validators.compose([Validators.required])], + was_met: [this.pd_cus_segment=='SAL-CHQ' ? 'No' : '', Validators.compose([Validators.required])], name_person_met: [''], designation_person_met: [''], - confirm_salary: ['', Validators.compose([Validators.required])], + confirm_salary: [this.pd_cus_segment=='SAL-CHQ' ? 'No' : '', Validators.compose([Validators.required])], confirm_salary_amount: [''], - attendance_seen: ['', Validators.compose([Validators.required])], - sal_reg_seen: ['', Validators.compose([Validators.required])], + attendance_seen: [this.pd_cus_segment=='SAL-CHQ' ? 'No' : '', Validators.compose([Validators.required])], + sal_reg_seen: [this.pd_cus_segment=='SAL-CHQ' ? 'No' : '', Validators.compose([Validators.required])], gross_monthly_salary: ['', Validators.compose([Validators.required])], net_monthly_salary: ['', Validators.compose([Validators.required])], bonus_incentive: ['', Validators.compose([Validators.required])], diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.html index ab40fa472..830380285 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.html @@ -422,7 +422,7 @@ - +