From d71e5f916806123c6aa7c8787d62a525e9168bc1 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Wed, 8 Jan 2020 15:39:47 +0530 Subject: [PATCH] Fairoj: Emp form net sal max validation is done --- .../forms/employment-info/employment-info.component.html | 3 ++- .../forms/employment-info/employment-info.component.ts | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) 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 d038e7b67..591305967 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 @@ -214,7 +214,7 @@ --> + OnlyNumber type="text" autocomplete="off" required (change)="setValidationForNetSal($event.target.value)"> {{"₹"}} {{employmentForm.controls['gross_monthly_salary'].value | numberToWords}} Only Gross Monthly Salary Required @@ -224,6 +224,7 @@ OnlyNumber type="text" autocomplete="off" required> {{"₹"}} {{employmentForm.controls['net_monthly_salary'].value | numberToWords}} Only Net Monthly Salary Required + Given value is More than Gross Monthly Salary 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 8b9b6cfbf..bd4588a98 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 @@ -164,6 +164,7 @@ export class EmploymentInfoComponent implements OnInit { this.employmentForm.controls['to_date_the_salary_is_rcv'].setValue(value.records.to_date_the_salary_is_rcv); this.employmentForm.controls['gross_monthly_salary'].setValue(value.records.gross_monthly_salary); this.employmentForm.controls['net_monthly_salary'].setValue(value.records.net_monthly_salary); + this.setValidationForNetSal(value.records.gross_monthly_salary) this.employmentForm.controls['mode_of_getting_salary'].setValue(value.records.mode_of_getting_salary); if(value.records.mode_of_getting_salary == 'both_bank_transfer_cash'){ this.employmentForm.controls['amount_paid_in_cash'].setValue(value.records.amount_paid_in_cash); @@ -693,4 +694,9 @@ export class EmploymentInfoComponent implements OnInit { } }); }*/ + setValidationForNetSal(value){ + console.log(value) + this.employmentForm.controls['net_monthly_salary'].setValidators([Validators.max(value),Validators.min(0)]); + this.employmentForm.controls['net_monthly_salary'].updateValueAndValidity(); + } }