From 3eea355963dfb9e886a82052f6c7c7180a53fc34 Mon Sep 17 00:00:00 2001 From: sriram-at-840620226347 Date: Sat, 21 Mar 2020 14:53:38 +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 | 20 ++++++++++++++++++ .../edit-pd-master.component.html | 2 +- .../edit-pd-master.component.ts | 21 +++++++++++++++++++ ng6-seed/src/environments/environment.ts | 2 +- 5 files changed, 44 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 50b0c2ca8..75b00621a 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 @@ -44,7 +44,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 ac5cbfc6c..fca08ff5b 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 @@ -64,6 +64,7 @@ export class AddPdComponent implements OnInit, OnDestroy { cityData: any=[]; stateData: 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) { @@ -99,6 +100,25 @@ export class AddPdComponent implements OnInit, OnDestroy { this.pdTypeList=res['records'].pd_types this.customerSegmentAllList=res['records'].customer_segments this.finInstitutionList=res['records'].financial_institutions + let lender_other_config = res['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() + }) + } + } let selectLender=this.lenderList.filter(val=>val.entity_id == entity_id)[0] console.log(selectLender); this.selectedLender(selectLender) 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 8547e44cc..752578a92 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 @@ -60,7 +60,7 @@ + type="text" (change)="checkExistPd($event.target.value)"> 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 5eaa21efc..424eb3e9e 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,7 @@ export class EditPdMasterComponent implements OnInit { sales_and_credit_person: any=[]; finInstitutionList: any; billingtolist: any; + removedControl: any = []; constructor(private _fb: FormBuilder, private _pd: PdTrigerService, notifier: NotifierService,private dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) public data: any,private titleCase : TitleCasePipe) { @@ -112,6 +113,26 @@ export class EditPdMasterComponent implements OnInit { this.customerSegmentAllList=res['records'].customer_segments this.finInstitutionList=res['records'].financial_institutions + let lender_other_config = res['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._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() + }) + } + } + if(this.data.records.fk_product_id && option == 'start'){ this.getSubproductList(this.data.records.fk_product_id,1); } diff --git a/ng6-seed/src/environments/environment.ts b/ng6-seed/src/environments/environment.ts index 15a0b0f9f..3b8f9112f 100755 --- a/ng6-seed/src/environments/environment.ts +++ b/ng6-seed/src/environments/environment.ts @@ -12,7 +12,7 @@ export const environment = { // apiEndpoint: 'https://demo.pdgenie.com/sparqtest/api/', // apiEndpoint: 'https://demo.pdgenie.com/sparqapi/api/', - apiEndpoint:'https://apitest.pdgenie.com/sparqapi/api/', + apiEndpoint:'https://apitest.pdgenie.com/sparqtest/api/', // apiEndpoint:'http://localhost/sineEdge/sparqapi/api/', authorization: 'sparqvenba2018',