From 1a8d49560f2fc1c70ff25d48926e286ed213b55f Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Thu, 15 Nov 2018 13:05:41 +0530
Subject: [PATCH 1/2] famil form changes

---
 .../family-details.component.html             |  2 +-
 .../family-details.component.ts               | 23 ++++++++++++-------
 2 files changed, 16 insertions(+), 9 deletions(-)

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 b002c681c..d1cfcc450 100644
--- 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
@@ -88,7 +88,7 @@
                             </mat-option>
                         </mat-select>
                     </mat-form-field>
-                    <mat-form-field>
+                    <mat-form-field *ngIf="members['controls'].occupation.value==3">
                         <input matInput placeholder="Retired From"
                                formControlName="retired">
                     </mat-form-field>
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.ts
index 6b53a6e5c..f5c65ad57 100644
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.ts
@@ -145,7 +145,7 @@ export class FamilyDetailsComponent implements OnInit {
         return this.fb.group({
             relationship: ['', Validators.compose([Validators.required])],
             occupation: ['', Validators.compose([Validators.required])],
-            retired: ['', Validators.compose([Validators.required])],
+            retired: [''],
         });
     }
 
@@ -194,31 +194,38 @@ export class FamilyDetailsComponent implements OnInit {
         if (!this.familyForm.valid) {
                 return;
         }
-        console.log('data', this.familyForm.value);
         let records: any = {};
         records.no_of_years = this.years.value;
-        if (this.ownership.value == 'Others') {
+        if (this.ownership.value == 4) {
             records.ownership_others = this.ownershipOther.value;
         }
         records.ownership = this.ownership.value;
         records.residence = this.residence.value;
-        if (this.ownership.value == 'Rented') {
+        if (this.ownership.value == 3) {
             records.what_rent = this.rent.value;
         }
-        if (this.person.value == 'Other') {
+        if (this.person.value == 8) {
             records.person_met_other = this.personOther.value;
         }
         records.person_met = this.person.value;
         records.family_members = this.members.value;
         records.earning_members = this.familyForm.controls['earningMembers'].value;
-        records.non_earning_members = this.familyForm.controls['nonEarningMembers'].value;
+       // filter retired conditions
+        let non_earning_members_filter = this.familyForm.controls['nonEarningMembers'].value.map(function(obj) {
+        if(obj.occupation==3){
+            return obj;
+        }
+        else{
+             obj.retired='';
+            return obj;
+        }
+        });
+        records.non_earning_members = non_earning_members_filter;
         records.family_details_form_remark = this.familyForm.controls['family_details_form_remark'].value;
         records.pdid = this.pdid;
         records.formid = '6';
         // records.fk_createdby = '251';
-        console.log('params', records);
         this._pd.saveForm(records).subscribe(data => {
-            console.log('data', data);
             this.notifier.notify('success', 'Saved Successfully.');
         }, error => {
             this.notifier.notify('warning', 'Something Wents Wrong Try Again.!');

From 20427dfbe9f98581e4731193401e0f7e985b8392 Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Thu, 15 Nov 2018 13:06:07 +0530
Subject: [PATCH 2/2] merge : kms

---
 .../forms/address/address.component.html      | 14 ++--
 .../assets-info/assets-info.component.html    | 24 +++---
 .../banking-details.component.html            |  6 +-
 .../business-info.component.html              | 83 ++++++++++---------
 .../business-info.component.scss              |  8 +-
 .../current-loan/current-loan.component.html  |  6 +-
 .../employment-info.component.html            | 18 ++--
 .../financial-info.component.html             | 24 +++---
 .../financial-info.component.scss             |  1 +
 .../loan-details/loan-details.component.html  | 30 +++++--
 .../loan-details/loan-details.component.ts    | 62 ++++++++++++++
 .../other-income/other-income.component.html  |  6 +-
 .../personal-info.component.html              |  5 +-
 .../start-pd/forms/stock/stock.component.html | 35 ++++----
 .../supplier-info.component.html              | 14 ++--
 15 files changed, 219 insertions(+), 117 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..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
@@ -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>
@@ -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)"
-                            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"
+                   <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/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 a508f499c..1563deb3d 100644
--- 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
@@ -5,7 +5,7 @@
         <input matInput placeholder="Name of Business / Profession" formControlName="profession_name">
     </mat-form-field>
     <mat-form-field>
-        <input matInput placeholder="How many years in Business" formControlName="business_years">
+        <input matInput placeholder="How many years in business" formControlName="business_years">
     </mat-form-field>
     <mat-form-field>
         <mat-select placeholder="Industry"
@@ -25,7 +25,7 @@
     <mat-card>
         <mat-card-header>
             <p>Designation
-            <p>
+            </p>
         </mat-card-header>
         <div formArrayName="designation">
             <div *ngFor="let members of businessForm.controls.designation['controls']; let i=index"
@@ -37,13 +37,13 @@
                     <mat-form-field>
                         <input matInput placeholder="Designation" formControlName="sec_designation">
                     </mat-form-field>
-                    <button type="button" mat-raised-button mat-icon-button (click)="addDesignation()"
-                            *ngIf="i==0">
+                    <button type="button"  class="mr-1 mb-1 hover-icon" mat-raised-button mat-icon-button (click)="addDesignation()"
+                    matTooltip="Add More Designation" matTooltipPosition="above" color="primary" *ngIf="i==0">
                         <mat-icon>add</mat-icon>
                     </button>
-                    <button type="button" mat-raised-button mat-icon-button (click)="deleteDesignation(i)"
-                            *ngIf="i>0">
-                        <mat-icon>close</mat-icon>
+                    <button type="button"  class="mr-1 mb-1 hover-icon" mat-raised-button mat-icon-button (click)="deleteDesignation(i)"
+                    matTooltip="Delete" matTooltipPosition="above"  *ngIf="i>0">
+                        <mat-icon>delete</mat-icon>
                     </button>
                 </mat-card-content>
             </div>
@@ -65,7 +65,7 @@
         </mat-select>
     </mat-form-field>
     <mat-form-field *ngIf="businessForm.controls['main_person'].value == 'Others'">
-        <input matInput placeholder="Specify other persion"
+        <input matInput placeholder="Specify other person"
                formControlName="other_main_person">
     </mat-form-field>
     <mat-form-field>
@@ -85,7 +85,7 @@
     <mat-card>
         <mat-card-header>
             <p>Partners / Directors / Shareholders
-            <p>
+            </p>
         </mat-card-header>
         <div formArrayName="partners">
             <div *ngFor="let members of businessForm.controls.partners['controls']; let i=index"
@@ -104,16 +104,16 @@
                                formControlName="current_business_experiance">
                     </mat-form-field>
                     <mat-form-field>
-                        <input matInput placeholder="Total Business experience"
+                        <input matInput placeholder="Total Business Experience"
                                formControlName="total_business_experiance">
                     </mat-form-field>
-                    <button type="button" mat-raised-button mat-icon-button (click)="addPartnerDetails()"
-                            *ngIf="i==0">
+                    <button type="button" class="mr-1 mb-1 hover-icon" mat-raised-button mat-icon-button (click)="addPartnerDetails()"
+                    matTooltip="Add More Partners / Directors / Shareholders" matTooltipPosition="above" color="primary"  *ngIf="i==0">
                         <mat-icon>add</mat-icon>
                     </button>
-                    <button type="button" mat-raised-button mat-icon-button (click)="deletePartnerDetails(i)"
-                            *ngIf="i>0">
-                        <mat-icon>close</mat-icon>
+                    <button type="button" class="mr-1 mb-1 hover-icon" mat-raised-button mat-icon-button (click)="deletePartnerDetails(i)"
+                    matTooltip="Delete" matTooltipPosition="above"   *ngIf="i>0">
+                        <mat-icon>delete</mat-icon>
                     </button>
                 </mat-card-content>
             </div>
@@ -122,7 +122,7 @@
     <mat-card>
         <mat-card-header>
             <p>Employees As per applicant
-            <p>
+            </p>
         </mat-card-header>
         <mat-card-content class="matcard">
             <mat-form-field>
@@ -142,7 +142,7 @@
     <mat-card>
         <mat-card-header>
             <p>As per PD Officer
-            <p>
+            </p>
         </mat-card-header>
         <mat-card-content class="matcard">
             <mat-form-field>
@@ -162,15 +162,15 @@
     <mat-card>
         <mat-card-header>
             <p>Investments
-            <p>
+            </p>
         </mat-card-header>
         <mat-card-content class="matcard">
             <mat-form-field>
-                <input matInput placeholder="Amount invested by applicant"
+                <input matInput placeholder="Amount Invested by Applicant"
                        formControlName="invested_amount">
             </mat-form-field>
             <mat-form-field>
-                <input matInput placeholder="Monthly Working capital needed"
+                <input matInput placeholder="Monthly Working Capital Needed"
                        formControlName="working_capital">
             </mat-form-field>
         </mat-card-content>
@@ -178,9 +178,9 @@
     <mat-card>
         <mat-card-header>
             <p>Location
-            <p>
+            </p>
         </mat-card-header>
-        <mat-card-content class="matcard">
+        <mat-card-content class="matcards">
             <mat-form-field>
                 <mat-select
                             placeholder="Is the location of the business / profession suited to the nature of business / service provided? "
@@ -195,11 +195,11 @@
     <mat-card>
         <mat-card-header>
             <p>Business Setup
-            <p>
+            </p>
         </mat-card-header>
-        <mat-card-content class="matcard">
+        <mat-card-content class="matcards">
             <mat-form-field>
-                <mat-select  placeholder="What is the Ownership of the setup ?"
+                <mat-select  placeholder="What is the ownership of the setup ?"
                             formControlName="ownership_setup">
                     <mat-option value="self_owned">self owned</mat-option>
                     <mat-option value="rented">Rented</mat-option>
@@ -208,11 +208,11 @@
                 </mat-select>
             </mat-form-field>
             <mat-form-field *ngIf="businessForm.controls['ownership_setup'].value == 'others'">
-                <input matInput placeholder="please specify"
+                <input matInput placeholder="Please Specify"
                        formControlName="ownership_others">
             </mat-form-field>
             <mat-form-field *ngIf="businessForm.controls['ownership_setup'].value == 'rented'">
-                <input matInput placeholder="provide rent paid?"
+                <input matInput placeholder="Provide Rent Paid?"
                        formControlName="rent_paid">
             </mat-form-field>
         </mat-card-content>
@@ -220,7 +220,7 @@
     <mat-card>
         <mat-card-header>
             <p>Is the below documents seen and photo captured ?
-            <p>
+            </p>
         </mat-card-header>
         <mat-card-content class="matcard">
             <mat-form-field>
@@ -231,28 +231,28 @@
                 </mat-select>
             </mat-form-field>
             <mat-form-field>
-                <mat-select  placeholder="GST Regn cert"
+                <mat-select  placeholder="GST Regn Cert"
                             formControlName="gst_Regn_cert">
                     <mat-option value="yes">Yes</mat-option>
                     <mat-option value="no">No</mat-option>
                 </mat-select>
             </mat-form-field>
             <mat-form-field>
-                <mat-select  placeholder="Export / import cert"
+                <mat-select  placeholder="Export / Import cert"
                             formControlName="export_import_cert">
                     <mat-option value="yes">Yes</mat-option>
                     <mat-option value="no">No</mat-option>
                 </mat-select>
             </mat-form-field>
             <mat-form-field>
-                <mat-select  placeholder="FactoryCert"
+                <mat-select  placeholder="Factory Cert"
                             formControlName="factory_cert">
                     <mat-option value="yes">Yes</mat-option>
                     <mat-option value="no">No</mat-option>
                 </mat-select>
             </mat-form-field>
             <mat-form-field>
-                <mat-select  placeholder="Cert of practice"
+                <mat-select  placeholder="Cert of Practice"
                             formControlName="practice_cert">
                     <mat-option value="yes">Yes</mat-option>
                     <mat-option value="no">No</mat-option>
@@ -273,7 +273,7 @@
                 </mat-select>
             </mat-form-field>
             <mat-form-field>
-                <mat-select  placeholder="do you want to add other documents?"
+                <mat-select  placeholder="Do you want to add other documents?"
                             formControlName="other_documents">
                     <mat-option value="yes">Yes</mat-option>
                     <mat-option value="no">No</mat-option>
@@ -282,17 +282,17 @@
             <div formArrayName="documents" *ngIf="businessForm.controls['other_documents'].value == 'yes'">
                 <div *ngFor="let members of businessForm.controls.documents['controls']; let i=index"
                      [formGroupName]="i">
-                    <mat-form-field>
+                    <mat-form-field style="width:100%">
                         <input matInput placeholder="Specify Document Details"
                                formControlName="document">
                     </mat-form-field>
-                    <button type="button" mat-raised-button mat-icon-button (click)="addDocuments()"
-                            *ngIf="i==0">
+                    <button type="button" class="mr-1 mb-1 hover-icon" mat-raised-button mat-icon-button (click)="addDocuments()"
+                    matTooltip="Add More Document Details" matTooltipPosition="above" color="primary" *ngIf="i==0">
                         <mat-icon>add</mat-icon>
                     </button>
-                    <button type="button" mat-raised-button mat-icon-button (click)="deleteDocuments(i)"
-                            *ngIf="i>0">
-                        <mat-icon>close</mat-icon>
+                    <button type="button" class="mr-1 mb-1 hover-icon"  mat-raised-button mat-icon-button (click)="deleteDocuments(i)"
+                    matTooltip="Delete" matTooltipPosition="above"   *ngIf="i>0">
+                        <mat-icon>delete</mat-icon>
                     </button>
                 </div>
             </div>
@@ -306,6 +306,9 @@
             </mat-form-field>
         </div>
     </div>
-    <button mat-raised-button type="submit" class="button" (click)="submitDetails()">Submit</button>
+    <div style="text-align: right;">
+        <button type="submit" class="mr-1 mb-1 hover-icon"  mat-raised-button mat-icon-button  matTooltip="Submit" matTooltipPosition="above"  (click)="submitDetails()"><mat-icon>save</mat-icon>
+        </button>
+     </div>
 </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/business-info/business-info.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.scss
index 3be75d28c..96152853a 100644
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.scss
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.scss
@@ -8,13 +8,19 @@
   width: 100%;
 }
 .matcard > * {
-  width: 80%;
+  width: 45%;
 }
 .card mat-form-field {
   margin: 0 2%;
+  width: 40%;
 }
 .matcard mat-form-field {
   margin: 0 2%;
+  width: 40%;
+}
+.matcards mat-form-field {
+  margin: 0 2%;
+  width: 98%;
 }
 .address .button {
   float: right;
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..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" (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/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 0f16f392e..66bd26b06 100644
--- 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,8 @@
 <mat-card style="padding: 12px;">
+    <p>Employement Information</p>
 <form [formGroup]="employmentForm" class="address">
     <mat-form-field>
-        <input matInput placeholder="Name of employer" formControlName="employer_name">
+        <input matInput placeholder="Name of Employer" formControlName="employer_name">
     </mat-form-field>
     <mat-form-field>
         <input matInput placeholder="Since how long working with this employer?" formControlName="how_long">
@@ -14,7 +15,7 @@
         </mat-select>
     </mat-form-field>
     <mat-form-field *ngIf="employmentForm.controls['was_met'].value == 'yes'">
-        <input matInput placeholder="Name and Designation of person met" formControlName="name_designation">
+        <input matInput placeholder="Name and designation of person met" formControlName="name_designation">
     </mat-form-field>
     <mat-form-field>
         <mat-select placeholder="Salary amount confirmed ?"
@@ -27,7 +28,7 @@
         <input matInput placeholder="What is the salary amount confirmed?" formControlName="confirm_salary_amount">
     </mat-form-field>
     <mat-form-field>
-        <mat-select placeholder="Attendance Register  seen ?"
+        <mat-select placeholder="Attendance register  seen ?"
                     formControlName="attendance_seen">
             <mat-option value="yes">Yes</mat-option>
             <mat-option value="no">No</mat-option>
@@ -50,15 +51,15 @@
             </mat-form-field>
 
             <mat-form-field>
-                <input matInput placeholder="Net Take home"
+                <input matInput placeholder="Net Take Home"
                        formControlName="net_take_home">
             </mat-form-field>
             <mat-form-field>
-                <input matInput placeholder="Bonus or incentive"
+                <input matInput placeholder="Bonus or Incentive"
                        formControlName="bonus_incentive">
             </mat-form-field>
              <mat-form-field>
-                <input matInput placeholder="Any delays"
+                <input matInput placeholder="Any Delays"
                        formControlName="any_delays">
             </mat-form-field>
         </mat-card-content>
@@ -71,6 +72,9 @@
             </mat-form-field>
         </div>
     </div>
-    <button mat-raised-button type="submit" class="button" (click)="submitDetails()">Submit</button>
+    <div style="text-align: right;">
+        <button type="submit" class="mr-1 mb-1 hover-icon"  mat-raised-button mat-icon-button  matTooltip="Submit" matTooltipPosition="above"  (click)="submitDetails()"><mat-icon>save</mat-icon>
+        </button>
+     </div>    
 </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/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 720f89fc3..d8f448ac2 100644
--- 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,8 +1,9 @@
 <mat-card style="padding: 12px;">
+    <p>Financial Information</p>
     <form [formGroup]="financialForm" class="address">
         <mat-card>
             <mat-card-header>
-                <p>Data as per Financial statements<p>
+                <p>Data as Per Financial Statements<p>
             </mat-card-header>
             <div formArrayName="date_per_financial">
                 <div *ngFor="let details of financialForm.controls.date_per_financial['controls']; let i=index"
@@ -24,16 +25,16 @@
                             <input matInput [ngClass]="{'highlight': details.controls['financial_variation'].value >= 40 || details.controls['financial_variation'].value >= -40}" placeholder="Variation from Previous Year" formControlName="financial_variation">
                         </mat-form-field>
                         <mat-form-field>
-                            <input matInput placeholder="Reason for major difference" formControlName="financial_reason">
+                            <input matInput placeholder="Reason For Major Difference" formControlName="financial_reason">
                         </mat-form-field>
 
                         <button type="button" mat-raised-button mat-icon-button (click)="addDate()"
-                                *ngIf="i==0">
+                        matTooltip="Add More Financial Statements" matTooltipPosition="above" class="mr-1 mb-1 hover-icon" color="primary" *ngIf="i==0">
                             <mat-icon>add</mat-icon>
                         </button>
                         <button type="button" mat-raised-button mat-icon-button (click)="deleteDate(i)"
-                                *ngIf="i>0">
-                            <mat-icon>close</mat-icon>
+                        matTooltip="Delete" matTooltipPosition="above" class="mr-1 mb-1 hover-icon" *ngIf="i>0">
+                            <mat-icon>delete</mat-icon>
                         </button>
                     </mat-card-content>
                 </div>
@@ -63,15 +64,15 @@
                             <input matInput [ngClass]="{'highlight': details.controls['estimate_variation'].value >= 40 || details.controls['estimate_variation'].value >= -40}" placeholder="Variation from Previous Year" formControlName="estimate_variation">
                         </mat-form-field>
                         <mat-form-field>
-                            <input matInput placeholder="Reason for major difference" formControlName="estimate_reason">
+                            <input matInput placeholder="Reason For Major Difference" formControlName="estimate_reason">
                         </mat-form-field>
                         <button type="button" mat-raised-button mat-icon-button (click)="addGoods()"
-                                *ngIf="i==0">
+                        matTooltip="Add More Estimated Value" matTooltipPosition="above" class="mr-1 mb-1 hover-icon" color="primary"  *ngIf="i==0">
                             <mat-icon>add</mat-icon>
                         </button>
                         <button type="button" mat-raised-button mat-icon-button (click)="deleteGoods(i)"
-                                *ngIf="i>0">
-                            <mat-icon>close</mat-icon>
+                        matTooltip="Delete" matTooltipPosition="above" class="mr-1 mb-1 hover-icon"    *ngIf="i>0">
+                            <mat-icon>delete</mat-icon>
                         </button>
                     </mat-card-content>
                 </div>
@@ -85,6 +86,9 @@
                 </mat-form-field>
             </div>
         </div>
-        <button mat-raised-button type="submit" class="button" (click)="submitDetails()">Submit</button>
+        <div style="text-align: right;">
+            <button type="submit" class="mr-1 mb-1 hover-icon"  mat-raised-button mat-icon-button  matTooltip="Submit" matTooltipPosition="above"  (click)="submitDetails()"><mat-icon>save</mat-icon>
+            </button>
+         </div> 
     </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/financial-info/financial-info.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.scss
index efbc1400d..833488467 100644
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.scss
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.scss
@@ -9,6 +9,7 @@
 }
 .matcard mat-form-field {
   margin: 0 2%;
+  width:26%
 }
 .address .button {
   float: right;
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 dd8ad6799..c696112c5 100644
--- 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
@@ -4,7 +4,10 @@
         <input matInput placeholder="Loan Amount applied" formControlName="loan_amount">
     </mat-form-field>
     <mat-form-field>
-        <mat-select multiple placeholder="What is the end use"
+        <mat-select multiple (selectionChange)="endUserChange($event)" placeholder="What is the end use" formControlName="end_use">
+            <mat-option *ngFor="let enduse of m_endUseofLoad" [value]="enduse.id">{{ enduse.name }}</mat-option>
+        </mat-select>
+        <!--<mat-select multiple placeholder="What is the end use"
                     formControlName="end_use" (selectionChange)="endUserChange($event)">
             <mat-option value="purchase_of_property"> Puchase of property</mat-option>
             <mat-option value="construction">Construction</mat-option>
@@ -14,7 +17,7 @@
             <mat-option value="purchase_of_business_asset">Purchase of business asset</mat-option>
             <mat-option value="to_close_an_existing_debt">to close an existing debt</mat-option>
             <mat-option value="other">Other purpose</mat-option>
-        </mat-select>
+        </mat-select>-->
     </mat-form-field>
     <mat-form-field *ngIf="isOtherPurpose">
         <input matInput placeholder="Specify end use" formControlName="end_use_other">
@@ -47,12 +50,16 @@
     </mat-form-field>
 
     <mat-form-field>
-        <mat-select placeholder="Source"
+        <mat-select placeholder="Source" formControlName="source">
+            <mat-option *ngFor="let sour of m_sourceofamount" [value]="sour.id">{{ sour.name }}</mat-option>
+        </mat-select>
+
+        <!--<mat-select placeholder="Source"
                     formControlName="source">
             <mat-option value="borrowed">Borrowed from Relatives & Friends</mat-option>
             <mat-option value="own_money">Own money</mat-option>
             <mat-option value="other">Loan from another lender</mat-option>
-        </mat-select>
+        </mat-select>-->
     </mat-form-field>
     <mat-form-field *ngIf="loanDetailsForm.controls['source'].value =='other'">
         <input matInput placeholder="Specify lender name and type" formControlName="lender_name_type">
@@ -68,6 +75,10 @@
         <mat-card-content class="matcard">
             <mat-form-field>
                 <mat-select placeholder="Type of property" formControlName="property_type">
+                    <mat-option *ngFor="let typeprop of m_mortageTypeProperty" [value]="typeprop.id">{{ typeprop.name }}</mat-option>
+                </mat-select>
+                
+                <!--<mat-select placeholder="Type of property" formControlName="property_type">
                     <mat-option value="bungalow">Bungalow</mat-option>
                     <mat-option value="flat">Flat</mat-option>
                     <mat-option value="row_house">Row House</mat-option>
@@ -82,7 +93,7 @@
                     <mat-option value="factory">Factory</mat-option>
                     <mat-option value="vacant_land">Vacant Land</mat-option>
                     <mat-option value="others">Others</mat-option>
-                </mat-select>
+                </mat-select>-->
             </mat-form-field>
             <mat-form-field *ngIf="loanDetailsForm.controls['property_type'].value =='others'">
                 <input matInput placeholder="Please specify type of property" formControlName="ownershipOther">
@@ -94,12 +105,17 @@
                 </mat-select>
             </mat-form-field>
             <mat-form-field>
-                <mat-select placeholder="Status of construction"
+
+                <mat-select placeholder="Status of construction" formControlName="construction_status">
+                    <mat-option *ngFor="let status of m_statusofCunstruction" [value]="status.id">{{ status.name }}</mat-option>
+                </mat-select>
+
+                <!--<mat-select placeholder="Status of construction"
                             formControlName="construction_status">
                     <mat-option value="other_purpose">Under-construction</mat-option>
                     <mat-option value="other_purpose">Complete</mat-option>
                     <mat-option value="other_purpose">Vacant Land</mat-option>
-                </mat-select>
+                </mat-select>-->
             </mat-form-field>
 
             <mat-form-field>
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.ts
index 01648a36d..30dff2db8 100644
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.ts
@@ -39,6 +39,10 @@ export class LoanDetailsComponent implements OnInit {
     isSource: boolean = false;
     endUserList: any  = [];
     ownerNames: any = [];
+    m_endUseofLoad = [];
+    m_sourceofamount = [];
+    m_mortageTypeProperty = [];
+    m_statusofCunstruction = [];
     constructor(notifier: NotifierService, private fb: FormBuilder, private route: ActivatedRoute,
                 private router: Router,
                 private _pd: PdTrigerService) {
@@ -48,6 +52,10 @@ export class LoanDetailsComponent implements OnInit {
     ngOnInit() {
         this.applicants = this.applicant_details.pdapplicants_detials;
         this.initloanDetailsForm();
+        this.getM_EndUseofLoad();
+        this.getM_sourceofamount();
+        this.getM_MortageTypeProperty();
+        this.getM_StatusofCunstruction();
         let params: any = {};
         params.pd_id = this.pdid;
         params.pd_form_id = this.form_id;
@@ -102,6 +110,60 @@ export class LoanDetailsComponent implements OnInit {
             }
         })
     }
+
+// =============
+
+       getM_EndUseofLoad() {
+    this._pd.getAllMasterDatas('ENDUSEOFLOAN').subscribe(
+      data => {
+        this.m_endUseofLoad = data.records.filter(data => data.isactive == 1);
+      },
+      error => {
+        // this.notifier.notify('warning', 'No Category Records Found.!');
+        // this.m_assets_type = "No Category Records Found.";
+      }
+    )
+  }
+
+getM_sourceofamount() {
+    this._pd.getAllMasterDatas('SOURCEOFBALANCETRANSFER').subscribe(
+      data => {
+        this.m_sourceofamount = data.records.filter(data => data.isactive == 1);
+      },
+      error => {
+        // this.notifier.notify('warning', 'No Category Records Found.!');
+        // this.m_assets_type = "No Category Records Found.";
+      }
+    )
+  }
+
+  getM_MortageTypeProperty() {
+    this._pd.getAllMasterDatas('MORTAGEPROPERTYTYPE').subscribe(
+      data => {
+        this.m_mortageTypeProperty = data.records.filter(data => data.isactive == 1);
+      },
+      error => {
+        // this.notifier.notify('warning', 'No Category Records Found.!');
+        // this.m_assets_type = "No Category Records Found.";
+      }
+    )
+  }
+
+  getM_StatusofCunstruction() {
+    this._pd.getAllMasterDatas('STATUSOFCONSTRUCTION').subscribe(
+      data => {
+        this.m_statusofCunstruction = data.records.filter(data => data.isactive == 1);
+      },
+      error => {
+        // this.notifier.notify('warning', 'No Category Records Found.!');
+        // this.m_assets_type = "No Category Records Found.";
+      }
+    )
+  }
+
+
+
+// ==================
     public initloanDetailsForm(): void {
         this.loanDetailsForm = this.fb.group({
             loan_amount: ['', Validators.compose([Validators.required])],
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..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 (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>
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/stock/stock.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html
index 3a55530a2..d293f4b58 100644
--- 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,4 +1,5 @@
 <mat-card style="padding: 12px;">
+<p>Stock Details</p>
 <form [formGroup]="stockForm" class="address">
 
     <mat-card>
@@ -18,20 +19,20 @@
                     <mat-form-field>
                         <input matInput placeholder="Value" formControlName="raw_value">
                     </mat-form-field>
-                    <mat-form-field>
-                        <input matInput placeholder="Value of Rawmaterials as per Financial Statements" formControlName="rawmaterial_value">
+                    <mat-form-field style="width:76%">
+                        <input matInput placeholder="Value of raw materials as per financial Statements" formControlName="rawmaterial_value">
                     </mat-form-field>
-                    <mat-form-field>
-                        <input matInput placeholder="Is the Stock of Raw Materials Sufficient ?" formControlName="is_sufficiant_raw">
+                    <mat-form-field style="width:76%">
+                        <input matInput placeholder="Is the stock of raw materials sufficient ?" formControlName="is_sufficiant_raw">
                     </mat-form-field>
 
                     <button type="button" mat-raised-button mat-icon-button (click)="addRawMaterials()"
-                            *ngIf="i==0">
+                    matTooltip="Add More Raw Materials" matTooltipPosition="above" class="mr-1 mb-1 hover-icon" color="primary"  *ngIf="i==0">
                         <mat-icon>add</mat-icon>
                     </button>
                     <button type="button" mat-raised-button mat-icon-button (click)="deleteRawMaterials(i)"
-                            *ngIf="i>0">
-                        <mat-icon>close</mat-icon>
+                    matTooltip="Delete" matTooltipPosition="above" class="mr-1 mb-1 hover-icon" *ngIf="i>0">
+                        <mat-icon>delete</mat-icon>
                     </button>
                 </mat-card-content>
             </div>
@@ -54,20 +55,20 @@
                     <mat-form-field>
                         <input matInput placeholder="Value" formControlName="goods_value">
                     </mat-form-field>
-                    <mat-form-field>
-                        <input matInput placeholder="Value of Finished Goods as per Financial Statements" formControlName="finished_goods_value">
+                    <mat-form-field style="width:76%">
+                        <input matInput placeholder="Value of finished goods as per financial statements" formControlName="finished_goods_value">
                     </mat-form-field>
-                    <mat-form-field>
-                        <input matInput placeholder="Is the Stock of Finished Goods Sufficient ?" formControlName="is_sufficiant_goods">
+                    <mat-form-field style="width:76%">
+                        <input matInput placeholder="Is the stock of finished goods sufficient ?" formControlName="is_sufficiant_goods">
                     </mat-form-field>
 
                     <button type="button" mat-raised-button mat-icon-button (click)="addGoods()"
-                            *ngIf="i==0">
+                    matTooltip="Add More Finished Goods" matTooltipPosition="above" class="mr-1 mb-1 hover-icon" color="primary"  *ngIf="i==0">
                         <mat-icon>add</mat-icon>
                     </button>
                     <button type="button" mat-raised-button mat-icon-button (click)="deleteGoods(i)"
-                            *ngIf="i>0">
-                        <mat-icon>close</mat-icon>
+                    matTooltip="Delete" matTooltipPosition="above" class="mr-1 mb-1 hover-icon"  *ngIf="i>0">
+                        <mat-icon>delete</mat-icon>
                     </button>
                 </mat-card-content>
             </div>
@@ -81,6 +82,10 @@
             </mat-form-field>
         </div>
     </div>
-    <button mat-raised-button type="submit" class="button" (click)="submitDetails()">Submit</button>
+    <div style="text-align: right;">
+        <button type="submit" class="mr-1 mb-1 hover-icon"  mat-raised-button mat-icon-button  matTooltip="Submit" matTooltipPosition="above"  (click)="submitDetails()"><mat-icon>save</mat-icon>
+        </button>
+     </div>
+     
 </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>