From c59dc64bb6c695bd4b2c16c092d4035810e1f15e Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Wed, 25 Sep 2019 17:26:50 +0530 Subject: [PATCH] Fairoj : Lender contact person related fields removed and SEP_INDV changes are done --- .../list-pd/add-pd/add-pd.component.html | 16 ++-- .../list-pd/add-pd/add-pd.component.ts | 84 +++++++++---------- .../edit-pd-applicant.component.html | 4 +- .../edit-pd-master.component.html | 8 +- .../edit-pd-master.component.ts | 69 +++++++-------- ng6-seed/src/main.ts | 4 + 6 files changed, 95 insertions(+), 90 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 76a2d0e..346ec69 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 @@ -66,28 +66,28 @@
- + + Lender Contact Person Required Enter Valid Mobile Number. - + --> - + @@ -115,7 +115,7 @@ - + Select @@ -231,7 +231,7 @@ - + @@ -272,7 +272,7 @@ - + - + + Enter Valid STD Code.  -  @@ -94,7 +94,9 @@ type="text" maxlength="8" ForMobileNumbers> 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 87dceb6..4a1049e 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 @@ -316,13 +316,13 @@ export class EditPdMasterComponent implements OnInit { fk_lender_id: [{value:this.data.records.fk_lender_id,disabled:true}], lender_applicant_id: [this.data.records.lender_applicant_id, Validators.compose([Validators.required])], pd_branch_id:[this.data.records.pd_branch_id, Validators.compose([Validators.required])], - pd_contact_person:[this.data.records.pd_contact_person], + // pd_contact_person:[this.data.records.pd_contact_person], lender_sales_person:[this.data.records.lender_sales_person], lender_credit_person:[{value:this.userDetails.userid,disabled:true}], imgc_fin_institute:[this.data.records.imgc_fin_institute], - 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)])], + // 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], fk_subproduct_id: [this.data.records.fk_subproduct_id], fk_pd_type: [this.data.records.fk_pd_type], @@ -657,24 +657,27 @@ export class EditPdMasterComponent implements OnInit { let my_array = this._EditPDtriggerForm.value; my_array.fk_lender_id=this._EditPDtriggerForm.controls['fk_lender_id'].value; //disabled field value my_array.lender_credit_person=this._EditPDtriggerForm.controls['lender_credit_person'].value; //disabled field value - 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; - }else{ - let std = my_array.lender_stdcode == '' ? '' : my_array.lender_stdcode; - let landline = my_array.lender_landline == '' ? '' : my_array.lender_landline; - concat_landline = std+'-'+landline; - } - }else if(my_array.lender_stdcode == '' && my_array.lender_landerline == ''){ - concat_landline = null; - }else{ - concat_landline = null; - } + 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; + // }else{ + // let std = my_array.lender_stdcode == '' ? '' : my_array.lender_stdcode; + // let landline = my_array.lender_landline == '' ? '' : my_array.lender_landline; + // concat_landline = std+'-'+landline; + // } + // }else if(my_array.lender_stdcode == '' && my_array.lender_landerline == ''){ + // concat_landline = null; + // }else{ + // concat_landline = null; + // } + + // if((my_array.pd_contact_mobileno == '' || my_array.pd_contact_mobileno == null) && (concat_landline == '' || concat_landline == null )){ + // this.notifier.notify('warning', 'Either Mobile or Landline Need.!'); + // return; + // } + if(concat_landline != ''){ - if((my_array.pd_contact_mobileno == '' || my_array.pd_contact_mobileno == null) && (concat_landline == '' || concat_landline == null )){ - this.notifier.notify('warning', 'Either Mobile or Landline Need.!'); - return; } else{ let filteredAddressesdata = my_array.addresses.filter(item => item.isactive == 1); @@ -683,12 +686,12 @@ export class EditPdMasterComponent implements OnInit { "fk_lender_id": my_array.fk_lender_id, "lender_applicant_id": my_array.lender_applicant_id, "pd_branch_id":my_array.pd_branch_id, - "pd_contact_person": my_array.pd_contact_person, + // "pd_contact_person": my_array.pd_contact_person, "lender_sales_person":my_array.lender_sales_person, "lender_credit_person":my_array.lender_credit_person, "imgc_fin_institute":my_array.imgc_fin_institute, - "pd_contact_mobileno": my_array.pd_contact_mobileno, - "pd_contact_landline": concat_landline, + // "pd_contact_mobileno": my_array.pd_contact_mobileno, + // "pd_contact_landline": concat_landline, "fk_product_id": my_array.fk_product_id, "fk_subproduct_id": my_array.fk_product_id != '4' ? my_array.fk_subproduct_id : null, "fk_pd_type": my_array.fk_pd_type, @@ -788,8 +791,8 @@ getContactPerson(){ // this._EditPDtriggerForm.controls['pd_contact_person'].clearValidators() // this._EditPDtriggerForm.controls['pd_contact_person'].updateValueAndValidity() - if( this._EditPDtriggerForm.value.pd_branch_id !=null){ - let param={fk_lender_id:this._EditPDtriggerForm.controls['fk_lender_id'].value,pd_branch_id:this._EditPDtriggerForm.value.pd_branch_id} + // if( this._EditPDtriggerForm.value.pd_branch_id !=null){ + let param={fk_lender_id:this._EditPDtriggerForm.controls['fk_lender_id'].value} this._pd.getLenderContactPersons(param).subscribe(result=>{ if(result['dataStatus']){ let records=result['records'] @@ -806,21 +809,21 @@ getContactPerson(){ } },err=>{this.notifier.notify("error","Network Error")}) - } - else{ + // } + // else{ // this.sales_and_credit_enable=false; - this._EditPDtriggerForm.controls['lender_sales_person'].setValue(null) + // this._EditPDtriggerForm.controls['lender_sales_person'].setValue(null) - this._EditPDtriggerForm.controls['imgc_fin_institute'].setValue(null) - this._EditPDtriggerForm.controls['imgc_fin_institute'].clearValidators() - this._EditPDtriggerForm.controls['imgc_fin_institute'].updateValueAndValidity() + // this._EditPDtriggerForm.controls['imgc_fin_institute'].setValue(null) + // this._EditPDtriggerForm.controls['imgc_fin_institute'].clearValidators() + // this._EditPDtriggerForm.controls['imgc_fin_institute'].updateValueAndValidity() // this._EditPDtriggerForm.controls['pd_contact_person'].setValidators(Validators.compose([Validators.required])) // this._EditPDtriggerForm.controls['pd_contact_person'].updateValueAndValidity(); - } + // } } diff --git a/ng6-seed/src/main.ts b/ng6-seed/src/main.ts index a9ca1ca..7307b26 100644 --- a/ng6-seed/src/main.ts +++ b/ng6-seed/src/main.ts @@ -6,6 +6,10 @@ import { environment } from './environments/environment'; if (environment.production) { enableProdMode(); + if(window){ + window.console.log = function(){}; + } } + platformBrowserDynamic().bootstrapModule(AppModule);