From b4776e85ee1d140237e21366cec4e23fe0a9e312 Mon Sep 17 00:00:00 2001
From: gayathri1990 <maran7mca@gmail.com>
Date: Tue, 5 Jan 2021 21:15:37 +0530
Subject: [PATCH] advance filter change

---
 .../advance-filter/advance-filter.component.html     | 12 ++++++------
 .../advance-filter/advance-filter.component.ts       |  7 +++++--
 2 files changed, 11 insertions(+), 8 deletions(-)

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 a99892c..1c028aa 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
@@ -20,17 +20,17 @@
           </mat-option>
         </mat-select>
       </mat-form-field> 
-      <mat-form-field style="width:20%" touchUi>
+      <mat-form-field style="width:20%" >
         <input matInput [matDatepicker]="picker"  [max]="todaydate"
           formControlName="pd_from_date" placeholder="Choose a From date" >
-        <mat-datepicker-toggle matSuffix [for]="picker"></mat-datepicker-toggle>
-        <mat-datepicker #picker></mat-datepicker>
+        <mat-datepicker-toggle matSuffix [for]="picker" ></mat-datepicker-toggle>
+        <mat-datepicker touchUi=true #picker ></mat-datepicker>
       </mat-form-field>
-      <mat-form-field style="width:20%" touchUi>
+      <mat-form-field style="width:20%" >
         <input matInput [matDatepicker]="picker1" [min]="searchForm.get('pd_from_date').value" [max]="todaydate"
           formControlName="pd_to_date" placeholder="Choose a To date" >
-        <mat-datepicker-toggle matSuffix [for]="picker1"></mat-datepicker-toggle>
-        <mat-datepicker #picker1></mat-datepicker>
+        <mat-datepicker-toggle matSuffix [for]="picker1" ></mat-datepicker-toggle>
+        <mat-datepicker touchUi=true #picker1 ></mat-datepicker>
       </mat-form-field>
       <mat-form-field style="width:20%">
         <mat-select multiple formControlName="pd_products" placeholder="Products">
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 afbca2a..2942445 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
@@ -27,10 +27,11 @@ export class AdvanceFilterComponent implements OnInit {
     this.getDropdown();
    }
 
-  ngOnInit() {
+  ngOnInit() { 
     let entity_id=localStorage.getItem('LocalSetEntity');
     this.searchForm=this._fb.group({
       pd_status:[''],
+      pd_typefilter:[''],
       pd_from_date:[''],
       pd_to_date:[''],
       pd_products:[''],
@@ -99,7 +100,9 @@ export class AdvanceFilterComponent implements OnInit {
   searchItem(){
     this.searchForm.value.pd_from_date = this.pipe.transform(this.searchForm.value.pd_from_date,'yyyy-MM-dd');
     this.searchForm.value.pd_to_date = this.pipe.transform(this.searchForm.value.pd_to_date,'yyyy-MM-dd');
-    // console.log(JSON.stringifythis.searchForm.value);
+    // console.log(this.searchForm.value);
+     //console.log('testing');
+    
     this.xpandStatus=true;
     this.salesPDService.advancedFilter(this.searchForm.value).subscribe(res=>{
       if(res.dataStatus){