diff --git a/ng6-seed/dist.zip b/ng6-seed/dist.zip new file mode 100644 index 0000000..ffb0b77 Binary files /dev/null and b/ng6-seed/dist.zip differ diff --git a/ng6-seed/src/app/sales-pd/advance-filter/advance-filter.component.html b/ng6-seed/src/app/sales-pd/advance-filter/advance-filter.component.html index 715f80a..554e1cd 100644 --- a/ng6-seed/src/app/sales-pd/advance-filter/advance-filter.component.html +++ b/ng6-seed/src/app/sales-pd/advance-filter/advance-filter.component.html @@ -14,12 +14,23 @@
+ + + Physical PD + Telephonic PD + + - {{status}} + {{status.pd_status_name}} + + + {{pro.abbr}} + + @@ -32,11 +43,7 @@ - - - {{pro.abbr}} - - + diff --git a/ng6-seed/src/app/sales-pd/advance-filter/advance-filter.component.ts b/ng6-seed/src/app/sales-pd/advance-filter/advance-filter.component.ts index ef259d0..c97fd61 100644 --- a/ng6-seed/src/app/sales-pd/advance-filter/advance-filter.component.ts +++ b/ng6-seed/src/app/sales-pd/advance-filter/advance-filter.component.ts @@ -29,6 +29,7 @@ export class AdvanceFilterComponent implements OnInit { ngOnInit() { let entity_id=localStorage.getItem('LocalSetEntity'); + this.searchForm=this._fb.group({ pd_status:[''], sales_pd_type:[''], @@ -39,28 +40,30 @@ export class AdvanceFilterComponent implements OnInit { pd_applicant_name:[''], pd_officer:[''], }) + console.log('testing'); console.log(this.drop_down_datas) } + getDropdown(){ - // this._pd.getAllMasterDatas('PDSTATUS').subscribe(res=> - // { - // if(res.dataStatus==true) - // { - // this.pdStatus_all = res.records.filter(status=>status.isactive==1); - // } - // }); + this._pd.getAllMasterDatas('PDSTATUS').subscribe(res=> + { + if(res.dataStatus==true) + { + this.pdStatus = res.records.filter(status=>status.isactive==1 && status.hasOwnProperty('avail_pd_types') && (status.avail_pd_types == '2' || status.avail_pd_types == '3' )) + } + }); this._pd.getAllMasterDatas('ENTITY').subscribe(res=> { if(res.dataStatus==true) { - this.ENTITY = res.records.filter(ent=>ent.isactive==1); + this.ENTITY = res.records.filter(ent=>ent.isactive==1 && ent.hasOwnProperty('avail_pd_types') && (ent.avail_pd_types == '2' || ent.avail_pd_types == '3' )); } }); this._pd.getAllMasterDatas('PRODUCTS').subscribe(res=> { if(res.dataStatus==true) { - this.PRODUCTS = res.records.filter(pro=>pro.isactive==1); + this.PRODUCTS = res.records.filter(pro=>pro.isactive==1 && pro.hasOwnProperty('avail_pd_types') && (pro.avail_pd_types == '2' || pro.avail_pd_types == '3' )); } });