diff --git a/ng6-seed/Sparqsineedge(WEB 06-05-2021)Test.zip b/ng6-seed/Sparqsineedge(WEB 06-05-2021)Test.zip deleted file mode 100644 index cf473252e..000000000 Binary files a/ng6-seed/Sparqsineedge(WEB 06-05-2021)Test.zip and /dev/null differ diff --git a/ng6-seed/Sparqsineedge(WEB 11-05-2021)Test.zip b/ng6-seed/Sparqsineedge(WEB 19-05-2021)Test.zip similarity index 94% rename from ng6-seed/Sparqsineedge(WEB 11-05-2021)Test.zip rename to ng6-seed/Sparqsineedge(WEB 19-05-2021)Test.zip index b495cf094..4f37ee579 100644 Binary files a/ng6-seed/Sparqsineedge(WEB 11-05-2021)Test.zip and b/ng6-seed/Sparqsineedge(WEB 19-05-2021)Test.zip differ 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 90ca5ebcc..c49296b7b 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 @@ -106,7 +106,7 @@ Required -
+
Photograph of “Photo ID card of the Employer/Manager" @@ -146,7 +146,7 @@ -
+
@@ -177,7 +177,7 @@ Salary register seen Required
-
+
@@ -297,7 +297,7 @@ --> -
+
@@ -348,7 +348,7 @@ Given Value is More than Net Salary Given Value is Less than Net Salary - + Select 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 c00e0100a..454b4ca9a 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 @@ -11,7 +11,7 @@ import { Validators, FormArray, FormControl, } from '@angular/forms'; - + import { NotifierService } from 'angular-notifier'; import { @@ -200,11 +200,11 @@ export class EmploymentInfoComponent implements OnInit { } this.employmentForm.controls['employment_remarks'].setValue(value.records.employment_remarks); - if (this.fk_pd_type == '2' || this.fk_pd_type == '3') { + if (this.fk_pd_type == '2' || this.fk_pd_type == '3'|| this.fk_pd_type == '1' ) { let additional_value :any = {cash_voucher:value.records.cash_voucher,sal_certificate:value.records.sal_certificate,sal_slip:value.records.sal_slip, doc_not_available:value.records.doc_not_available,doc_not_available_specify:value.records.doc_not_available_specify,other_doc:value.records.other_doc, other_doc_name:value.records.other_doc_name,photo_id_card:value.records.photo_id_card,photo_id_others:value.records.photo_id_others,visiting_card:value.records.visiting_card} - if(this.fk_pd_type == '2') { + if(this.fk_pd_type == '2'||this.fk_pd_type == '1') { additional_value.sal_paid_regularly =value.records.sal_paid_regularly additional_value.reason_not_sal_pay = value.records.reason_not_sal_pay additional_value.paid_amount = value.records.paid_amount @@ -315,7 +315,7 @@ export class EmploymentInfoComponent implements OnInit { // employment_details: this.fb.array([]), employment_remarks: [''], }); - if(this.fk_pd_type == '2' || this.fk_pd_type == '3') { + if(this.fk_pd_type == '2' || this.fk_pd_type == '3' || this.fk_pd_type == '1') { this.employmentForm = this.fb.group({ ...this.employmentForm.controls, @@ -333,7 +333,7 @@ export class EmploymentInfoComponent implements OnInit { other_doc_name:[''] }) } - if(this.fk_pd_type == '2') { + if(this.fk_pd_type == '2'||this.fk_pd_type == '1') { this.employmentForm = this.fb.group({ ...this.employmentForm.controls, sal_paid_regularly:[''], @@ -633,7 +633,7 @@ export class EmploymentInfoComponent implements OnInit { records.attendance_seen = this.employmentForm.controls['attendance_seen'].value; records.sal_reg_seen = this.employmentForm.controls['sal_reg_seen'].value; - if (this.fk_pd_type == '2' || this.fk_pd_type == '3') { + if (this.fk_pd_type == '2' || this.fk_pd_type == '3' || this.fk_pd_type == '1') { records.cash_voucher = this.employmentForm.controls['cash_voucher'].value; records.sal_certificate = this.employmentForm.controls['sal_certificate'].value; records.sal_slip = this.employmentForm.controls['sal_slip'].value; @@ -646,7 +646,7 @@ export class EmploymentInfoComponent implements OnInit { records.photo_id_others = this.employmentForm.controls['photo_id_others'].value; records.visiting_card = this.employmentForm.controls['visiting_card'].value; - if (this.fk_pd_type == '2') { + if (this.fk_pd_type == '2' ||this.fk_pd_type == '1') { records.sal_paid_regularly = this.employmentForm.controls['sal_paid_regularly'].value; records.reason_not_sal_pay = this.employmentForm.controls['reason_not_sal_pay'].value; records.paid_amount = this.employmentForm.controls['paid_amount'].value;