From 8c731fd2ad50867f1fa03bbfe9db182248793899 Mon Sep 17 00:00:00 2001 From: sriram-at-840620226347 Date: Sat, 7 Nov 2020 14:06:47 +0530 Subject: [PATCH] search option for branch --- .../manage-pd/list-pd/add-pd/add-pd.component.html | 7 ++++++- .../manage-pd/list-pd/add-pd/add-pd.component.ts | 7 +++++++ .../list-pd/edit-pd-master/edit-pd-master.component.html | 9 ++++++--- .../list-pd/edit-pd-master/edit-pd-master.component.ts | 7 ++++++- .../manage-pd/list-pd/list-pd.component.html | 2 +- 5 files changed, 26 insertions(+), 6 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 537e78fdc..e7beb4f67 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 @@ -39,10 +39,15 @@ + + + Select - + {{LB.branch_name}} 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 7d2337882..51ffdb67c 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 @@ -67,7 +67,9 @@ export class AddPdComponent implements OnInit, OnDestroy { removedControl: any = []; public lenderFilterCtrl:FormControl = new FormControl(); + public branchFilterCtrl:FormControl = new FormControl(); public filteredLenderList:ReplaySubject = new ReplaySubject(1); + public filteredBranchList:ReplaySubject = new ReplaySubject(1); constructor(notifier: NotifierService, private _fb: FormBuilder, private route: ActivatedRoute, @@ -186,6 +188,7 @@ export class AddPdComponent implements OnInit, OnDestroy { selectedLender(lender) { console.log('lender',lender); this.lenderBranchList = lender['branches']; + this.filteredBranchList.next(this.lenderBranchList.slice()); this.lenderShortName = lender['short_name']; // console.log(this.lenderShortName); this._PDtriggerForm.controls.pd_branch_id.setValue(null); @@ -1114,6 +1117,10 @@ searchFun(control:any,i:number,option){ this.lenderFilterCtrl.valueChanges.pipe().subscribe(()=>{ this.applyFilter(this.lenderFilterCtrl.value,this.filteredLenderList,this.lenderList,'full_name') }) + this.branchFilterCtrl.valueChanges.pipe().subscribe(()=>{ + this.applyFilter(this.branchFilterCtrl.value,this.filteredBranchList,this.lenderBranchList,'branch_name') + }) + } applyFilter(filtered_text,filter_list,raw_list,obj_name) { 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 b10dcb3fc..22220d88d 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 @@ -55,9 +55,12 @@ - Select - - + + + Select + {{LB.branch_name}} 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 cf77dbc27..07d7f0727 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 @@ -76,7 +76,9 @@ export class EditPdMasterComponent implements OnInit { removedControl: any = []; public lenderFilterCtrl:FormControl = new FormControl(); + public branchFilterCtrl:FormControl = new FormControl(); public filteredLenderList:ReplaySubject = new ReplaySubject(1); + public filteredBranchList:ReplaySubject = new ReplaySubject(1); constructor(private _fb: FormBuilder, @@ -202,6 +204,7 @@ export class EditPdMasterComponent implements OnInit { selectedLender(lender,option?) { // console.log('lender',lender); this.lenderBranchList = lender['branches']; + this.filteredBranchList.next(this.lenderBranchList.slice()); this.lenderShortName = lender['short_name']; // console.log(this.lenderShortName); if(!option){ @@ -1003,7 +1006,9 @@ searchFun(control:any,i:number,option){ this.lenderFilterCtrl.valueChanges.pipe().subscribe(()=>{ this.applyFilter(this.lenderFilterCtrl.value,this.filteredLenderList,this.lenderList,'full_name') }) - + this.branchFilterCtrl.valueChanges.pipe().subscribe(()=>{ + this.applyFilter(this.branchFilterCtrl.value,this.filteredBranchList,this.lenderBranchList,'branch_name') + }) } applyFilter(filtered_text,filter_list,raw_list,obj_name) { if (!raw_list) { diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/list-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/list-pd.component.html index b5281547e..fc7844ad4 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/list-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/list-pd.component.html @@ -3,7 +3,7 @@
- +