From f1d5dad93b4595b805786b3fc365b8176fb166e7 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Sat, 2 Nov 2019 17:44:05 +0530 Subject: [PATCH] Fairoj : Deduplicate functionality check implemented --- .../list-pd/add-pd/add-pd.component.html | 6 +-- .../list-pd/add-pd/add-pd.component.ts | 39 +++++++++++++++++-- .../list-pd/view-pd/view-pd.component.html | 6 ++- .../list-pd/view-pd/view-pd.component.scss | 14 +++++++ .../list-pd/view-pd/view-pd.component.ts | 2 + 5 files changed, 59 insertions(+), 8 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 b088f4d85..5ae968a1a 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 @@ -35,7 +35,7 @@ - + @@ -232,7 +232,7 @@ + [value]="pdMain.applicant_name.value | titlecase" (change)="checkExistPd($event.target.value,2)"> @@ -241,7 +241,7 @@ - + Mobile No is Required . Enter Valid Mobile 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 9bd8987f7..4c3ca6724 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 @@ -907,20 +907,53 @@ customerSegmentChange(value){ console.log(this.selected_cus_abbr); } -checkExistPd(value){ +checkExistPd(value,option){ // console.log(value); - let param={lender_applicant_id:value} + let param + let name + let swal_text + switch(option){ + case 1: + param={lender_applicant_id:value} + name= "Loan Application Id" + swal_text="The Entered "+name+" ("+value+") is already exists on the Case No. " + break; + case 2: + + param={applicant_name:this.pdMain.applicant_name.value,mobile_no:this.pdMain.mobile_no.value} + name= "Applicant Name" + swal_text="The Entered applicant name and mobile number is already exists on the following Case Nos. " + break; + // case 3: + // param={mobile_no:value} + // name= "Mobile Number" + // break; + } + // if(option == 2 || ){ + if((this.pdMain.mobile_no.value != null && this.pdMain.applicant_name.value != null && option == 2) || option == 1){ this._pd.checkExistPDDetails(param).subscribe(result=>{ if(result['dataStatus']){ if(result['records'].length > 0){ + let exist_pd_sno:string='' + result['records'].forEach(val=>{ + if(exist_pd_sno == ''){ + exist_pd_sno=val.pd_sno + } + else{ + exist_pd_sno=exist_pd_sno+','+val.pd_sno} + }) + Swal({ title:"Warning!", type:'warning', - text:"The Entered Loan Application Id ("+value+") is already exists on the Case No. "+result['records'][0].pd_sno}) + text:swal_text+exist_pd_sno + }) // this._PDtriggerForm.controls['lender_applicant_id'].setValue(''); } } }) + + } } searchFun(control:any,i:number,option){ console.log("control",control) 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 303e963cf..ffe210926 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 @@ -1,7 +1,9 @@ - + +
+ This PD is a possible duplicate of PD    {{pd.pd_sno}}   +
-
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.scss index fab8a37ac..c5c7841fb 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.scss @@ -55,6 +55,20 @@ text-align: center; } } +.notify_duplicate{ + padding: 10px; + //background-color: yellow; + text-align: center; + border-radius: 4px; + font-size: 14px; +} +.exist_pd_link{ + text-decoration: underline; + color: red; +} +.exist_pd_link :hover{ + text-decoration: none; +} // .mat-list .mat-list-item.center .mat-list-item-content{ // justify-content: center; 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 44982299c..f5ee61b1b 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 @@ -98,6 +98,7 @@ export class ViewPdComponent implements OnInit, OnDestroy { // @Input() childData: string; // @Output() loadParent = new EventEmitter(); public _EditPDtriggerForm: FormGroup; + existPDs: any=[]; // no_qc_remarks: boolean; constructor(notifier: NotifierService, private dialog: MatDialog, private _fb: FormBuilder, private _pd: PdTrigerService, private route: ActivatedRoute, private router: Router, private ListPdComponent: ListPdComponent) { @@ -166,6 +167,7 @@ export class ViewPdComponent implements OnInit, OnDestroy { else { this.enableStartPD = false; } + this.existPDs=data.records.exist_pd_details } }, error => { console.log('%c Something Went Wrong Try Again.! \t\"' + (error.error_type == 2 ? error.error_status + ' ( ' + error.error_text + ' ) ' : ' ( ' + error.error_text + ' ) ') +'\" Error Occur.!', 'font-weight: bold; font-size: 50px;color: red; ');