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 d4e05727d..c49bb1a04 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 @@ -406,9 +406,6 @@ export class AddPdComponent implements OnInit, OnDestroy { if(this.lenderShortName != 'CLIX'){ - this._PDtriggerForm.controls['fk_product_id'].setValidators([Validators.required]); - this._PDtriggerForm.controls['fk_product_id'].updateValueAndValidity(); - this._PDtriggerForm.controls['fk_pd_type'].setValidators([Validators.required]); this._PDtriggerForm.controls['fk_pd_type'].updateValueAndValidity(); @@ -420,7 +417,6 @@ export class AddPdComponent implements OnInit, OnDestroy { } - this._PDtriggerForm.controls['applicant_name'].setValidators([Validators.required]); this._PDtriggerForm.controls['applicant_name'].updateValueAndValidity(); this._PDtriggerForm.controls['applicant_title_name'].setValidators([Validators.required]); 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 29af61307..6514dd4f7 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 @@ -107,17 +107,20 @@ export class EditPdMasterComponent implements OnInit { } filterProductAbbr(param,flag){ if(param == 'CLIX'){ - + console.log(this.productAllList); let getProductAbbr = this.productAllList.map(dval => dval.product_abbr); - console.log() + console.log('getProductAbbr',getProductAbbr); let ClixProductAbbr = ['BL','LAEP']; - let FilteredAbbr: any = []; - FilteredAbbr = ClixProductAbbr.map(x => { - let findIndex = getProductAbbr.indexOf(x); - return this.productAllList[findIndex]; - }); + console.log(ClixProductAbbr); + let FilteredAbbr: any = []; + FilteredAbbr = ClixProductAbbr.map(x => { + let findIndex = getProductAbbr.indexOf(x); + return this.productAllList[findIndex]; + }); + console.log('FilteredAbbr',FilteredAbbr); this.productList = FilteredAbbr.length > 0 ? FilteredAbbr : this.productAllList; - + + // this.productList = this.productAllList; } else{ this.productList = this.productAllList; @@ -372,9 +375,9 @@ export class EditPdMasterComponent implements OnInit { this.clearCustomValidatorFields(); this.submitPdDetails(formValue, status); } - //trigger pd + triggerPD(formValue: any, status:any){ - + console.log('functionclicked',formValue, status); // this._EditPDtriggerForm.controls['fk_lender_id'].setValidators([Validators.required]); // this._EditPDtriggerForm.controls['fk_lender_id'].updateValueAndValidity(); @@ -409,14 +412,15 @@ export class EditPdMasterComponent implements OnInit { // this.notifier.notify('error', 'Please add applicants.!'); // } - this.submitPdDetails(formValue, 1); setTimeout(() => { this.clearCustomValidatorFields(); - }, 10000); + }, 10000); + this.submitPdDetails(formValue, status); } // this is for clear custom validator required fields clearCustomValidatorFields(){ + console.log('functionclicked 2'); this._EditPDtriggerForm.controls['fk_lender_id'].clearValidators(); this._EditPDtriggerForm.controls['fk_lender_id'].updateValueAndValidity(); @@ -451,6 +455,7 @@ export class EditPdMasterComponent implements OnInit { } submitPdDetails(formValue: any, status:any) { + console.log('functionclicked 3'); // let updateStatus = this.currentPDStatus == this.pdStatusCheck.DRAFT ? status : this.currentPDStatus == this.pdStatusCheck.TRIGGERED ? status : this.currentPDStatus; let updateStatus = this.currentPDStatus; @@ -464,9 +469,6 @@ export class EditPdMasterComponent implements OnInit { if(this.lenderShortName == 'CLIX'){ - this._EditPDtriggerForm.controls['fk_product_id'].clearValidators(); - this._EditPDtriggerForm.controls['fk_product_id'].updateValueAndValidity(); - this._EditPDtriggerForm.controls['fk_pd_type'].clearValidators(); this._EditPDtriggerForm.controls['fk_pd_type'].updateValueAndValidity(); diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html index 3e16c3771..f6e28f0e3 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html @@ -63,7 +63,7 @@ formControlName="is_there_total_fund"> Select Yes, Disclosed - No,not disclosed + No,not Disclosed diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.ts index 68d705b80..b623d86ad 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.ts @@ -305,7 +305,7 @@ export class LoanDetailsComponent implements OnInit { } }) - if (this.productAbbr == 'BL' || this.productAbbr == 'PL' || this.productAbbr == 'LL') { + if (this.productAbbr == 'BL' || this.productAbbr == 'PL' || this.productAbbr == 'LL' || this.productAbbr == 'LAEP') { this.mortageCardAccess = false; this.loanDetailsForm.controls['owner_name'].setValue(''); this.loanDetailsForm.controls['owner_name'].clearValidators();