From 3264e91cf1c991f1261c16f48b47e13e8ccb036b Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Mon, 30 Dec 2019 13:22:44 +0530
Subject: [PATCH] Fairoj : General info table dropdown display issue fixed

---
 .../pd-collected-docs.component.ts            |  2 +-
 .../general-info/general-info.component.html  | 30 +++++++++++--------
 .../general-info/general-info.component.scss  | 23 +++++++++++++-
 3 files changed, 41 insertions(+), 14 deletions(-)

diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-collected-docs/pd-collected-docs.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-collected-docs/pd-collected-docs.component.ts
index 6b0186494..2c739affb 100644
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-collected-docs/pd-collected-docs.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-collected-docs/pd-collected-docs.component.ts
@@ -70,7 +70,7 @@ export class PdCollectedDocsComponent implements OnInit {
         // requirement_control.removeAt(index);
       
           const requirement_control = <FormArray>this._EditPDCollectedDocsForm.controls['docs_to_be_collected'];
-          if(requirement_control.value[index].add_req_id != ''){
+          if(requirement_control.value[index].pd_doc_to_be_collect_id != ''){
             requirement_control.controls[index]['controls'].isactive.setValue(0)
           }
           else{
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 d4dbdd2b3..128fb3772 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
@@ -70,14 +70,15 @@
                                 <ng-container matColumnDef="qualification">
                                     <mat-header-cell *matHeaderCellDef> Qualification </mat-header-cell>
                                     <mat-cell *matCellDef="let details;let i = index;" [formGroupName]="i">
-                                        <mat-select placeholder="Qualification" formControlName="qualification"
-                                            style="width: 75%;">
+                                        <mat-form-field class="table-field" floatLabel="never" style="width: 80%">
+                                        <mat-select placeholder="Qualification" formControlName="qualification">
                                             <mat-option *ngFor="let qual of qualificationList"
                                                 [value]="qual.qualification_id">{{qual.qualification_name}}</mat-option>
                                         </mat-select>
                                         <mat-error style="font-size:65%"
                                             *ngIf="details.controls['qualification'].invalid">Qualification Required
                                         </mat-error>
+                                    </mat-form-field>
                                     </mat-cell>
                                 </ng-container>
                                 <ng-container matColumnDef="course_name">
@@ -281,14 +282,16 @@
                                 <ng-container matColumnDef="relation">
                                     <mat-header-cell *matHeaderCellDef> Relation </mat-header-cell>
                                     <mat-cell *matCellDef="let details;let i = index;" [formGroupName]="i">
+                                            <mat-form-field class="table-field" floatLabel="never" style="width: 75%;" >
                                         <mat-select placeholder="Relation" formControlName="relationship"
-                                            style="width: 75%;" (selectionChange)="updatePersonalRelation(i)">
+                                            (selectionChange)="updatePersonalRelation(i)">
                                             <mat-option>Select</mat-option>
                                             <mat-option [value]="member.relationship_id"
                                                 *ngFor="let member of relationShipList">{{member.name
                                     + ' of' | titlecase}}</mat-option>
                                             <mat-option value="0"> Not Related </mat-option>
                                         </mat-select>
+                                        </mat-form-field>
 
                                     </mat-cell>
                                 </ng-container>
@@ -296,8 +299,9 @@
                                     <mat-header-cell *matHeaderCellDef> Relationship To </mat-header-cell>
                                     <mat-cell *matCellDef="let details;let i = index;" [formGroupName]="i"
                                         [style.visibility]="_generalForm.controls.persons_with_relationships.value[i].relationship==0 ? 'hidden':'visible'">
+                                        <mat-form-field class="table-field" floatLabel="never" style="width: 75%">
                                         <mat-select placeholder="Applicant" formControlName="relation_to"
-                                            style="width: 75%;"
+                                           
                                             [disabled]="_generalForm.controls.persons_with_relationships.value[i].relationship==0">
                                             <mat-option>Select</mat-option>
                                             <!-- getRelationRestrict(_generalForm.controls.persons_with_relationships.value[i].pd_co_applicant_id,_generalForm.controls.persons_with_relationships.value,individualsList)" -->
@@ -307,7 +311,7 @@
                                             </mat-option>
                                             <mat-option value="0"> Not Related </mat-option>
                                         </mat-select>
-
+                                        </mat-form-field>
                                     </mat-cell>
                                 </ng-container>
 
@@ -336,21 +340,22 @@
                                 <ng-container matColumnDef="applicant_name">
                                     <mat-header-cell *matHeaderCellDef> Applicant </mat-header-cell>
                                     <mat-cell *matCellDef="let details;let i = index;" [formGroupName]="i">
-
+                                            <mat-form-field class="table-field" floatLabel="never" style="width: 75%">
                                         <mat-select placeholder="Applicant" formControlName="applicant_name"
-                                            style="width: 75%;">
+                                           >
                                             <mat-option *ngFor="let bothC of individualsListBothCase"
                                                 [value]="bothC.pd_co_applicant_id">{{bothC.applicant_name
                                     | titlecase}}</mat-option>
                                         </mat-select>
-
+                                        </mat-form-field>
                                     </mat-cell>
                                 </ng-container>
                                 <ng-container matColumnDef="company_relationship">
                                     <mat-header-cell *matHeaderCellDef> Relation </mat-header-cell>
                                     <mat-cell *matCellDef="let details;let i = index;" [formGroupName]="i">
+                                            <mat-form-field class="table-field" floatLabel="never" style="width: 75%">
                                         <mat-select placeholder="Relation" formControlName="company_relationship"
-                                            style="width: 75%;" (selectionChange)="updateCompanyRelation(i)">
+                                            (selectionChange)="updateCompanyRelation(i)">
                                             <mat-option>Select</mat-option>
                                             <mat-option *ngFor="let comrelShip of companyRelationShipList"
                                                 [value]="comrelShip.company_relationship_id">
@@ -358,15 +363,16 @@
                                             </mat-option>
                                             <mat-option value="0"> Not Applicable </mat-option>
                                         </mat-select>
+                                        </mat-form-field>
                                     </mat-cell>
                                 </ng-container>
 
                                 <ng-container matColumnDef="relation_to_company">
                                     <mat-header-cell *matHeaderCellDef> Company </mat-header-cell>
                                     <mat-cell *matCellDef="let details;let i = index;" [formGroupName]="i">
-
+                                            <mat-form-field class="table-field" floatLabel="never" style="width: 75%">
                                         <mat-select placeholder="Company / Firm" formControlName="relation_to_company"
-                                            style="width: 75%;"
+                                          
                                             [style.visibility]="_generalForm.controls.company_with_relationships.value[i].company_relationship==0 ? 'hidden':'visible'">
                                             <mat-option>Select</mat-option>
                                             <mat-option *ngFor="let comp of companyList"
@@ -375,7 +381,7 @@
                                             </mat-option>
                                             <mat-option value="0"> Not Applicable </mat-option>
                                         </mat-select>
-
+                                        </mat-form-field>
                                         <button type="button" class="mr-1 mb-1 hover-icon" mat-raised-button
                                             mat-icon-button (click)="removeCompanyRelationship(i)"
                                             matTooltip="Remove Company Relationship" matTooltipPosition="below">
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.scss
index 75c4e1c83..420e13e5e 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.scss
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.scss
@@ -151,4 +151,25 @@ $product-bg-color-hover: rgba(103, 58, 183, 0.7);
               }
               }
             }
-          }
\ No newline at end of file
+          }
+          ::ng-deep .table-field{
+            // margin: 0;
+            // padding: 0;
+            .mat-form-field-underline {
+              background-color: blue;
+              height: 0px;
+              display: none;
+          }
+          .mat-form-field-wrapper{
+            padding-bottom: 0px;
+          }
+          .mat-form-field-infix{
+            // padding: 0px;
+            border-top: 0px;
+         
+            // .mat-form-field-label-wrapper{
+            //   display: none;
+            // }
+          }
+          }
+          
\ No newline at end of file