From 04d521b0aa29a2d096d01d1ca211e285afd5b903 Mon Sep 17 00:00:00 2001 From: sriram-at-840620226347 Date: Sat, 21 Mar 2020 17:54:30 +0530 Subject: [PATCH] add and edit pd mandatory removed --- .../list-pd/add-pd/add-pd.component.html | 2 +- .../list-pd/add-pd/add-pd.component.ts | 21 ++++++++++++++++ .../edit-pd-master.component.html | 2 +- .../edit-pd-master.component.ts | 24 +++++++++++++++++++ ng6-seed/src/environments/environment.ts | 2 +- 5 files changed, 48 insertions(+), 3 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 74c9860..3720baf 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 @@ -50,7 +50,7 @@ - + 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 d1c90c1..f6e6c6c 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 @@ -69,6 +69,7 @@ export class AddPdComponent implements OnInit, OnDestroy { stateData: any=[]; pincodeData: any=[]; billingtolist: any; + removedControl: any = []; constructor(notifier: NotifierService, private _fb: FormBuilder, private route: ActivatedRoute, private router: Router, private _pd: PdTrigerService, private _aws: AwsService, private ListPdComponent: ListPdComponent, private titleCase : TitleCasePipe,private userService:UserService) { @@ -106,9 +107,29 @@ export class AddPdComponent implements OnInit, OnDestroy { this.productAllList=Response['records'].products this.productList=this.productAllList this.finInstitutionList=Response['records'].financial_institutions + if(flag == true){ this.loadFormData(); } + let lender_other_config = Response['records'].lender_other_config + lender_other_config = JSON.parse(lender_other_config) + if(lender_other_config != null){ + this.removedControl = lender_other_config.non_mandatory_fields + lender_other_config.non_mandatory_fields.forEach(lender_config=>{ + console.log('lendercofig',lender_config) + this._PDtriggerForm.controls[lender_config].clearValidators(); + this._PDtriggerForm.controls[lender_config].updateValueAndValidity() + }) + } + else{ + if(this.removedControl.length > 0) { + this.removedControl.forEach(lender_set_config=>{ + console.log('lendercofig',lender_set_config) + this._PDtriggerForm.controls[lender_set_config].setValidators(Validators.compose([Validators.required])); + this._PDtriggerForm.controls[lender_set_config].updateValueAndValidity() + }) + } + } this.getSubproductList(Response['records'].default_product) this._PDtriggerForm.controls['fk_product_id'].setValue(Response['records'].default_product); this._PDtriggerForm.controls['fk_subproduct_id'].setValue(Response['records'].default_sub_product); 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 0145061..41d8712 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 @@ -62,7 +62,7 @@ + type="text"> 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 da6b3c9..c7d36a4 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 @@ -73,6 +73,8 @@ export class EditPdMasterComponent implements OnInit { cityData: any=[]; pincodeData: any=[]; billingtolist: any; + removedControl: any = []; + lender_other_config: any; constructor(private _fb: FormBuilder, private _pd: PdTrigerService, notifier: NotifierService,private dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) public data: any,private titleCase : TitleCasePipe,private userService:UserService) { @@ -128,6 +130,7 @@ export class EditPdMasterComponent implements OnInit { this.getSubproductList(this.data.records.fk_product_id,1); } } + this.finInstitutionList=Response['records'].financial_institutions if(flag == true){ this._EditPDtriggerForm.controls['fk_product_id'].setValue(Response['records'].default_product); @@ -138,6 +141,9 @@ export class EditPdMasterComponent implements OnInit { this.getLenderList(); } + this.lender_other_config = Response['records'].lender_other_config + this.lender_other_config = JSON.parse(this.lender_other_config) + } // this.loadFormData(); @@ -165,6 +171,24 @@ export class EditPdMasterComponent implements OnInit { } } this.loadFormData(); + + if(this.lender_other_config != null){ + this.removedControl = this.lender_other_config.non_mandatory_fields + this.lender_other_config.non_mandatory_fields.forEach(lender_config=>{ + console.log('lendercofig',lender_config) + this._EditPDtriggerForm.controls[lender_config].clearValidators(); + this._EditPDtriggerForm.controls[lender_config].updateValueAndValidity() + }) + } + else{ + if(this.removedControl.length > 0) { + this.removedControl.forEach(lender_set_config=>{ + console.log('lendercofig',lender_set_config) + this._EditPDtriggerForm.controls[lender_set_config].setValidators(Validators.compose([Validators.required])); + this._EditPDtriggerForm.controls[lender_set_config].updateValueAndValidity() + }) + } + } } diff --git a/ng6-seed/src/environments/environment.ts b/ng6-seed/src/environments/environment.ts index 20bda0b..cc1c5af 100644 --- a/ng6-seed/src/environments/environment.ts +++ b/ng6-seed/src/environments/environment.ts @@ -9,7 +9,7 @@ export const environment = { environmentName: 'Development Environment',//Localhost Environment. // apiEndpoint: 'https://apitest.pdgenie.com/sparqtest/api/', - apiEndpoint: ' https://apitest.pdgenie.com/sparqapi/api/', + apiEndpoint: ' https://apitest.pdgenie.com/sparqtest/api/', authorization: 'sparqvenba2018',