From 5e29656fca9951036f36cba55d308c751d2ec2bd Mon Sep 17 00:00:00 2001
From: saravanakumarkandasami <saravanakumar.k@venbainfotech.com>
Date: Thu, 15 Nov 2018 10:50:09 +0530
Subject: [PATCH 1/2] Forms UI

---
 .../start-pd/forms/address/address.component.html  |  8 ++++----
 .../forms/current-loan/current-loan.component.html |  2 +-
 .../forms/other-income/other-income.component.html |  2 +-
 .../personal-info/personal-info.component.html     |  5 ++++-
 .../supplier-info/supplier-info.component.html     | 14 +++++++-------
 5 files changed, 17 insertions(+), 14 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 dddcbbc31..16b43a9d6 100644
--- 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
@@ -28,14 +28,14 @@
                formControlName="locality_others">
     </mat-form-field>
     <mat-form-field>
-        <mat-select placeholder="Approach to PD location" formControlName="pd_location">
+        <mat-select placeholder="Approach to PD Location" formControlName="pd_location">
             <mat-option value="{{data.pd_location_approach_id}}"
                         *ngFor="let data of locationdata">{{data.description}}
             </mat-option>
         </mat-select>
     </mat-form-field>
     <mat-form-field>
-        <mat-select placeholder="Comment on locality" formControlName="comment_locality">
+        <mat-select placeholder="Comment on Locality" formControlName="comment_locality">
             <mat-option value="{{data.comments_on_locality_id}}"
                         *ngFor="let data of commentData">{{data.rating}}
             </mat-option>
@@ -57,7 +57,7 @@
             <div *ngFor="let item of addressForm.controls.neighbourhood['controls']; let i=index">
                 <mat-card-content class="matcard" [formGroup]="item">
                     <mat-form-field>
-                        <input matInput placeholder="Neighbour name"
+                        <input matInput placeholder="Neighbour Name"
                                formControlName="name">
                     </mat-form-field>
                     <mat-form-field>
@@ -83,7 +83,7 @@
                     </mat-form-field>
                     <button type="button" matTooltip="Add More Neighbour Details" matTooltipPosition="above" mat-raised-button mat-icon-button *ngIf="i==0"
                             (click)="addNeighbour($event)"
-                            style="float: right;">
+                           color="primary" style="float: right;">
                         <mat-icon>add</mat-icon>
                     </button>
                    <button type="button" matTooltip="Delete" matTooltipPosition="above" mat-raised-button mat-icon-button *ngIf="i>0"
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 ca8fb72ff..bf3ef1f82 100644
--- 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
@@ -35,7 +35,7 @@
                                 <mat-form-field>
                                     <input matInput placeholder="Current Balance Tenure" formControlName="current_balance_tenure">
                                 </mat-form-field>
-                                <button type="button" mat-raised-button mat-icon-button matTooltip="Add More Loan Details" matTooltipPosition="above" (click)="addLoanDetails()"
+                                <button type="button" mat-raised-button mat-icon-button matTooltip="Add More Loan Details" matTooltipPosition="above" color="primmary" (click)="addLoanDetails()"
                                         *ngIf="i==0">
                                     <mat-icon>add</mat-icon>
                                 </button>
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 fc82feab0..1e9386116 100644
--- 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
@@ -80,7 +80,7 @@
                                                 <mat-option value="{{frq.frequency_id}}" *ngFor="let frq of frequencyData">{{frq.name}}</mat-option>
                                             </mat-select>
                                     </mat-form-field>
-                                    <button type="button" matTooltip="Add More Income Details" matTooltipPosition="above" mat-raised-button mat-icon-button (click)="addIncomeDetails()"
+                                    <button type="button" matTooltip="Add More Income Details" matTooltipPosition="above" mat-raised-button mat-icon-button color="" (click)="addIncomeDetails()"
                                             *ngIf="i==0">
                                         <mat-icon>add</mat-icon>
                                     </button>
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 9871211b6..1623f9e05 100644
--- 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
@@ -1,4 +1,6 @@
-    <form *ngIf="loadDataStatus" [formGroup]="_personalForm" (submit)="submitPersonalForm(_personalForm.value)" novalidate>
+   <mat-card style="padding: 12px;"> 
+    <p>Personal Details</p>
+   <form *ngIf="loadDataStatus" [formGroup]="_personalForm" (submit)="submitPersonalForm(_personalForm.value)" novalidate>
 
         <mat-card-content> 
              <!-- start main applicant details -->
@@ -136,3 +138,4 @@
     </mat-card-actions>
 
       </form>
+</mat-card>
\ No newline at end of file
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 d7ffad568..d70281fbc 100644
--- 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
@@ -5,7 +5,7 @@
     <div fxLayout="row" fxLayoutAlign="start none">
       <div class="example-full-width">
         <mat-form-field fxFill>
-          <textarea matInput placeholder="What are the main Raw materials?(MEG Only)" formControlName="main_raw_materials"></textarea>
+          <textarea matInput placeholder="What are the main raw materials?(MEG Only)" formControlName="main_raw_materials"></textarea>
           <mat-error *ngIf="submitted && f.main_raw_materials.hasError('required')" class="mat-text-warn">You must Include Raw Material Details.</mat-error>
         </mat-form-field>
       </div>
@@ -40,7 +40,7 @@
                     <div fxLayout="row wrap" fxLayoutGap="14px" fxLayoutAlign="start none">
                       <div fxFlex="30">
                         <mat-form-field style="width:260px !important;">
-                          <mat-select (selectionChange)="selectedPM($event)" placeholder="Select Payment Mode" formControlName="payment_mode">
+                          <mat-select (selectionChange)="selectedPM($event)" placeholder="Payment Mode" formControlName="payment_mode">
                             <mat-option *ngFor="let pm of m_paymentModeType" [value]="pm.id">{{ pm.name }}</mat-option>
                           </mat-select>
                         </mat-form-field>
@@ -61,7 +61,7 @@
                     <div fxLayout="row" fxLayoutGap="14px" fxLayoutAlign="start none">
                       <div fxFlex="30">
                         <mat-form-field style="width:260px !important;">
-                          <mat-select (selectionChange)="selectedFreqPurchase($event)" placeholder="Select Frequency of Purchase" formControlName="frequency_of_purchase">
+                          <mat-select (selectionChange)="selectedFreqPurchase($event)" placeholder="Frequency of Purchase" formControlName="frequency_of_purchase">
                             <mat-option *ngFor="let feq of m_freqOfPurchase" [value]="feq.frequency_id">{{ feq.name }}</mat-option>
                           </mat-select>
                         </mat-form-field>
@@ -75,7 +75,7 @@
         
                       <div fxFlex="30" style="text-align:center;">
                         <span *ngIf="_supplierQuesFrom.controls.supplier_details.controls.length > 1" (click)="removeLanguage(i)">
-                             <button mat-button mat-icon-button class="mr-1 mb-1 hover-icon" color="primary" matTooltip="Delete" matTooltipPosition="above"><mat-icon>delete</mat-icon></button>
+                             <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" color="primary" matTooltip="Delete" matTooltipPosition="above"><mat-icon>delete</mat-icon></button>
                            </span>
                       </div>
                     </div>
@@ -84,11 +84,11 @@
           </mat-card-content>
         </mat-card>
       </div>
-        <button mat-raised-button mat-icon-button mat-button color="primary" matTooltip="Add More Supplier Details" matTooltipPosition="above"
-          class="mr-1 mb-1 hover-icon" (click)="addSupplierDetails($event); false"><mat-icon>add</mat-icon></button>
-      </div>
+        </div>
     </div>
     <div class="row" style="text-align:right;">
+      <button mat-raised-button mat-icon-button mat-button color="primary" matTooltip="Add More Supplier Details" matTooltipPosition="above"
+          class="mr-1 mb-1 hover-icon" (click)="addSupplierDetails($event); false"><mat-icon>add</mat-icon></button>
       <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Reset" matTooltipPosition="above" type="reset"><mat-icon>settings_backup_restore</mat-icon></button>
       <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Save" matTooltipPosition="above" type="submit"><mat-icon>save</mat-icon></button>
     </div>

From f5ca6b768313af0064bcca15892cfbdf865ec71a Mon Sep 17 00:00:00 2001
From: saravanakumarkandasami <saravanakumar.k@venbainfotech.com>
Date: Thu, 15 Nov 2018 11:17:10 +0530
Subject: [PATCH 2/2] Forms UI

---
 .../forms/address/address.component.html      |  6 ++---
 .../assets-info/assets-info.component.html    | 24 +++++++++----------
 .../banking-details.component.html            |  6 ++---
 .../current-loan/current-loan.component.html  |  6 ++---
 .../other-income/other-income.component.html  |  6 ++---
 5 files changed, 23 insertions(+), 25 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 16b43a9d6..78cda05de 100644
--- 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
@@ -81,12 +81,12 @@
                                 </mat-option>
                         </mat-select>
                     </mat-form-field>
-                    <button type="button" matTooltip="Add More Neighbour Details" matTooltipPosition="above" mat-raised-button mat-icon-button *ngIf="i==0"
+                    <button type="button" matTooltip="Add More Neighbour Details" class="mr-1 mb-1 hover-icon"  matTooltipPosition="above" mat-raised-button mat-icon-button *ngIf="i==0"
                             (click)="addNeighbour($event)"
                            color="primary" style="float: right;">
                         <mat-icon>add</mat-icon>
                     </button>
-                   <button type="button" matTooltip="Delete" matTooltipPosition="above" mat-raised-button mat-icon-button *ngIf="i>0"
+                   <button type="button" matTooltip="Delete" class="mr-1 mb-1 hover-icon"  matTooltipPosition="above" mat-raised-button mat-icon-button *ngIf="i>0"
                              (click)="removeNeighbour(i)"
                             style="float: right;">
                         <mat-icon>delete</mat-icon>
@@ -106,7 +106,7 @@
       </div>
     </div>
     <div class="row" style="text-align:right;">
-             <button mat-raised-button mat-icon-button class="mr-1 mb-1" matTooltip="Save" matTooltipPosition="above" type="submit" (click)="onSubmit()"><mat-icon>save</mat-icon></button>
+             <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Save" matTooltipPosition="above" type="submit" (click)="onSubmit()"><mat-icon>save</mat-icon></button>
           </div>
     
 </form>
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 e5baf4036..03dbbc63b 100644
--- 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
@@ -10,16 +10,13 @@
                 <mat-card>
                   <mat-card-content> 
                   <div [formGroupName]="i"> 
-                    <div fxLayout="row wrap" fxLayoutGap="5px" fxLayoutAlign="start none">
-                      <div>
-                        <mat-form-field>
+                    <div fxLayout="row wrap" fxLayoutGap="5px" fxLayoutAlign="start none"> 
+                        <mat-form-field style="width:100%">
                           <mat-select (selectionChange)="selectedAssetsType($event, i)" placeholder="Assets Type" formControlName="assets_mode">
                             <mat-option *ngFor="let asset of m_assets_type" [value]="asset.id">{{ asset.name }}</mat-option>
                           </mat-select>
                         </mat-form-field>
- 
-                      </div>
-                    </div>
+                     </div>
                     <!--Desction Dynamic details: START-->
                     <div formArrayName="details" class="example-full-width">
                       <!--Property-->
@@ -28,8 +25,8 @@
                           <div *ngFor="let detail of sup['controls'].details['controls']; let s = index">
                             <div [formGroupName]="s">
                               <div>
-                                <mat-form-field>
-                                  <mat-select placeholder="Select Property" formControlName="property_type">
+                                <mat-form-field style="width:100%">
+                                  <mat-select placeholder="Property" formControlName="property_type">
                                     <mat-option *ngFor="let prop of m_propertyType" [value]="prop.id">{{ prop.name }}</mat-option>
                                   </mat-select>
                                 </mat-form-field>
@@ -199,7 +196,7 @@
                      <div *ngIf="sup.get('assets_mode').value == 1 || sup.get('assets_mode').value == 2 || sup.get('assets_mode').value == 3 || sup.get('assets_mode').value == 5">
                       <div fxFlex="33">
                         <mat-form-field class="ml-xs example-full-width">
-                          <input matInput placeholder="Year and month of purchase" formControlName="year_of_purchase">
+                          <input matInput placeholder="Year and Month of Purchase" formControlName="year_of_purchase">
                         </mat-form-field>
                       </div>
                       </div>
@@ -231,7 +228,7 @@
                       <div fxFlex="20">
                         <span *ngIf="_assetsQuesFrom.controls.assets_details.controls.length > 1" (click)="removeLanguage(i)">
                              
-                           <button mat-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Delete" matTooltipPosition="above"><mat-icon>delete</mat-icon></button>
+                           <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Delete" matTooltipPosition="above"><mat-icon>delete</mat-icon></button>
                          </span>
                       </div>
                     </div>
@@ -241,9 +238,7 @@
                 </mat-card>
  
               </div>
-              <button mat-raised-button mat-icon-button mat-button color="primary" matTooltip="Add More Answer" matTooltipPosition="above"
-                class="mr-1 mb-1 hover-icon" (click)="addSupplierDetails($event); false"><mat-icon>add</mat-icon></button>
-            </div>
+             </div>
  
           </div>
            <!--<div fxLayout="row">
@@ -255,6 +250,9 @@
       </div>
     </div>-->
           <div class="row" style="text-align:right;">
+            <button mat-raised-button mat-icon-button mat-button color="primary" matTooltip="Add More Asset Details" matTooltipPosition="above"
+            class="mr-1 mb-1 hover-icon" (click)="addSupplierDetails($event); false"><mat-icon>add</mat-icon></button>
+        
             <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Reset" matTooltipPosition="above" (click)="onReset(); false"><mat-icon>settings_backup_restore</mat-icon></button>
             <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Save" matTooltipPosition="above" type="submit"><mat-icon>save</mat-icon></button>
           </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 b5d90be4a..910aa3602 100644
--- 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
@@ -132,8 +132,8 @@
                                         <mat-icon  >delete</mat-icon>
                                 </button>
                             </mat-expansion-panel>
-                           <div *ngIf="bankingForm.controls.itemRows['controls'].length == (i+1)">
-                            <button  class="mr-1 mb-1" color="primary" mat-raised-button mat-icon-button matTooltip="Add More Banking Details" matTooltipPosition="above"  (click)="addBankdetails(i, $event)">
+                           <div style="text-align: right;" class="pt-1" *ngIf="bankingForm.controls.itemRows['controls'].length == (i+1)">
+                            <button  class="mr-1 mb-1 hover-icon" color="primary" mat-raised-button mat-icon-button matTooltip="Add More Banking Details" matTooltipPosition="above"  (click)="addBankdetails(i, $event)">
                                     <mat-icon >add</mat-icon>
         </button></div>
                         </mat-accordion>
@@ -150,7 +150,7 @@
                             <!-- <button  class="mr-1 mb-1" color="primary" mat-raised-button mat-icon-button matTooltip="Add More Banking Details" matTooltipPosition="above"  (click)="addBankdetails(i)">
                                     <mat-icon >add</mat-icon>
         </button> -->
-                            <button class="mr-1 mb-1" type="submit" mat-raised-button mat-icon-button type="submit" matTooltip="Submit" matTooltipPosition="above"   (click)="bankSubmit()"><mat-icon>save</mat-icon>
+                            <button class="mr-1 mb-1 hover-icon" type="submit" mat-raised-button mat-icon-button type="submit" matTooltip="Submit" matTooltipPosition="above"   (click)="bankSubmit()"><mat-icon>save</mat-icon>
                             </button>
                    </div>
                 </form>
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 bf3ef1f82..4e2407234 100644
--- 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
@@ -35,11 +35,11 @@
                                 <mat-form-field>
                                     <input matInput placeholder="Current Balance Tenure" formControlName="current_balance_tenure">
                                 </mat-form-field>
-                                <button type="button" mat-raised-button mat-icon-button matTooltip="Add More Loan Details" matTooltipPosition="above" color="primmary" (click)="addLoanDetails()"
+                                <button type="button" class="mr-1 mb-1 hover-icon"  mat-raised-button mat-icon-button matTooltip="Add More Loan Details" matTooltipPosition="above" color="primary" (click)="addLoanDetails()"
                                         *ngIf="i==0">
                                     <mat-icon>add</mat-icon>
                                 </button>
-                                <button type="button" mat-raised-button mat-icon-button matTooltip="Delete" matTooltipPosition="above" (click)="deleteLoanDetails(i)"
+                                <button type="button" class="mr-1 mb-1 hover-icon"  mat-raised-button mat-icon-button matTooltip="Delete" matTooltipPosition="above" (click)="deleteLoanDetails(i)"
                                         *ngIf="i>0">
                                     <mat-icon>delete</mat-icon>
                                 </button>
@@ -56,7 +56,7 @@
                     </div>
                 </div>
                 <div style="text-align: right;">
-                        <button type="submit" mat-raised-button mat-icon-button  matTooltip="Submit" matTooltipPosition="above"   (click)="submitCurrentloan()"><mat-icon>save</mat-icon>
+                        <button type="submit" class="mr-1 mb-1 hover-icon"  mat-raised-button mat-icon-button  matTooltip="Submit" matTooltipPosition="above"   (click)="submitCurrentloan()"><mat-icon>save</mat-icon>
                         </button>
                  </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 1e9386116..1e7bf2973 100644
--- 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
@@ -80,11 +80,11 @@
                                                 <mat-option value="{{frq.frequency_id}}" *ngFor="let frq of frequencyData">{{frq.name}}</mat-option>
                                             </mat-select>
                                     </mat-form-field>
-                                    <button type="button" matTooltip="Add More Income Details" matTooltipPosition="above" mat-raised-button mat-icon-button color="" (click)="addIncomeDetails()"
+                                    <button type="button" matTooltip="Add More Income Details" class="mr-1 mb-1 hover-icon"  matTooltipPosition="above" mat-raised-button mat-icon-button color="" (click)="addIncomeDetails()"
                                             *ngIf="i==0">
                                         <mat-icon>add</mat-icon>
                                     </button>
-                                    <button type="button" matTooltip="Delete" matTooltipPosition="above" mat-raised-button mat-icon-button (click)="deleteIncomeDetails(i)"
+                                    <button type="button" matTooltip="Delete" class="mr-1 mb-1 hover-icon"  matTooltipPosition="above" mat-raised-button mat-icon-button (click)="deleteIncomeDetails(i)"
                                             *ngIf="i>0">
                                         <mat-icon>delete</mat-icon>
                                     </button>
@@ -101,7 +101,7 @@
                     </div>
                 </div>
                     <div style="text-align: right;">
-                            <button type="submit" mat-raised-button mat-icon-button type="submit" matTooltip="Submit" matTooltipPosition="above"   (click)="submitCurrentDetails()"><mat-icon>save</mat-icon>
+                            <button type="submit" class="mr-1 mb-1 hover-icon"  mat-raised-button mat-icon-button type="submit" matTooltip="Submit" matTooltipPosition="above"   (click)="submitCurrentDetails()"><mat-icon>save</mat-icon>
                             </button>
                      </div>
                 </form>