From 4557ebbd3016aee30483025040497dbec57206bd Mon Sep 17 00:00:00 2001
From: gayathri1990 <maran7mca@gmail.com>
Date: Fri, 21 May 2021 13:36:01 +0530
Subject: [PATCH] filter changes

---
 .../manage-pd/list-pd/all-pd/all-pd.component.html         | 6 +++---
 .../manage-pd/list-pd/all-pd/all-pd.component.ts           | 7 ++++---
 .../list-pd/completed-pd/completed-pd.component.html       | 4 ++--
 .../list-pd/completed-pd/completed-pd.component.ts         | 5 +++--
 .../list-pd/inprogress-pd/inprogress-pd.component.html     | 4 ++--
 .../list-pd/inprogress-pd/inprogress-pd.component.ts       | 4 ++--
 6 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html
index 32b2c4a..3a4d625 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html
@@ -17,7 +17,7 @@
                         <mat-option *ngFor="let type of PDType" [value]="type.pd_type_id">{{type.type_name}}</mat-option>
                     </mat-select>
                 </mat-form-field> &nbsp; &nbsp; -->
-                <mat-form-field style="width:25%" class="matfieldblock">
+                <mat-form-field style="width:20%" class="matfieldblock">
                     <mat-select multiple formControlName="pd_status" placeholder="PD Status">
                         <mat-option *ngFor="let status of pdStatus" [value]="status.pd_status_name">{{status.pd_status_name}}</mat-option>
                     </mat-select>
@@ -31,9 +31,9 @@
                     <input matInput [matDatepicker]="picker1" [min]="searchForm.get('pd_from_date').value" [max]="todaydate" formControlName="pd_to_date" placeholder="Choose a todate">
                     <mat-datepicker-toggle matSuffix [for]="picker1"></mat-datepicker-toggle>
                     <mat-datepicker #picker1></mat-datepicker>
-                </mat-form-field>
+                </mat-form-field> &nbsp; &nbsp;
                 <mat-form-field style="width:20%" class="matfieldblock">
-                    <mat-select  formControlName="date_type" [(ngModel)]="modeselect" placeholder="Date Type">
+                    <mat-select  formControlName="date_type"  placeholder="Date Type">
                          <mat-option  value="1">PD Trigger Date</mat-option>
                          <mat-option value="2">PD Completed Date</mat-option>
                     </mat-select>
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.ts
index 7d2d708..a0de673 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.ts
@@ -1,7 +1,7 @@
 import { Component,ViewChild, OnInit, ViewEncapsulation, Input, Output, EventEmitter, OnDestroy, AfterViewInit, OnChanges, SimpleChanges } from '@angular/core';
 import { PdTrigerService } from './../../../pd-service/pd-triger.service';
 import { MatPaginator, MatSort, MatTableDataSource, PageEvent } from '@angular/material';
-import { FormGroup, FormBuilder ,FormsModule} from '@angular/forms';
+import { FormGroup, FormBuilder} from '@angular/forms';
 import { DatePipe } from '@angular/common';
 import { NotifierService } from 'angular-notifier';
 import { AwsService } from 'app/AwsService/aws.service';
@@ -30,7 +30,6 @@ export class AllPdComponent implements OnInit, OnChanges {
   recordStatus: boolean;
   errorMessage:any[]=[];
   tabStatus:string="ALL";
-  public modeselect = '1';
   public dataLengthTab1: number;
   public dataSourceTab1 = new MatTableDataSource();
   displayedColumns = ['PDType','Name','Lenderid','Address','Status','Action'];
@@ -71,7 +70,7 @@ export class AllPdComponent implements OnInit, OnChanges {
             pd_status:[null],
             pd_from_date:[null],
             pd_to_date:[null],
-            date_type:[null],
+            date_type:['1'],
             pd_city:[null],
             pd_products:[null],
             pd_lender:[null],
@@ -351,6 +350,8 @@ console.log(this.displayedColumns)
 
   onReset(){
     this.searchForm.reset();
+    
+    this.searchForm.controls['date_type'].setValue('1');
     this.loadPDDetails();
     this.xpandStatus = false;
   }
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.html
index 4c3f68e..f623676 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.html
@@ -33,9 +33,9 @@
                                         <input matInput [max]="todaydate" [matDatepicker]="picker1" [min]="searchForm.get('pd_from_date').value" formControlName="pd_to_date" placeholder="Choose a todate">
                                         <mat-datepicker-toggle matSuffix [for]="picker1"></mat-datepicker-toggle>
                                         <mat-datepicker #picker1></mat-datepicker>
-                                    </mat-form-field>
+                                    </mat-form-field> &nbsp; &nbsp;
                                     <mat-form-field style="width:30%" class="matfieldblock">
-                                        <mat-select  formControlName="date_type" [(ngModel)]="modeselect" placeholder="Date Type">
+                                        <mat-select  formControlName="date_type"  placeholder="Date Type">
                                              <mat-option  value="1">PD Trigger Date</mat-option>
                                              <mat-option value="2">PD Completed Date</mat-option>
                                         </mat-select>
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.ts
index 39cbac4..822a41e 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.ts
@@ -29,7 +29,7 @@ export class CompletedPdComponent implements OnInit, OnChanges {
   private notifier: NotifierService;
   recordStatus: boolean;
   errorMessage:any[]=[];
-  public modeselect = '1';
+ 
   tabStatus:string="COMPLETED";
   public dataLengthTab4: number;
   public dataSourceTab4 = new MatTableDataSource();
@@ -69,7 +69,7 @@ export class CompletedPdComponent implements OnInit, OnChanges {
         pd_status:['COMPLETED'],
         pd_from_date:[null],
         pd_to_date:[null],
-        date_type:[null],
+        date_type:['1'],
         pd_city:[null],
         pd_products:[null],
         pd_lender:[null],
@@ -338,6 +338,7 @@ public LenderRoleID : any = localStorage.getItem('LenderRoleID');
   }
   onReset(){
     this.searchForm.reset();
+    this.searchForm.controls['date_type'].setValue('1');
     this.loadPDDetails();
     this.xpandStatus = false;
   }
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.html
index 642d144..a1ef558 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.html
@@ -32,9 +32,9 @@
                                         <input matInput [matDatepicker]="picker1" [max]="todaydate" [min]="searchForm.get('pd_from_date').value" formControlName="pd_to_date" placeholder="Choose a todate">
                                         <mat-datepicker-toggle matSuffix [for]="picker1"></mat-datepicker-toggle>
                                         <mat-datepicker #picker1></mat-datepicker>
-                                    </mat-form-field>
+                                    </mat-form-field> &nbsp; &nbsp;
                                     <mat-form-field style="width:30%" class="matfieldblock">
-                                        <mat-select  formControlName="date_type" [(ngModel)]="modeselect" placeholder="Date Type">
+                                        <mat-select  formControlName="date_type"  placeholder="Date Type">
                                              <mat-option  value="1">PD Trigger Date</mat-option>
                                              <mat-option value="2">PD Completed Date</mat-option>
                                         </mat-select>
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.ts
index eb55f42..9be7bbf 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.ts
@@ -25,7 +25,6 @@ export class InprogressPdComponent implements OnInit, OnChanges {
   recordStatus: boolean;
   errorMessage:any[]=[];
   tabStatus:string="INPROGRESS";
-  public modeselect = '1';
   pipe = new DatePipe('en-US');    
   todaydate:Date = new Date();
   private notifier: NotifierService;
@@ -67,7 +66,7 @@ export class InprogressPdComponent implements OnInit, OnChanges {
         pd_status:['INPROGRESS'],
         pd_from_date:[null],
         pd_to_date:[null],
-        date_type:[null],
+        date_type:['1'],
         pd_city:[null],
         pd_products:[null],
         pd_lender:[null],
@@ -328,6 +327,7 @@ console.log(this.searchForm.value);
 
   onReset(){
     this.searchForm.reset();
+    this.searchForm.controls['date_type'].setValue('1');
     this.loadPDDetails();
     this.xpandStatus = false;
   }