From 14a2e00e13384fddd41a021c3290314b4699e3fe Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Tue, 20 Nov 2018 16:29:52 +0530 Subject: [PATCH] Red highlighted Changes In PD Forms : ps --- .../list-pd/add-pd/add-pd.component.html | 57 ++++++++++++------- .../list-pd/add-pd/add-pd.component.ts | 19 ++++++- .../edit-pd-applicant.component.html | 35 ++++++++---- .../edit-pd-applicant.component.ts | 19 ++++++- .../edit-pd-master.component.html | 6 +- .../edit-pd-master.component.ts | 9 +++ .../banking-details.component.html | 2 +- .../employment-info.component.html | 36 ++++++++++-- .../employment-info.component.ts | 20 +++++++ 9 files changed, 155 insertions(+), 48 deletions(-) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html index 58a8e09a6..a2701b740 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html @@ -87,7 +87,7 @@ - + Enter valid amount. @@ -126,9 +126,9 @@ - + - Enter Valid Pincode. + Enter Valid Pincode. @@ -158,19 +158,25 @@
Main Applicant
- - Name is Required. - - - - Enter Valid Mobile Number. - - + +
+ + + Enter Valid Mobile Number. + + + + + Enter Valid Phone Number. + +
+ + @@ -190,24 +196,31 @@
{{coDetails.controls.label.value}} {{i+1}}
- + - - - Enter Valid Mobile Number. - - - - - + +
+ + + Enter Valid Mobile Number. + + + + + Enter Valid Phone Number. + +
+ + + {{rel.name}} - - + +
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts index 4badcdf6d..e858b0690 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts @@ -77,14 +77,15 @@ export class AddPdComponent implements OnInit, OnDestroy { fk_customer_segment: [null], loan_amount: [null,Validators.compose([Validators.pattern('^[0-9]*$')])], applicant_name: [null], - mobile_no: [null,Validators.compose([Validators.minLength(10),Validators.maxLength(12),Validators.pattern('^[0-9]*$')])], + mobile_no: [null,Validators.compose([Validators.minLength(10),Validators.maxLength(10),Validators.required])], + landline : [null,Validators.compose([Validators.minLength(12),Validators.maxLength(13)])], email: [null],   addressline1: [null], addressline2: [null], addressline3: [null], fk_city: [null], fk_state: [null], -  pincode : [null,Validators.compose([Validators.minLength(6),Validators.maxLength(6),Validators.pattern('^[0-9]*$')])], +  pincode : [null,Validators.compose([Validators.minLength(6),Validators.maxLength(6)])], remarks:[null],   // allocation_type: [null],   // sub_allocation_type: [null], @@ -206,7 +207,8 @@ export class AddPdComponent implements OnInit, OnDestroy { return this._fb.group({ label: ['Co Applicant'], coapplicantName: [null, Validators.compose([Validators.required])], - coapplicant_mobile_no: [null, Validators.compose([Validators.minLength(10),Validators.maxLength(12),Validators.pattern('^[0-9]*$')])], + coapplicant_mobile_no: [null,Validators.compose([Validators.minLength(10),Validators.maxLength(10),Validators.required])], + coapplicant_landline : [null,Validators.compose([Validators.minLength(12),Validators.maxLength(13)])], relationship: [null], }); }; @@ -315,6 +317,7 @@ export class AddPdComponent implements OnInit, OnDestroy { "applicant_name":formValue.applicant_name, "email":formValue.email, "mobile_no":formValue.mobile_no, + "landline":formValue.landline, "applicant_type":1, "relation":"", }]; @@ -324,6 +327,7 @@ export class AddPdComponent implements OnInit, OnDestroy { "relation":itemElement.relationship, "email":"", "mobile_no":itemElement.coapplicant_mobile_no, + "landline":itemElement.coapplicant_landline, "applicant_type":0, } pd_applicant_details.push(obj1) @@ -410,4 +414,13 @@ export class AddPdComponent implements OnInit, OnDestroy { onReset() { this.loadFormData(); } + /** On Key Press Event For Mobile Number */ + keyPress(event: any) { + const pattern = /[0-9/ /./-]/; + + let inputChar = String.fromCharCode(event.charCode); + if (event.keyCode != 8 && !pattern.test(inputChar)) { + event.preventDefault(); + } + } } diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.html index 3ae92fc5a..4980cad00 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.html @@ -3,6 +3,7 @@
+
@@ -22,13 +23,18 @@ - - +
+ + Mobile number is required. - Enter Valid Mobile Number. - - - + Enter Valid Mobile Number. + + + + Enter Valid Phone Number. + +
+
@@ -45,11 +51,18 @@ Name is Required. - - - Enter Valid Mobile Number. - - + +
+ + + Enter Valid Mobile Number. + + + + Enter Valid Phone Number. + +
+ diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.ts index ba5b70d88..e1b521fd5 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.ts @@ -42,7 +42,8 @@ export class EditPdApplicantComponent implements OnInit { this._EditApplicantForm = this._fb.group({ fk_applicant_primary_id: [null], applicant_name: [null, Validators.compose([Validators.required])], - mobile_no: [null, Validators.compose([Validators.required,Validators.minLength(10),Validators.maxLength(12),Validators.pattern('^[0-9]*$')])], + mobile_no: [null, Validators.compose([Validators.required,Validators.minLength(10),Validators.maxLength(12)])], + landline: [null, Validators.compose([Validators.required,Validators.minLength(12),Validators.maxLength(13)])], email: [null, Validators.compose([Validators.required, CustomValidators.email])], applicant_type: [1], coApplicantItems: this._fb.array([]), @@ -54,7 +55,8 @@ export class EditPdApplicantComponent implements OnInit { this._EditApplicantForm = this._fb.group({ fk_applicant_primary_id: [this.mainApplicantData[0].pd_co_applicant_id], applicant_name: [this.mainApplicantData[0].applicant_name, Validators.compose([Validators.required])], - mobile_no: [this.mainApplicantData[0].mobile_no, Validators.compose([Validators.required,Validators.minLength(10),Validators.maxLength(12),Validators.pattern('^[0-9]*$')])], + mobile_no: [this.mainApplicantData[0].mobile_no, Validators.compose([Validators.required,Validators.minLength(10),Validators.maxLength(12)])], + landline: [this.mainApplicantData[0].landline, Validators.compose([Validators.required,Validators.minLength(12),Validators.maxLength(13)])], email: [this.mainApplicantData[0].email, Validators.compose([Validators.required, CustomValidators.email])], applicant_type: [this.mainApplicantData[0].applicant_type, Validators.compose([Validators.required])], coApplicantItems: this._fb.array([]), @@ -74,6 +76,7 @@ export class EditPdApplicantComponent implements OnInit { fk_applicant_primary_id: [listData.pd_co_applicant_id], coapplicantName: [listData.applicant_name, Validators.compose([Validators.required])], coapplicant_mobile_no: [listData.mobile_no,Validators.compose([Validators.minLength(10),Validators.maxLength(12),Validators.pattern('^[0-9]*$')])], + coapplicant_landline: [listData.landline,Validators.compose([Validators.minLength(12),Validators.maxLength(13)])], relationship: [listData.relation], applicant_type: [listData.applicant_type, Validators.compose([Validators.required])], }); @@ -84,6 +87,7 @@ export class EditPdApplicantComponent implements OnInit { fk_applicant_primary_id: [null], coapplicantName: [null, Validators.compose([Validators.required])], coapplicant_mobile_no: [null, Validators.compose([Validators.minLength(10),Validators.maxLength(12),Validators.pattern('^[0-9]*$')])], + coapplicant_landline: [null, Validators.compose([Validators.minLength(12),Validators.maxLength(13)])], relationship: [null], applicant_type: [0], }); @@ -108,6 +112,7 @@ export class EditPdApplicantComponent implements OnInit { "applicant_name":formValue.applicant_name, "email":formValue.email, "mobile_no":formValue.mobile_no, + "landline":formValue.landline, "applicant_type":formValue.applicant_type, "relation":formValue.relationship, "isactive":1 @@ -120,6 +125,7 @@ export class EditPdApplicantComponent implements OnInit { "relation":itemElement.relationship, "email":"", "mobile_no":itemElement.coapplicant_mobile_no, + "landline":itemElement.coapplicant_landline, "applicant_type":itemElement.applicant_type, "isactive":1 } @@ -164,4 +170,13 @@ export class EditPdApplicantComponent implements OnInit { closeEditComponent(): void { this.dialogRef.close(); } + /** On Key Press Event For Mobile Number */ + keyPress(event: any) { + const pattern = /[0-9/ /./-]/; + + let inputChar = String.fromCharCode(event.charCode); + if (event.keyCode != 8 && !pattern.test(inputChar)) { + event.preventDefault(); + } + } } diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.html index 294808f73..941ac1f08 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.html @@ -119,10 +119,8 @@ - - Enter Valid Pincode. - - + + Enter Valid Pincode. diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.ts index 2ef8f5a29..79367d614 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.ts @@ -199,6 +199,15 @@ export class EditPdMasterComponent implements OnInit { closeEditMasterComponent(): void { this.dialogRef.close(); } + /** On Key Press Event For Mobile Number */ + keyPress(event: any) { + const pattern = /[0-9/ /./-]/; + + let inputChar = String.fromCharCode(event.charCode); + if (event.keyCode != 8 && !pattern.test(inputChar)) { + event.preventDefault(); + } + } } diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html index 9cc8986b0..084f7105d 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html @@ -117,7 +117,7 @@ - + Yes 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 761f49237..ef9a5c332 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 @@ -9,10 +9,10 @@
- + - +
@@ -60,8 +60,11 @@

Salary Details

+ + + - + @@ -74,9 +77,32 @@ + + + + {{ fd.name }} + + + + + + Fixed + Variable depending on performance + Others + + + + + - + + Yes + No + + 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 16186a06e..2b24e4833 100644 --- 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 @@ -36,10 +36,13 @@ export class EmploymentInfoComponent implements OnInit { public employmentForm: FormGroup; private notifier: NotifierService; public pd_cus_segment:string; + public frequency_data:any[]; + constructor(notifier: NotifierService, private fb: FormBuilder, private route: ActivatedRoute, private router: Router, private _pd: PdTrigerService) { this.notifier = notifier; + //getAllMasterDatas(); } ngOnInit() { @@ -69,10 +72,21 @@ export class EmploymentInfoComponent implements OnInit { 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.employmentForm.controls['bonus_incentive'].setValue(value.records.bonus_incentive); + 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['any_delays'].setValue(value.records.any_delays); this.employmentForm.controls['employment_remarks'].setValue(value.records.employment_remarks); } }) + /** For Bonus Frequency Dropdown */ + this._pd.getAllMasterDatas('FREQUENCY').subscribe( + data => { + if (data.status == 200) { + this.frequency_data = data.records; + this.frequency_data = this.frequency_data.filter(freq=>freq.isactive == 1 ); + } + }); } public initemploymentForm(): void { this.employmentForm = this.fb.group({ @@ -89,6 +103,9 @@ export class EmploymentInfoComponent implements OnInit { gross_monthly_salary: ['', Validators.compose([Validators.required])], net_monthly_salary: ['', Validators.compose([Validators.required])], bonus_incentive: ['', Validators.compose([Validators.required])], + bonus_frequency: [''], + bonus_type: [''], + bonus_type_other: [''], any_delays: ['', Validators.compose([Validators.required])], employment_remarks: ['', Validators.compose([Validators.required])], }); @@ -118,6 +135,9 @@ export class EmploymentInfoComponent implements OnInit { records.gross_monthly_salary = this.employmentForm.controls['gross_monthly_salary'].value; records.net_monthly_salary = this.employmentForm.controls['net_monthly_salary'].value; records.bonus_incentive = this.employmentForm.controls['bonus_incentive'].value; + 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.any_delays = this.employmentForm.controls['any_delays'].value; records.employment_remarks = this.employmentForm.controls['employment_remarks'].value; console.log('data', records);