From 360557bc0e37c1230d900341034bc8e9936511ec Mon Sep 17 00:00:00 2001 From: saravanakumarkandasami Date: Tue, 13 Nov 2018 11:02:07 +0530 Subject: [PATCH 1/3] UI --- .../src/app/layouts/admin/admin-layout.component.html | 4 ++-- .../edit-pd-applicant/edit-pd-applicant.component.html | 9 +++++---- .../forms/personal-info/personal-info.component.html | 2 +- ng6-seed/src/assets/styles/scss/_material.variables.scss | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/ng6-seed/src/app/layouts/admin/admin-layout.component.html b/ng6-seed/src/app/layouts/admin/admin-layout.component.html index 4f8d69a11..494a2d76b 100644 --- a/ng6-seed/src/app/layouts/admin/admin-layout.component.html +++ b/ng6-seed/src/app/layouts/admin/admin-layout.component.html @@ -24,9 +24,9 @@ person - + 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 96f693c0f..614c60c17 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 @@ -48,7 +48,7 @@ - + {{rel.name}} @@ -61,9 +61,10 @@
- - - + + + +
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.html index 87b675661..163347dd9 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.html @@ -94,7 +94,7 @@
- + {{rel.name}} diff --git a/ng6-seed/src/assets/styles/scss/_material.variables.scss b/ng6-seed/src/assets/styles/scss/_material.variables.scss index 160dee2cb..5b7fd340e 100644 --- a/ng6-seed/src/assets/styles/scss/_material.variables.scss +++ b/ng6-seed/src/assets/styles/scss/_material.variables.scss @@ -15,7 +15,7 @@ $foreground: map-get($theme, foreground); /**-- $dark-primary: mat-palette($mat-blue-grey); --**/ $dark-primary: mat-palette($mat-light-blue); -$dark-accent: mat-palette($mat-amber, A200, A100, A400); +$dark-accent: mat-palette($mat-blue,900); $dark-warn: mat-palette($mat-deep-orange); $dark-theme: mat-dark-theme($dark-primary, $dark-accent, $dark-warn); $dark-background: map-get($dark-theme, background); From 9639a0b6869ada97977fe05629d068de8e29b521 Mon Sep 17 00:00:00 2001 From: saravanakumarkandasami Date: Tue, 13 Nov 2018 11:18:04 +0530 Subject: [PATCH 2/3] Forms UI --- .../list-pd/start-pd/forms/address/address.component.html | 2 +- .../start-pd/forms/family-details/family-details.component.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html index b65591b62..70e06809f 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html @@ -1,6 +1,6 @@ -

Address Details

+

PD Address Details

diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.html index cae8374b5..90262f5f6 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.html @@ -108,7 +108,7 @@ - From 917e1d800bbf06edde4efd54fc287c1478b0a70a Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Tue, 13 Nov 2018 16:17:12 +0530 Subject: [PATCH 3/3] pd validations changes --- .../manage-pd/list-pd/add-pd/add-pd.component.html | 11 ++++++++++- .../manage-pd/list-pd/add-pd/add-pd.component.ts | 10 +++++----- .../edit-pd-applicant.component.html | 8 ++++++-- .../edit-pd-applicant/edit-pd-applicant.component.ts | 8 ++++---- .../edit-pd-master/edit-pd-master.component.html | 9 ++++++++- .../edit-pd-master/edit-pd-master.component.ts | 6 +++--- 6 files changed, 36 insertions(+), 16 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 1ce374670..3a9bc1d51 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 @@ -45,6 +45,8 @@ Contact Number Required + Enter Valid Mobile Number. + @@ -87,6 +89,8 @@ + Enter valid amount. + @@ -124,6 +128,8 @@ + Enter Valid Pincode. + @@ -156,12 +162,13 @@ - + Name is Required. + Enter Valid Mobile Number. @@ -188,6 +195,8 @@ + Enter Valid Mobile Number. + 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 98fed116a..5c90edc5b 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 @@ -69,22 +69,22 @@ export class AddPdComponent implements OnInit, OnDestroy { fk_lender_id: [null], lender_applicant_id: [null, Validators.compose([Validators.required])], lender_contact_person: [null, Validators.compose([Validators.required])], - lender_contact_mobile: [null, Validators.compose([Validators.required])], + lender_contact_mobile: [null, Validators.compose([Validators.required,Validators.minLength(10),Validators.maxLength(12),Validators.required,Validators.pattern('^[0-9]*$')])], lender_billing: [null], fk_product_id: [null], fk_subproduct_id: [null], fk_pd_type: [null], fk_customer_segment: [null], - loan_amount: [null], + loan_amount: [null,Validators.compose([Validators.pattern('^[0-9]*$')])], applicant_name: [null], - mobile_no: [null], + mobile_no: [null,Validators.compose([Validators.minLength(10),Validators.maxLength(12),Validators.pattern('^[0-9]*$')])], email: [null],   addressline1: [null], addressline2: [null], addressline3: [null], fk_city: [null], fk_state: [null], -  pincode : [null], +  pincode : [null,Validators.compose([Validators.minLength(6),Validators.maxLength(6),Validators.pattern('^[0-9]*$')])], remarks:[null],   // allocation_type: [null],   // sub_allocation_type: [null], @@ -206,7 +206,7 @@ export class AddPdComponent implements OnInit, OnDestroy { return this._fb.group({ label: ['Co Applicant'], coapplicantName: [null, Validators.compose([Validators.required])], - coapplicant_mobile_no: [], + coapplicant_mobile_no: [null, Validators.compose([Validators.minLength(10),Validators.maxLength(12),Validators.pattern('^[0-9]*$')])], relationship: [null], }); }; 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 614c60c17..6b83b14eb 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 @@ -18,13 +18,15 @@ - Email number is required. + Email is required. Mobile number is required. + Enter Valid Mobile Number. + @@ -40,11 +42,13 @@
- + Name is Required. + Enter Valid Mobile 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 ffe2fb5c9..ba5b70d88 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,7 @@ 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])], + mobile_no: [null, Validators.compose([Validators.required,Validators.minLength(10),Validators.maxLength(12),Validators.pattern('^[0-9]*$')])], email: [null, Validators.compose([Validators.required, CustomValidators.email])], applicant_type: [1], coApplicantItems: this._fb.array([]), @@ -54,7 +54,7 @@ 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])], + mobile_no: [this.mainApplicantData[0].mobile_no, Validators.compose([Validators.required,Validators.minLength(10),Validators.maxLength(12),Validators.pattern('^[0-9]*$')])], 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([]), @@ -73,7 +73,7 @@ export class EditPdApplicantComponent implements OnInit { label: ['Co Applicant'], fk_applicant_primary_id: [listData.pd_co_applicant_id], coapplicantName: [listData.applicant_name, Validators.compose([Validators.required])], - coapplicant_mobile_no: [listData.mobile_no], + coapplicant_mobile_no: [listData.mobile_no,Validators.compose([Validators.minLength(10),Validators.maxLength(12),Validators.pattern('^[0-9]*$')])], relationship: [listData.relation], applicant_type: [listData.applicant_type, Validators.compose([Validators.required])], }); @@ -83,7 +83,7 @@ export class EditPdApplicantComponent implements OnInit { label: ['Co Applicant'], fk_applicant_primary_id: [null], coapplicantName: [null, Validators.compose([Validators.required])], - coapplicant_mobile_no: [], + coapplicant_mobile_no: [null, Validators.compose([Validators.minLength(10),Validators.maxLength(12),Validators.pattern('^[0-9]*$')])], relationship: [null], applicant_type: [0], }); 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 e96ea82ac..71a3288d8 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 @@ -37,6 +37,9 @@ Contact Number Required + Enter Valid Mobile Number. + + @@ -79,6 +82,8 @@ + Enter valid amount. + @@ -115,7 +120,9 @@ - + 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 cbce48097..2ef8f5a29 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 @@ -120,19 +120,19 @@ export class EditPdMasterComponent implements OnInit { fk_lender_id: [this.data.records.fk_lender_id, Validators.compose([Validators.required])], lender_applicant_id: [this.data.records.lender_applicant_id, Validators.compose([Validators.required])], pd_contact_person: [this.data.records.pd_contact_person, Validators.compose([Validators.required])], - pd_contact_mobileno: [this.data.records.pd_contact_mobileno, Validators.compose([Validators.required])], + pd_contact_mobileno: [this.data.records.pd_contact_mobileno, Validators.compose([Validators.required,Validators.minLength(10),Validators.maxLength(12),Validators.pattern('^[0-9]*$')])], fk_entity_billing_id: [this.data.records.fk_entity_billing_id], fk_product_id: [this.data.records.fk_product_id], fk_subproduct_id: [this.data.records.fk_subproduct_id], fk_pd_type: [this.data.records.fk_pd_type], fk_customer_segment: [this.data.records.fk_customer_segment], - loan_amount: [this.data.records.loan_amount], + loan_amount: [this.data.records.loan_amount,Validators.compose([Validators.pattern('^[0-9]*$')])],   addressline1: [this.data.records.addressline1], addressline2: [this.data.records.addressline2], addressline3: [this.data.records.addressline3], fk_city: [this.data.records.fk_city], fk_state: [this.data.records.fk_state], -   pincode : [this.data.records.pincode], +   pincode : [this.data.records.pincode,Validators.compose([Validators.minLength(6),Validators.maxLength(6),Validators.pattern('^[0-9]*$')])], remarks: [this.data.records.remarks], }); if(this.data.records.fk_lender_id && this.data.records.fk_product_id && this.data.records.fk_subproduct_id && this.data.records.fk_pd_type && this.data.records.fk_customer_segment && this.data.records.loan_amount && this.data.records.addressline1 && this.data.records.fk_city && this.data.records.fk_state && this.data.records.pincode){