From 559fd9d815a937c34d2d1ebc4c5c82c7048f75a9 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Fri, 11 Jan 2019 19:00:32 +0530 Subject: [PATCH 1/4] UI changes --- .../assets-info/assets-info.component.html | 100 +++++++++--------- .../assets-info/assets-info.component.scss | 3 + 2 files changed, 53 insertions(+), 50 deletions(-) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html index d7ead5fd9..95f16879e 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html @@ -41,13 +41,13 @@
- + {{ prop.name | titlecase }} - +
@@ -60,7 +60,7 @@
- +
@@ -73,7 +73,7 @@
- +
@@ -100,29 +100,29 @@
- + - {{"₹"}} {{PremiumPaidInwords[s]}} Only + {{"₹"}} {{PremiumPaidInwords[s]}} Only - + {{ freqn.name | titlecase }} - +
- + - {{"₹"}} {{SumAssuredInwords[s]}} Only + {{"₹"}} {{SumAssuredInwords[s]}} Only - +
@@ -136,19 +136,19 @@
- + {{ ins_type.name | titlecase }} - + - + - {{"₹"}} {{AmtInvestInwords[s]}} Only + {{"₹"}} {{AmtInvestInwords[s]}} Only - +
@@ -168,20 +168,20 @@
- + - {{"₹"}} {{AssetValueInwords[s]}} Only + {{"₹"}} {{AssetValueInwords[s]}} Only - + {{data.viewValue | titlecase}} - + - {{"₹"}} {{B_emiAmtInwords[s]}} Only + {{"₹"}} {{B_emiAmtInwords[s]}} Only
@@ -195,9 +195,9 @@
- + - {{"₹"}} {{appxMarketAmtInwords[i]}} Only + {{"₹"}} {{appxMarketAmtInwords[i]}} Only @@ -219,14 +219,14 @@ - + Vintage - + Purchase Year @@ -303,12 +303,12 @@
- + {{ prop.name | titlecase }} - +
@@ -320,7 +320,7 @@
- +
@@ -332,7 +332,7 @@
- +
@@ -371,27 +371,27 @@
- + - {{"₹"}} {{OtherPremiumPaidInwords[s]}} Only + {{"₹"}} {{OtherPremiumPaidInwords[s]}} Only - + {{ freqn.name | titlecase }} - +
- + - {{"₹"}} {{OtherSumAssuredInwords[s]}} Only + {{"₹"}} {{OtherSumAssuredInwords[s]}} Only - + @@ -407,24 +407,24 @@
- + {{ ins_type.name | titlecase }} - + - + - {{"₹"}} {{OtherAmtInvestInwords[i]}} Only + {{"₹"}} {{OtherAmtInvestInwords[i]}} Only
- +
@@ -465,7 +465,7 @@ formControlName="other_owner" autocomplete="off"> -
- + - {{"₹"}} {{OtherAppxMarketAmtInwords[i]}} Only + {{"₹"}} {{OtherAppxMarketAmtInwords[i]}} Only @@ -518,7 +518,7 @@ formControlName="other_owner" autocomplete="off"> - - + Purchase Year diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.scss index fcc592d78..0f22c49b9 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.scss @@ -2,6 +2,9 @@ color: #fff !important; background-color: #e00201 !important; } + .mat-form-field-appearance-legacy .mat-hint{ + color:rgba(0, 0, 0, 0.8) !important; +} .mat-card-content { background-color: white; } From 35be3213e48c366b69f2273266906fa6d14e7aa5 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Fri, 11 Jan 2019 19:34:00 +0530 Subject: [PATCH 2/4] add pd changes --- .../list-pd/add-pd/add-pd.component.html | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 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 31e65ab1b..0fed20539 100755 --- 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 @@ -48,8 +48,9 @@ - - + + Enter Valid Mobile Number. + - - +91 - Enter Valid STD Code Number. - - - - - Enter Valid LandLine Number. - + + Enter Valid STD Code Number. + - + + + Enter Valid LandLine Number. + @@ -206,13 +206,13 @@ - + +91 - Enter Valid STD Code Number. + Enter Valid STD Code Number.   -   - - Enter Valid LandLine Number. + + Enter Valid LandLine Number. From 2f9042c9c936b6c3fe2bdafae0cfec18f232ce70 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Sat, 12 Jan 2019 00:51:26 +0530 Subject: [PATCH 3/4] trigger : ps --- .../list-pd/add-pd/add-pd.component.html | 13 +++++----- .../list-pd/add-pd/add-pd.component.ts | 24 +++++++++++-------- .../edit-pd-applicant.component.ts | 10 ++++++-- .../edit-pd-master.component.ts | 11 ++++++--- .../list-pd/view-pd/view-pd.component.html | 13 +++++----- .../list-pd/view-pd/view-pd.component.ts | 7 +++++- 6 files changed, 49 insertions(+), 29 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 0fed20539..bafec348b 100755 --- 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 @@ -39,7 +39,7 @@ - + @@ -48,15 +48,14 @@ - + Enter Valid Mobile Number. + + Enter Valid Mobile Number. + --> @@ -207,7 +206,7 @@ - +91 + Enter Valid STD Code 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 31892dc46..0b2e76ff2 100755 --- 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 @@ -71,7 +71,9 @@ export class AddPdComponent implements OnInit, OnDestroy { pd_branch_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,Validators.minLength(10),Validators.maxLength(12),Validators.required,Validators.pattern('^[0-9]*$')])], + lender_contact_mobile: [null, Validators.compose([Validators.minLength(10),Validators.maxLength(12),Validators.pattern('^[0-9]*$')])], + lender_stdcode:[null, Validators.compose([Validators.minLength(3),Validators.maxLength(5),Validators.pattern('^[0-9]*$')])], + lender_landline:[null, Validators.compose([Validators.minLength(6),Validators.maxLength(8),Validators.pattern('^[0-9]*$')])], //lender_billing: [null], fk_product_id: [null], fk_subproduct_id: [null], @@ -83,8 +85,6 @@ export class AddPdComponent implements OnInit, OnDestroy { mobile_no: [null,Validators.compose([Validators.minLength(10),Validators.maxLength(10)])], // landline : [null,Validators.compose([Validators.minLength(12),Validators.maxLength(13)])], // email: [null], - lender_stdcode:[null, Validators.compose([Validators.minLength(3),Validators.maxLength(5),Validators.pattern('^[0-9]*$')])], - lender_landline:[null, Validators.compose([Validators.minLength(6),Validators.maxLength(8),Validators.pattern('^[0-9]*$')])], applicant_stdcode:[null, Validators.compose([Validators.minLength(3),Validators.maxLength(5),Validators.pattern('^[0-9]*$')])], applicant_landline:[null, Validators.compose([Validators.minLength(6),Validators.maxLength(8),Validators.pattern('^[0-9]*$')])], company_name: [null], @@ -220,8 +220,8 @@ export class AddPdComponent implements OnInit, OnDestroy { } generateDocuments(): FormGroup { return this._fb.group({ - doc_name: [null, Validators.compose([Validators.required])], - documentFile : [null, Validators.compose([Validators.required])], + doc_name: [null],//Validators.compose([Validators.required]) + documentFile : [null],//, Validators.compose([Validators.required]) }); } @@ -385,14 +385,18 @@ export class AddPdComponent implements OnInit, OnDestroy { // common function for both draft and process pd submitPdDetails(formValue: any, status:string) { - //alert('Inside Function Submit Function'); + if(this._PDtriggerForm.invalid) { - this.validateAllFormFields(this._PDtriggerForm); - //alert('validationError'); - //console.log(this._PDtriggerForm); + this.validateAllFormFields(this._PDtriggerForm); + this.notifier.notify('warning', 'Please Fill All Mandatory Fields.!'); return; } else { + if((formValue.lender_contact_mobile == '') || (formValue.lender_stdcode == '' && formValue.lender_landline == '')){ + this.notifier.notify('warning', 'Either Mobile or Landline Need.!'); + return; + } + else{ this.disableAfterSubmit=true; let pd_details:any={ "fk_lender_id":formValue.fk_lender_id, @@ -479,7 +483,7 @@ export class AddPdComponent implements OnInit, OnDestroy { this.notifier.notify('warning', 'Something Wents Wrong Try Again.!'); }); } - + } } loadPdListCompoent(from:boolean) { if(from){ 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 c751b7d7e..bc278b693 100755 --- 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 @@ -134,10 +134,16 @@ export class EditPdApplicantComponent implements OnInit { get pdCoApplicant() { return this._EditApplicantForm.get('coApplicantItems') as FormArray; } updatePdApplicant(formValue: any) { if(this._EditApplicantForm.invalid) { - this.validateAllFormFields(this._EditApplicantForm) + this.validateAllFormFields(this._EditApplicantForm); + this.notifier.notify('warning', 'Please Fill All Mandatory Fields.!'); return; } else { + if((formValue.mobile_no == '') || (formValue.stdcode == '' && formValue.landline == '')){ + this.notifier.notify('warning', 'Either Mobile or Landline Need.!'); + return; + } + else{ let pd_applicant_details : any=[{ "fk_pd_id": this.data.pdID, "pd_co_applicant_id": formValue.fk_applicant_primary_id, @@ -195,7 +201,7 @@ export class EditPdApplicantComponent implements OnInit { // }, error => { // this.notifier.notify('warning', 'Something Wents Wrong Try Again.!'); // }); - } + }} } // get relation master details 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 f12954806..b8242a4e2 100755 --- 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 @@ -245,14 +245,18 @@ export class EditPdMasterComponent implements OnInit { submitPdDetails(formValue: any, status:string) { let updateStatus = this.currentPDStatus == this.pdStatusCheck.DRAFT ? status : this.currentPDStatus == this.pdStatusCheck.TRIGGERED ? status : this.currentPDStatus; if(this._EditPDtriggerForm.invalid) { - this.validateAllFormFields(this._EditPDtriggerForm) + this.validateAllFormFields(this._EditPDtriggerForm); + this.notifier.notify('warning', 'Please Fill All Mandatory Fields.!'); return; } else{ let my_array = this._EditPDtriggerForm.value; - + if((my_array.pd_contact_person == '') || (my_array.lender_stdcode == '' && my_array.lender_landline == '')){ + this.notifier.notify('warning', 'Either Mobile or Landline Need.!'); + return; + } + else{ let concat_landline - if(my_array.lender_stdcode != null && my_array.lender_landline != null){ if(my_array.lender_stdcode == '' && my_array.lender_landline == ''){ concat_landline = null; @@ -299,6 +303,7 @@ export class EditPdMasterComponent implements OnInit { this.notifier.notify('warning', 'Something Wents Wrong Try Again.!'); });//error closed }//else closed + } } /** To Reset Popup Data */ onReset() { diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html index 9c43301da..6f2358bfc 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html @@ -40,16 +40,17 @@
-
-
-
+ +
+
+
- -
-
+
+ +
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts index a806cfe68..35ecf7c2d 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts @@ -70,7 +70,12 @@ export class ViewPdComponent implements OnInit, OnDestroy { this._pd.editPdDetails(editID).subscribe( data => { if (data.status == 200) { - this.pdMasterData=data.records.pd_master_details; + this.pdMasterData = data.records.pd_master_details; + this.pdMasterData = Object.keys(data.records.pd_master_details).map(function (key) + { + return data.records.pd_master_details[key]; + }); + // console.log(this.pdMasterData); this.pd_QC_Rating = Number(this.pdMasterData[0].qc_rating); this.pdApplicantData= data.records.applicants_details; this.pdDocumentsData=data.records.pd_documnets; From 3ba32ce89f02ce1a4d890d4fb7f5bec4b8a39268 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Sat, 12 Jan 2019 10:32:45 +0530 Subject: [PATCH 4/4] issues : ps --- .../edit-pd-master.component.html | 8 ++++---- .../edit-pd-master/edit-pd-master.component.ts | 9 +++++---- .../list-pd/view-pd/view-pd.component.html | 18 +++++++++--------- 3 files changed, 18 insertions(+), 17 deletions(-) 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 d0492e4af..544a5fbe7 100755 --- 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 @@ -36,8 +36,8 @@ - - + + Enter Valid Mobile Number. @@ -45,10 +45,10 @@ Enter Valid STD Code.  -  - + Enter Valid Landline Number. - + 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 b8242a4e2..d0efd9207 100755 --- 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 @@ -112,6 +112,7 @@ export class EditPdMasterComponent implements OnInit { } loadFormData() { + console.log('this.data.record',this.data.records); let stdcode; let landline; if(this.data.records.pd_contact_landline){ @@ -130,7 +131,7 @@ 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,Validators.minLength(10),Validators.maxLength(12),Validators.pattern('^[0-9]*$')])], + pd_contact_mobileno: [this.data.records.pd_contact_mobileno, Validators.compose([Validators.minLength(10),Validators.maxLength(12),Validators.pattern('^[0-9]*$')])], lender_stdcode: [stdcode, Validators.compose([Validators.minLength(3),Validators.maxLength(5)])], lender_landline: [landline,Validators.compose([Validators.minLength(6),Validators.maxLength(8)])], fk_product_id: [this.data.records.fk_product_id], @@ -251,7 +252,7 @@ export class EditPdMasterComponent implements OnInit { } else{ let my_array = this._EditPDtriggerForm.value; - if((my_array.pd_contact_person == '') || (my_array.lender_stdcode == '' && my_array.lender_landline == '')){ + if((my_array.pd_contact_mobileno == '') || (my_array.lender_stdcode == '' && my_array.lender_landline == '')){ this.notifier.notify('warning', 'Either Mobile or Landline Need.!'); return; } @@ -262,7 +263,7 @@ export class EditPdMasterComponent implements OnInit { concat_landline = null; }else{ let std = my_array.lender_stdcode == '' ? '' : my_array.lender_stdcode; - let landline = my_array.lender_landerline == '' ? '' : my_array.lender_landerline; + let landline = my_array.lender_landline == '' ? '' : my_array.lender_landline; concat_landline = std+'-'+landline; } }else if(my_array.lender_stdcode == '' && my_array.lender_landerline == ''){ @@ -277,7 +278,7 @@ export class EditPdMasterComponent implements OnInit { "lender_applicant_id": my_array.lender_applicant_id, "pd_contact_person": my_array.pd_contact_person, "pd_contact_mobileno": my_array.pd_contact_mobileno, - "pd_Contant_landline": concat_landline, + "pd_contact_landline": concat_landline, "fk_product_id": my_array.fk_product_id, "fk_subproduct_id": my_array.fk_subproduct_id, "fk_pd_type": my_array.fk_pd_type, diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html index 6f2358bfc..6b60700f7 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html @@ -43,12 +43,12 @@
-
- + + -
+
@@ -61,7 +61,7 @@
- +
{{master.product_name}} / {{master.subproduct_name}} @@ -71,7 +71,7 @@
- +
{{master.loan_amount}} @@ -81,7 +81,7 @@
- +
{{master.pd_type_name}} @@ -91,7 +91,7 @@
- +
{{master.addressline1}},
{{master.city_name}},
{{master.state_name}}-{{master.pincode}} @@ -167,8 +167,8 @@  {{applicant.landline}} - ( Main Applicant ) - ( {{applicant.relation_name}} ) + ( Main Applicant ) + {{applicant.relation_name}}