From 1a14a81349a9f2ddbee2ef819e80181458c6f2c0 Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Fri, 11 Jan 2019 11:21:04 +0530
Subject: [PATCH] UI Changes

---
 .../manage-pd/list-pd/add-pd/add-pd.component.html          | 6 +++---
 .../start-pd/forms/general-info/general-info.component.html | 5 +++--
 .../manage-pd/list-pd/view-pd/view-pd.component.html        | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html
index 5408692d6..31e65ab1b 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html
@@ -48,14 +48,14 @@
                     <!-- <mat-error *ngIf="pdMain.lender_contact_person.hasError('required')">Lender Contact Person Required</mat-error> -->
              </mat-form-field>
                   <mat-form-field style="width: 28%">
-                <input matInput autocomplete="off" placeholder="Lender Mobile Number" formControlName="" type="text"  maxlength="10">
+                <input matInput autocomplete="off" placeholder="Lender's Mobile Number" formControlName="" type="text"  maxlength="10">
                   </mat-form-field>
             
-            <mat-form-field style="width: 32%">
+            <!--<mat-form-field style="width: 32%">
                 <input matInput autocomplete="off" placeholder="Lender Contact Number" formControlName="lender_contact_mobile" type="text" (keypress)="keyPress($event)" maxlength="10" required>
                 <mat-error *ngIf="pdMain.lender_contact_mobile.hasError('pattern') || pdMain.lender_contact_mobile.hasError('maxlength') || pdMain.lender_contact_mobile.hasError('minlength')">Enter Valid Mobile Number. </mat-error>  
     
-        </mat-form-field>
+        </mat-form-field>-->
         
         <mat-form-field style="width: 8%">
                                         <input matInput autocomplete="off" placeholder="STD Code" formControlName="stdcode" type="text" (keypress)="keyPress($event)">
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 1f1139127..7fe38bc59 100644
--- 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
@@ -62,15 +62,16 @@
             </mat-card-header>
               <mat-card-content>
                 <div fxLayout="row wrap" formArrayName="companies">
-                    <div fxFlex.xs="100"  fxFlex.sm="100" fxFlex.md="100" fxFlex.lg="100" fxFlex.xl="100" *ngFor="let com of _generalForm.controls.companies['controls']; let c = index;" [formGroupName]="c">
+                    <div fxFlex.xs="100"  fxFlex.sm="100" fxFlex.md="100" fxFlex.lg="100" fxFlex.xl="100" *ngFor="let com of _generalForm.controls.companies['controls']; let c = index; let last = last;" [formGroupName]="c">
                         <mat-form-field style="width: 60%" *ngIf="com.value.is_active==true">
                                 <input matInput placeholder="Company/Firm" formControlName="company_name" type="text">
                             </mat-form-field>
-                            <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Add More Company/Firm" matTooltipPosition="above" color="primary" (click)="addMoreCompanies()" *ngIf="c==0"><mat-icon>add</mat-icon></button>
+                           
                             <button type="button" class="mr-1 mb-1 hover-icon" mat-raised-button mat-icon-button (click)="removeCompanies(c)" *ngIf="c>0 && com.value.is_active==true"
                                 matTooltip="Remove Company/Firm" matTooltipPosition="above">
                                     <mat-icon>delete</mat-icon>
                                 </button>
+                                 <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Add More Company/Firm" matTooltipPosition="above" color="primary" (click)="addMoreCompanies()" *ngIf="last"><mat-icon>add</mat-icon></button>
                     </div>
                   </div>
               </mat-card-content>
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html
index 444ea4dba..61bcfab5e 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html
@@ -24,7 +24,7 @@
                  <br>
                 <small *ngIf="master.pd_allocated_to && master.fk_pd_type==1" style="text-align:left" matTooltip="PD Officer" matTooltipPosition="above">{{master.pd_allocated_to | titlecase}}</small>
                 <small *ngIf="master.executive_name && master.centralofficer && master.fk_pd_type==2" style="text-align:left" matTooltip="PD Officer" matTooltipPosition="above">{{master.executive_name | titlecase}}/{{master.centralofficer | titlecase}}</small> 
-                <small *ngIf="master.centralofficer && master.fk_pd_type==3" style="text-align:left" matTooltip="PD Officer" matTooltipPosition="above">{{master.centralofficer | titlecase}}<br></small>  
+                <small *ngIf="master.centralofficer && master.fk_pd_type==3" style="text-align:left" matTooltip="PD Officer" matTooltipPosition="above">{{master.centralofficer | titlecase}}</small>  <br>
                 
                 <small *ngIf="master.pd_status==pdStatusCheck.SCHEDULED">{{master.scheduled_on}}</small>