From 38f1fee7bb15df4d2db5fcc6704ccf498ba4244b Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Thu, 18 Jun 2020 15:03:31 +0530
Subject: [PATCH] Fairoj : Sales PD filter and credit PD Toolbar Empty bracket
 displayed for all forms issues fixed

---
 .../forms/address/address.component.html      |  2 +-
 .../assessed-income.component.html            |  2 +-
 .../assets-info/assets-info.component.html    |  2 +-
 .../banking-details.component.html            |  2 +-
 .../business-assets-info.component.html       |  2 +-
 .../business-banking-details.component.html   |  2 +-
 .../business-info-group.component.html        |  2 +-
 .../business-info.component.html              |  2 +-
 .../client-info/client-info.component.html    |  2 +-
 .../current-loan/current-loan.component.html  |  2 +-
 .../employment-info.component.html            |  2 +-
 .../family-details.component.html             |  2 +-
 .../final-remarks.component.html              |  2 +-
 .../financial-info.component.html             |  2 +-
 ...ns-and-business-environment.component.html |  2 +-
 .../general-info/general-info.component.html  |  2 +-
 .../lender-representative.component.html      |  2 +-
 .../loan-details/loan-details.component.html  |  2 +-
 .../neighbour-hood.component.html             |  2 +-
 .../other-income/other-income.component.html  |  2 +-
 .../personal-info.component.html              |  2 +-
 .../queries-docs/queries-docs.component.html  |  2 +-
 .../manage-rental-verification.component.html |  2 +-
 .../rental-verification.component.html        |  2 +-
 .../start-pd/forms/stock/stock.component.html |  2 +-
 .../supplier-info.component.html              |  2 +-
 .../advance-filter.component.html             |  2 +-
 .../advance-filter.component.ts               | 48 +++++++++----------
 .../sales-pd-list/sales-pd.component.html     |  2 +
 29 files changed, 53 insertions(+), 51 deletions(-)

diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html
index 571d3d219..d20f7d92d 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html
@@ -3,7 +3,7 @@
 
     <h2 mat-dialog-title class="paragraph_change">
         <div fxFlex="70" align="left" style="padding: 10px !important;">
-            <span>{{main_applicant}} ({{lender_applicant_id}}), {{customer_segment_abbr}} <span
+            <span>{{main_applicant}} {{lender_applicant_id ? '('+lender_applicant_id+')' : ''}}, {{customer_segment_abbr}} <span
                     *ngIf="subproduct_abbr">-
                     {{subproduct_abbr}} </span></span><br>
             {{pageTitle}}
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.html
index b3be56435..d0698ed98 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.html
@@ -1,6 +1,6 @@
 <h2 mat-dialog-title class="paragraph_change">
                 <div fxFlex="70" align="left" style="padding: 10px !important;">
-                      <span>{{main_applicant}} ({{lender_applicant_id}}), {{customer_segment_abbr}} - {{subproduct_abbr}} </span><br>
+                      <span>{{main_applicant}} {{lender_applicant_id ? '('+lender_applicant_id+')' : ''}}, {{customer_segment_abbr}} - {{subproduct_abbr}} </span><br>
                         {{pageTitle}}
                 </div>
                 <div fxFlex="30" align="end" style="padding: 10px !important;">
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html
index 755f79edc..c20ad41ee 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html
@@ -2,7 +2,7 @@
 
   <h2 mat-dialog-title class="paragraph_change">
     <div fxFlex="70" align="left" style="padding: 10px !important;">
-      <span>{{main_applicant}} ({{lender_applicant_id}}), {{customer_segment_abbr}} <span *ngIf="subproduct_abbr">-
+      <span>{{main_applicant}} {{lender_applicant_id ? '('+lender_applicant_id+')' : ''}}, {{customer_segment_abbr}} <span *ngIf="subproduct_abbr">-
           {{subproduct_abbr}} </span></span><br>
       {{pageTitle}}
     </div>
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html
index 7f03c68ae..34cfa044b 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html
@@ -70,7 +70,7 @@
 <form [formGroup]="bankingForm" class="bankForm">
     <h2 mat-dialog-title class="paragraph_change">
         <div fxFlex="70" align="left" style="padding: 10px !important;">
-            <span>{{main_applicant}} ({{lender_applicant_id}}), {{customer_segment_abbr}} <span *ngIf="subproduct_abbr">-
+            <span>{{main_applicant}} {{lender_applicant_id ? '('+lender_applicant_id+')' : ''}}, {{customer_segment_abbr}} <span *ngIf="subproduct_abbr">-
                     {{subproduct_abbr}} </span></span><br>
             {{pageTitle}}
         </div>
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.html
index b4f884196..8286dbfbf 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.html
@@ -1,7 +1,7 @@
 <form *ngIf="apiLoadFinish && loadDetails" [formGroup]="_businessAssetsQuesFrom" (submit)="onSubmit()" novalidate>
   <h2 mat-dialog-title class="paragraph_change">
     <div fxFlex="70" align="left" style="padding: 10px !important;">
-      <span>{{main_applicant}} ({{lender_applicant_id}}), {{customer_segment_abbr}} <span *ngIf="subproduct_abbr">-
+      <span>{{main_applicant}} {{lender_applicant_id ? '('+lender_applicant_id+')' : ''}}, {{customer_segment_abbr}} <span *ngIf="subproduct_abbr">-
           {{subproduct_abbr}}</span> </span><br>
       {{pageTitle}}
     </div>
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-banking-details/business-banking-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-banking-details/business-banking-details.component.html
index 855c2942b..6d58fcd3c 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-banking-details/business-banking-details.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-banking-details/business-banking-details.component.html
@@ -1,7 +1,7 @@
 <form [formGroup]="bankingForm" class="bankForm">
     <h2 mat-dialog-title class="paragraph_change">
         <div fxFlex="70" align="left" style="padding: 10px !important;">
-            <span>{{main_applicant}} ({{lender_applicant_id}}), {{customer_segment_abbr}} - {{subproduct_abbr}} </span><br>
+            <span>{{main_applicant}} {{lender_applicant_id ? '('+lender_applicant_id+')' : ''}}, {{customer_segment_abbr}} - {{subproduct_abbr}} </span><br>
             {{pageTitle}}
         </div>
         <div fxFlex="30" align="end" style="padding: 10px !important;">
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info-group/business-info-group.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info-group/business-info-group.component.html
index 098db2fe1..b9f33063b 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info-group/business-info-group.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info-group/business-info-group.component.html
@@ -1,6 +1,6 @@
 <h2 mat-dialog-title class="paragraph_change">
       <div fxFlex="70" align="left" style="padding: 10px !important;">
-           <span>{{main_applicant}} ({{lender_applicant_id}}), {{customer_segment_abbr}} - {{subproduct_abbr}} </span><br>
+           <span>{{main_applicant}} {{lender_applicant_id ? '('+lender_applicant_id+')' : ''}}, {{customer_segment_abbr}} - {{subproduct_abbr}} </span><br>
                         {{pageTitle}}</div>
       <div fxFlex="30" align="end" style="padding: 10px !important;">
               <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Close" matTooltipPosition="right" mat-dialog-close><mat-icon>close</mat-icon></button>
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html
index 2d7052e00..b152e8e9d 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html
@@ -2,7 +2,7 @@
 
     <h2 mat-dialog-title class="paragraph_change">
         <div fxFlex="70" align="left" style="padding: 10px !important;">
-            <span>{{main_applicant}} ({{lender_applicant_id}}), {{customer_segment_abbr}} - {{subproduct_abbr}} </span><br>
+            <span>{{main_applicant}} {{lender_applicant_id ? '('+lender_applicant_id+')' : ''}}, {{customer_segment_abbr}} - {{subproduct_abbr}} </span><br>
             {{pageTitle}}
             <!-- {{businessEntityTypeList.business_entity_type_name}} -->
         </div>
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.html
index 3bb7f3d2a..899605dfd 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.html
@@ -1,6 +1,6 @@
 <h2 mat-dialog-title class="paragraph_change">
     <div fxFlex="70" align="left" style="padding: 10px !important;">
-        <span>{{main_applicant}} ({{lender_applicant_id}}), {{customer_segment_abbr}} - {{subproduct_abbr}} </span><br>
+        <span>{{main_applicant}} {{lender_applicant_id ? '('+lender_applicant_id+')' : ''}}, {{customer_segment_abbr}} - {{subproduct_abbr}} </span><br>
         {{pageTitle}}
     </div>
     <div fxFlex="30" align="end" style="padding: 10px !important;">
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.html
index a3e6d7ede..b3453bdd8 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.html
@@ -2,7 +2,7 @@
 
     <h2 mat-dialog-title class="paragraph_change">
         <div fxFlex="70" align="left" style="padding: 10px !important;">
-            <span>{{main_applicant}} ({{lender_applicant_id}}), {{customer_segment_abbr}} - {{subproduct_abbr}} </span><br>
+            <span>{{main_applicant}} {{lender_applicant_id ? '('+lender_applicant_id+')' : ''}}, {{customer_segment_abbr}} - {{subproduct_abbr}} </span><br>
             {{pageTitle}}
         </div>
         <div fxFlex="30" align="end" style="padding: 10px !important;">
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.html
index e4db240ce..7d3e10577 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.html
@@ -1,7 +1,7 @@
 <form [formGroup]="employmentForm" class="address">
     <h2 mat-dialog-title class="paragraph_change">
         <div fxFlex="70" align="left" style="padding: 10px !important;">
-            <span>{{main_applicant}} ({{lender_applicant_id}}), {{customer_segment_abbr}} - {{subproduct_abbr}} </span><br>
+            <span>{{main_applicant}} {{lender_applicant_id ? '('+lender_applicant_id+')' : ''}}, {{customer_segment_abbr}} - {{subproduct_abbr}} </span><br>
             {{pageTitle}}
         </div>
         <div fxFlex="30" align="end" style="padding: 10px !important;">
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.html
index 352104970..aac3b1ac1 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.html
@@ -1,6 +1,6 @@
 <h2 mat-dialog-title class="paragraph_change">
     <div fxFlex="70" align="left" style="padding: 10px !important;">
-        <span>{{main_applicant}} ({{lender_applicant_id}}), {{customer_segment_abbr}} - {{subproduct_abbr}} </span><br>
+        <span>{{main_applicant}} {{lender_applicant_id ? '('+lender_applicant_id+')' : ''}}, {{customer_segment_abbr}} - {{subproduct_abbr}} </span><br>
         {{pageTitle}}
     </div>
     <div fxFlex="30" align="end" style="padding: 10px !important;">
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.html
index 4e1608952..cddca78e0 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.html
@@ -1,7 +1,7 @@
 <form [formGroup]="_finalRemarkForm" (submit)="onSubmit()" novalidate>
 <h2 mat-dialog-title class="paragraph_change">
     <div fxFlex="70" align="left" style="padding: 10px !important;">
-        <span>{{main_applicant}} ({{lender_applicant_id}}), {{customer_segment_abbr}} - {{subproduct_abbr}} </span><br>
+        <span>{{main_applicant}} {{lender_applicant_id ? '('+lender_applicant_id+')' : ''}}, {{customer_segment_abbr}} - {{subproduct_abbr}} </span><br>
         {{pageTitle}}
     </div>
     <div fxFlex="30" align="end" style="padding: 10px !important;">
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html
index 6b2f3cfd6..147e3d991 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html
@@ -1,7 +1,7 @@
 <form [formGroup]="financialForm" class="address">
     <h2 mat-dialog-title class="paragraph_change">
         <div fxFlex="70" align="left" style="padding: 10px !important;">
-            <span>{{main_applicant}} ({{lender_applicant_id}}), {{customer_segment_abbr}} - {{subproduct_abbr}} </span><br>
+            <span>{{main_applicant}} {{lender_applicant_id ? '('+lender_applicant_id+')' : ''}}, {{customer_segment_abbr}} - {{subproduct_abbr}} </span><br>
             {{pageTitle}}
         </div>
         <div fxFlex="30" align="end" style="padding: 10px !important;">
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/future-plans-and-business-environment/future-plans-and-business-environment.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/future-plans-and-business-environment/future-plans-and-business-environment.component.html
index d0ed137cb..b486ecb0b 100644
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/future-plans-and-business-environment/future-plans-and-business-environment.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/future-plans-and-business-environment/future-plans-and-business-environment.component.html
@@ -1,7 +1,7 @@
 <form [formGroup]="_futurePlansForm" (submit)="onSubmit()" novalidate>
   <h2 mat-dialog-title class="paragraph_change">
     <div fxFlex="70" align="left" style="padding: 10px !important;">
-      <span>{{main_applicant}} ({{lender_applicant_id}}), {{customer_segment_abbr}} - {{subproduct_abbr}} </span><br>
+      <span>{{main_applicant}} {{lender_applicant_id ? '('+lender_applicant_id+')' : ''}}, {{customer_segment_abbr}} - {{subproduct_abbr}} </span><br>
       {{pageTitle}}
     </div>
     <div fxFlex="30" align="end" style="padding: 10px !important;">
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html
index e738c9cb1..7db4ed0db 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html
@@ -2,7 +2,7 @@
 
     <h2 mat-dialog-title class="paragraph_change">
         <div fxFlex="70" align="left" style="padding: 10px !important;">
-            <span>{{main_applicant}} ({{lender_applicant_id}}), {{customer_segment_abbr}} <span *ngIf="subproduct_abbr">
+            <span>{{main_applicant}} {{lender_applicant_id ? '('+lender_applicant_id+')' : ''}}, {{customer_segment_abbr}} <span *ngIf="subproduct_abbr">
                     - {{subproduct_abbr}} </span> </span><br>
             {{pageTitle}}
         </div>
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/lender-representative/lender-representative.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/lender-representative/lender-representative.component.html
index 388754e33..62cfa175a 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/lender-representative/lender-representative.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/lender-representative/lender-representative.component.html
@@ -1,7 +1,7 @@
 <form [formGroup]="representativeForm" class="address">
     <h2 mat-dialog-title class="paragraph_change">
         <div fxFlex="70" align="left" style="padding: 10px !important;">
-            <span>{{main_applicant}} ({{lender_applicant_id}}), {{customer_segment_abbr}} - {{subproduct_abbr}} </span><br>
+            <span>{{main_applicant}} {{lender_applicant_id ? '('+lender_applicant_id+')' : ''}}, {{customer_segment_abbr}} - {{subproduct_abbr}} </span><br>
             {{pageTitle}}
         </div>
         <div fxFlex="30" align="end" style="padding: 10px !important;">
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html
index f41f6e3d1..8d7e6865b 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html
@@ -1,7 +1,7 @@
 <form [formGroup]="loanDetailsForm" class="address">
     <h2 mat-dialog-title class="paragraph_change">
         <div fxFlex="70" align="left" style="padding: 10px !important;">
-            <span>{{main_applicant}} ({{lender_applicant_id}}), {{customer_segment_abbr}} - {{subproduct_abbr}} </span><br>
+            <span>{{main_applicant}} {{lender_applicant_id ? '('+lender_applicant_id+')' : ''}}, {{customer_segment_abbr}} - {{subproduct_abbr}} </span><br>
             {{pageTitle}}
         </div>
         <div fxFlex="30" align="end" style="padding: 10px !important;">
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html
index 821c1fe54..364f916bb 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html
@@ -4,7 +4,7 @@
         <div fxFlex="70" align="left" style="padding: 10px !important;">
             <div fxLayout="row wrap">
                 <div fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="100" fxFlex.lg="100" fxFlex.xl="100">
-                    <span>{{main_applicant}} ({{lender_applicant_id}}), {{customer_segment_abbr}} <span *ngIf="subproduct_abbr">-
+                    <span>{{main_applicant}} {{lender_applicant_id ? '('+lender_applicant_id+')' : ''}}, {{customer_segment_abbr}} <span *ngIf="subproduct_abbr">-
                             {{subproduct_abbr}} </span></span><br>
                     {{pageTitle}}
                 </div>
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.html
index fba541512..7e282bc12 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.html
@@ -2,7 +2,7 @@
 
     <h2 mat-dialog-title class="paragraph_change">
         <div fxFlex="70" align="left" style="padding: 10px !important;">
-            <span>{{main_applicant}} ({{lender_applicant_id}}), {{customer_segment_abbr}} <span *ngIf="subproduct_abbr">-
+            <span>{{main_applicant}} {{lender_applicant_id ? '('+lender_applicant_id+')' : ''}}, {{customer_segment_abbr}} <span *ngIf="subproduct_abbr">-
                     {{subproduct_abbr}} </span></span><br>
             {{pageTitle}}
         </div>
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.html
index fc91be230..9e064c601 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.html
@@ -2,7 +2,7 @@
 
 <h2 mat-dialog-title class="paragraph_change">
         <div fxFlex="70" align="left" style="padding: 10px !important;">
-                <span>{{main_applicant}} ({{lender_applicant_id}}), {{customer_segment_abbr}} - {{subproduct_abbr}} </span><br>
+                <span>{{main_applicant}} {{lender_applicant_id ? '('+lender_applicant_id+')' : ''}}, {{customer_segment_abbr}} - {{subproduct_abbr}} </span><br>
                         {{pageTitle}}
         </div>
         <div fxFlex="30" align="end" style="padding: 10px !important;">
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/queries-docs/queries-docs.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/queries-docs/queries-docs.component.html
index e5543335b..6300e421d 100644
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/queries-docs/queries-docs.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/queries-docs/queries-docs.component.html
@@ -1,6 +1,6 @@
 <h2 mat-dialog-title class="paragraph_change">
   <div fxFlex="70" align="left" style="padding: 10px !important;">
-      <span>{{main_applicant}} ({{lender_applicant_id}}), {{customer_segment_abbr}} - {{subproduct_abbr}} </span><br>
+      <span>{{main_applicant}} {{lender_applicant_id ? '('+lender_applicant_id+')' : ''}}, {{customer_segment_abbr}} - {{subproduct_abbr}} </span><br>
       {{pageTitle}}
   </div>
   <div fxFlex="30" align="end" style="padding: 10px !important;">
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-verification/manage-rental-verification/manage-rental-verification.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-verification/manage-rental-verification/manage-rental-verification.component.html
index 9a37a1685..0ea3951a7 100644
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-verification/manage-rental-verification/manage-rental-verification.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-verification/manage-rental-verification/manage-rental-verification.component.html
@@ -4,7 +4,7 @@
         <div fxFlex="70" align="left" style="padding: 10px !important;">
                 <div fxLayout="row wrap">
                     <div fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="100" fxFlex.lg="100" fxFlex.xl="100">
-                        <!-- <span>{{main_applicant}} ({{lender_applicant_id}}), {{customer_segment_abbr}} - <span *ngIf="subproduct_abbr">{{subproduct_abbr}}</span> </span><br> -->
+                        <!-- <span>{{main_applicant}} {{lender_applicant_id ? '('+lender_applicant_id+')' : ''}}, {{customer_segment_abbr}} - <span *ngIf="subproduct_abbr">{{subproduct_abbr}}</span> </span><br> -->
                       {{pageTitle}}
                       </div>
                     
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-verification/rental-verification.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-verification/rental-verification.component.html
index 15dbb9b68..128a6f253 100644
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-verification/rental-verification.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-verification/rental-verification.component.html
@@ -3,7 +3,7 @@
       <div fxFlex="70" align="left" style="padding: 10px !important;">
               <div fxLayout="row wrap">
                     <div fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="100" fxFlex.lg="100" fxFlex.xl="100">
-                            <span>{{main_applicant}} ({{lender_applicant_id}}), {{customer_segment_abbr}} - <span *ngIf="subproduct_abbr">{{subproduct_abbr}}</span> </span><br>
+                            <span>{{main_applicant}} {{lender_applicant_id ? '('+lender_applicant_id+')' : ''}}, {{customer_segment_abbr}} - <span *ngIf="subproduct_abbr">{{subproduct_abbr}}</span> </span><br>
                           {{pageTitle}}
                     </div>
               </div>             
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html
index ffecfb299..df7f427bc 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html
@@ -1,6 +1,6 @@
 <h2 mat-dialog-title class="paragraph_change">
     <div fxFlex="70" align="left" style="padding: 10px !important;">
-        <span>{{main_applicant}} ({{lender_applicant_id}}), {{customer_segment_abbr}} - {{subproduct_abbr}} </span><br>
+        <span>{{main_applicant}} {{lender_applicant_id ? '('+lender_applicant_id+')' : ''}}, {{customer_segment_abbr}} - {{subproduct_abbr}} </span><br>
         {{pageTitle}}
     </div>
     <div fxFlex="30" align="end" style="padding: 10px !important;">
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.html
index e2232b591..5a80b4eae 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.html
@@ -1,6 +1,6 @@
 <h2 mat-dialog-title class="paragraph_change">
     <div fxFlex="70" align="left" style="padding: 10px !important;">
-        <span>{{main_applicant}} ({{lender_applicant_id}}), {{customer_segment_abbr}} - {{subproduct_abbr}} </span><br>
+        <span>{{main_applicant}} {{lender_applicant_id ? '('+lender_applicant_id+')' : ''}}, {{customer_segment_abbr}} - {{subproduct_abbr}} </span><br>
         {{pageTitle}}
     </div>
     <div fxFlex="30" align="end" style="padding: 10px !important;">
diff --git a/ng6-seed/src/app/sales-pd/sales-pd-list/advance-filter/advance-filter.component.html b/ng6-seed/src/app/sales-pd/sales-pd-list/advance-filter/advance-filter.component.html
index 3afdcd863..e580c0b13 100644
--- a/ng6-seed/src/app/sales-pd/sales-pd-list/advance-filter/advance-filter.component.html
+++ b/ng6-seed/src/app/sales-pd/sales-pd-list/advance-filter/advance-filter.component.html
@@ -16,7 +16,7 @@
     <div [formGroup]="searchForm" fxLayout="row wrap" fxFlex="100%" fxLayoutGap="35px" fxLayoutAlign="flex-start stretch">
       <mat-form-field style="width: 20%">
         <mat-select multiple formControlName="pd_status" placeholder="PD Status">
-          <mat-option *ngFor="let status of pdStatus" [value]="status">{{status}}
+          <mat-option *ngFor="let status of pdStatus" [value]="status.pd_status_name">{{status.pd_status_name}}
           </mat-option>
         </mat-select>
       </mat-form-field> 
diff --git a/ng6-seed/src/app/sales-pd/sales-pd-list/advance-filter/advance-filter.component.ts b/ng6-seed/src/app/sales-pd/sales-pd-list/advance-filter/advance-filter.component.ts
index 28de34f3f..b76e2d722 100644
--- a/ng6-seed/src/app/sales-pd/sales-pd-list/advance-filter/advance-filter.component.ts
+++ b/ng6-seed/src/app/sales-pd/sales-pd-list/advance-filter/advance-filter.component.ts
@@ -40,46 +40,46 @@ export class AdvanceFilterComponent implements OnInit {
     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' ));
             }
           });
 
   }
   ngOnChanges(){
     console.log(this.drop_down_datas)
-    if(this.drop_down_datas != undefined){
-      this.pdStatus=this.drop_down_datas.pd_status
-      if(this.ENTITY.length != 0) {
-        this.entityCheck()
-      }
-      else{
-        setTimeout(()=>{this.entityCheck()},500)
-      }
-      if(this.PRODUCTS.length != 0) {
-        this.productCheck()
-      }
-      else{
-        setTimeout(()=>{this.productCheck()},500)
-      }
-    }
+    // if(this.drop_down_datas != undefined){
+    //   this.pdStatus=this.drop_down_datas.pd_status
+    //   if(this.ENTITY.length != 0) {
+    //     this.entityCheck()
+    //   }
+    //   else{
+    //     setTimeout(()=>{this.entityCheck()},500)
+    //   }
+    //   if(this.PRODUCTS.length != 0) {
+    //     this.productCheck()
+    //   }
+    //   else{
+    //     setTimeout(()=>{this.productCheck()},500)
+    //   }
+    // }
   }
   productCheck(){
     this.PRODUCTS=this.PRODUCTS.filter(val=>{
diff --git a/ng6-seed/src/app/sales-pd/sales-pd-list/sales-pd.component.html b/ng6-seed/src/app/sales-pd/sales-pd-list/sales-pd.component.html
index 05f1fcfd3..d55916ab2 100644
--- a/ng6-seed/src/app/sales-pd/sales-pd-list/sales-pd.component.html
+++ b/ng6-seed/src/app/sales-pd/sales-pd-list/sales-pd.component.html
@@ -13,8 +13,10 @@
             </mat-form-field>
       </div>
     </div>
+    <div>
     <app-advance-filter [drop_down_datas]="filter_drop_down_data" (filteredlistData)="filteredDataSource($event)" 
     (resetFilter)= "loadSalesPDDetails()"></app-advance-filter>
+</div>
 <!-- <mat-tab-group class="mt-1">
    <mat-tab> -->
       <!-- <ng-template mat-tab-label>Sales PD</ng-template>  -->