From 3354370065b959c4e1ed679a18a2612fc57eb01b Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Wed, 9 Jan 2019 20:04:54 +0530
Subject: [PATCH 1/2] changes for assest forms

---
 .../assets-info/assets-info.component.html    | 16 ++++--
 .../assets-info/assets-info.component.ts      | 53 +++++++++++++++----
 2 files changed, 53 insertions(+), 16 deletions(-)

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 6df10da6f..ce552f7fd 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html
@@ -218,14 +218,20 @@
                                                                               <mat-hint align="start" style="font-size:70%" *ngIf="sup.get('business_approximate_market_value').value != ''">{{"&#8377;"}} {{appxMarketAmtInwords[i]}} Only</mat-hint>
                                                                           </mat-form-field>
                                                                         
-                                                                          <mat-form-field *ngIf="sup.get('business_assets_mode').value == 1 || sup.get('business_assets_mode').value == 2 || sup.get('business_assets_mode').value == 3 || sup.get('business_assets_mode').value == 4 || sup.get('business_assets_mode').value == 5" style="width:30%">
-                                                                              <!-- <input matInput placeholder="Name of the Business Owner" formControlName="business_name_of_the_owner" autocomplete="off"> -->
+                                                                          <mat-form-field *ngIf="sup.get('business_assets_mode').value == 1 || sup.get('business_assets_mode').value == 2 || sup.get('business_assets_mode').value == 3 || sup.get('business_assets_mode').value == 4 || sup.get('business_assets_mode').value == 5" style="width:45%">
                                                                               <mat-select placeholder="Asset Owned by"
-                                                                              formControlName="business_name_of_the_owner" required>
-                                                                              <mat-option [value]="company.company_name" *ngFor="let company of existCompanyList">{{company.company_name | titlecase}}</mat-option>
-                                                                              <!-- <mat-option value="Others">Others</mat-option> -->
+                                                                              formControlName="business_name_of_the_owner" [compareWith]="compareObjects" required>
+                                                                              <mat-optgroup *ngFor="let group of mergeCompanyApplicant" [label]="group.groupName">
+                                                                                <mat-option *ngFor="let val of group.groupValues" [value]="val">
+                                                                                  {{val.name}}
+                                                                                </mat-option>
+                                                                              </mat-optgroup>
                                                                           </mat-select>
                                                                             </mat-form-field>
+                                                                            <mat-form-field *ngIf="checkOthers(sup.get('business_name_of_the_owner').value)===true" style="width:45%">
+                                                                          <input matInput placeholder="Specify Asset Owned Name" formControlName="business_name_of_the_other_owner" autocomplete="off">
+
+                                                                            </mat-form-field>
                                                                         </div>
                                                                     
                                                               
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.ts
index cd9c51767..aeaa4a3c8 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.ts
@@ -22,6 +22,7 @@ import {
 } from '@angular/material';
 /** Service */
 import { PdTrigerService } from '../../../../../pd-service/pd-triger.service';
+import { element } from '@angular/core/src/render3/instructions';
 @Component({
   selector: 'app-assets-info',
   templateUrl: './assets-info.component.html',
@@ -184,6 +185,8 @@ public m_investmentType = [];
 
   private notifier: NotifierService;
   existCompanyList: any =[];
+  mergeCompanyApplicant: any=[];
+  
   constructor(
     notifier: NotifierService,
     private _formBuilder: FormBuilder,
@@ -224,6 +227,24 @@ public m_investmentType = [];
           if(data.dataStatus){
               this.existCompanyList = data.records.filter(val =>val.is_active);
           }
+
+          let modifyCompanyList : any=[];
+          if(this.existCompanyList.length>0){
+             modifyCompanyList = this.existCompanyList.map(element => {
+               return {id:element.company_order_id.toString(),name:element.company_name,group_id:1};
+             });
+             this.mergeCompanyApplicant.push({groupName:'COMPANIES',groupValues:modifyCompanyList})
+
+          }
+    
+          let modifyApplicantList: any=[];
+          if(this.applicants.length > 0){
+            modifyApplicantList = this.applicants.map(element => {
+              return {id:element.pd_co_applicant_id,name:element.applicant_name,group_id:2};
+            });
+            this.mergeCompanyApplicant.push({groupName:'APPLICANTS',groupValues:modifyApplicantList})
+
+          }
       })
 
         this.getPdSupplierFormDetails();
@@ -315,8 +336,6 @@ public m_investmentType = [];
   getPdSupplierFormDetails() {
     this.pdTrigerService.getPDFormDetailsWithID(this.pdid, '4').subscribe(
       data => {
-        console.log(data);
-        console.log(data.records);
         if (data) {
           if (data.dataStatus) {
             this.formLoadData(data.records);
@@ -332,7 +351,6 @@ public m_investmentType = [];
   }
 
   formLoadData(val) {
-    console.log(val);
     if (val !== null) {
       let value = val;
       this._assetsQuesFrom = this._formBuilder.group({
@@ -394,6 +412,7 @@ public m_investmentType = [];
       business_details: this._formBuilder.array([]),
       business_approximate_market_value: [''],
       business_name_of_the_owner: [],
+      business_name_of_the_owner_other: [],
       //other_owner:[''],
       //relation:[''],
       business_purchase_year: ['',Validators.compose([Validators.minLength(4),Validators.maxLength(4)])],
@@ -656,7 +675,7 @@ public m_investmentType = [];
       business_details: this._formBuilder.array([]),
       business_approximate_market_value: [data.business_approximate_market_value],
       business_name_of_the_owner: [data.business_name_of_the_owner],
-      // other_owner:[data.other_owner || ''],
+      business_name_of_the_other_owner:[data.business_name_of_the_other_owner || ''],
       // relation: [data.relation || ''],
       business_purchase_year: [data. business_purchase_year],
       // purchase_month: [data.purchase_month],
@@ -670,7 +689,6 @@ public m_investmentType = [];
 
   loadDetails: boolean;
   addAssetsDetailsWithData(supp_data) {
-    //console.log(supp_data);
     var result = Object.keys(supp_data).map(function (key) {
       return supp_data[key];
     });
@@ -721,7 +739,7 @@ public m_investmentType = [];
           business_assets_mode: val.business_assets_mode,
           business_approximate_market_value: val.business_approximate_market_value,
           business_name_of_the_owner: val.business_name_of_the_owner,
-          // other_owner: val.other_owner,
+          business_name_of_the_other_owner: val.business_name_of_the_other_owner,
           // relation : val.relation,
           business_purchase_year: val. business_purchase_year,
           // purchase_month: val.purchase_month,
@@ -949,8 +967,6 @@ public m_investmentType = [];
 
   /** Add More Asset using Flag Both "Other Asset" And "Business Asset" */
   addAssetDetails(e,flag) {
-    // console.log(flag);
-    // console.log(e);
     if(flag == 1){
     const control = <FormArray>this._assetsQuesFrom.controls['assets_details'];
     control.push(this.initDetails());
@@ -994,9 +1010,26 @@ public m_investmentType = [];
     }
   }
 
+  // compare objects for merge two master table details
+  compareObjects(o1: any, o2: any) {
+    if(o1.id == o2.id && o1.group_id == o2.group_id)
+    return true;
+    else return false
+  }
+
+  // check others
+  checkOthers(values){
+    if(values!=null) {
+      return values.id==0 ? true : false;
+    }
+    else {
+      return false;
+    }
+   
+  }
+
   /** To Save/Edited Popup Data */
   onSubmit() {
-    console.log(this._assetsQuesFrom.value);
     this.submitted = true;
     
     // stop here if form is invalid
@@ -1025,7 +1058,6 @@ public m_investmentType = [];
           val.business_elapsed_tenure = '';
         }
       });
-console.log(answerFormValues);
       // Save the data with help of Service 
       this.pdTrigerService.savePDFormDetailsWithID(answerFormValues).subscribe(
         dataresult => {
@@ -1067,7 +1099,6 @@ console.log(answerFormValues);
   loanTenureCalc(details ,flag)
   {
     if(flag == 1){
-    //console.log(details.value);    
     let ElapsedValues;
     
     if(details.value.original_loan_tenure != null && details.value.original_loan_tenure != '' && details.value.balance_tenure != null && details.value.balance_tenure != ''){

From b86a7db1103744f8cd6fdecc90d404ab4a45aed2 Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Wed, 9 Jan 2019 20:05:24 +0530
Subject: [PATCH 2/2] merge : kms

---
 .../list-pd/add-pd/add-pd.component.html      | 31 +++++++++++++------
 .../client-info/client-info.component.html    | 16 +++++-----
 .../financial-info.component.html             | 14 +++++----
 .../start-pd/forms/stock/stock.component.html |  8 ++---
 .../supplier-info.component.html              | 10 +++---
 5 files changed, 47 insertions(+), 32 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 47e5a08f1..969ee93fc 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
@@ -15,7 +15,7 @@
                          </mat-card-title>
                      </mat-card-header>
                      <mat-card-content>
-                       <mat-form-field style="width: 32%">
+                       <mat-form-field style="width: 28%">
                             <mat-select placeholder="Lender Name" formControlName="fk_lender_id">
                                     <!-- (selectionChange)="getBillingDetails(pdMain.fk_lender_id.value)" -->
                                     <mat-option>
@@ -26,7 +26,7 @@
                                     </mat-option>
                             </mat-select>
                             </mat-form-field>
-                              <mat-form-field style="width: 32%">
+                              <mat-form-field style="width: 28%">
                             <mat-select placeholder="Branch"  formControlName="pd_branch_id">
                                     <!-- (selectionChange)="getBillingDetails(pdMain.fk_lender_id.value)" -->
                                     <mat-option>
@@ -38,15 +38,17 @@
                             </mat-select>
                             </mat-form-field>
         
-            <mat-form-field style="width: 32%">
+            <mat-form-field style="width: 28%">
                         <input matInput autocomplete="off" placeholder="Lender Applicant ID" formControlName="lender_applicant_id" type="text" required>
                         <!-- <mat-error *ngIf="pdMain.lender_applicant_id.hasError('required')">Applicant ID Required</mat-error> -->
                 </mat-form-field>
               
-                <mat-form-field style="width: 32%">
+                <mat-form-field style="width: 28%">
                     <input matInput autocomplete="off" placeholder="Lender Contact Person" formControlName="lender_contact_person" type="text" required>
                     <!-- <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">
 
             
             <mat-form-field style="width: 32%">
@@ -54,7 +56,18 @@
                 <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 style="width: 32%">
+        
+        <mat-form-field style="width: 8%">
+                                        <input matInput autocomplete="off" placeholder="STD Code" formControlName="stdcode" type="text" (keypress)="keyPress($event)">
+                                        <span matPrefix>+91</span>
+                                        <mat-error *ngIf="pdMain.stdcode.hasError('maxlength') || pdMain.stdcode.hasError('minlength')">Enter Valid STD Code Number. </mat-error>  
+                                    </mat-form-field> -
+                                    <mat-form-field style="width: 17%">
+                                        <input matInput autocomplete="off" placeholder="Landline Number" formControlName="lender_contact_mobile" type="text" (keypress)="keyPress($event)" maxlength="10">
+                                        <mat-error *ngIf="pdMain.lender_contact_mobile.hasError('pattern') || pdMain.lender_contact_mobile.hasError('maxlength') || pdMain.lender_contact_mobile.hasError('minlength')">Enter Valid  LandLine Number. </mat-error>  
+                                    </mat-form-field>
+       
+        <mat-form-field style="width: 28%">
                 <mat-select  placeholder="Product Name" formControlName="fk_product_id" (selectionChange)="getSubproductList(pdMain.fk_product_id.value)">
                         <mat-option>
                                 Select
@@ -67,7 +80,7 @@
                 <!-- <mat-error *ngIf="pdMain.fk_product_id.hasError('required')">Product Required.</mat-error> -->
         </mat-form-field>
     
-        <mat-form-field style="width: 32%">
+        <mat-form-field style="width: 28%">
     
                         <mat-select  placeholder="Sub Product Name" formControlName="fk_subproduct_id">
                                 <mat-option>
@@ -82,7 +95,7 @@
     
                 </mat-form-field>   
                 <!-- {{customerSegmentList | json}} -->
-                <mat-form-field style="width: 32%">
+                <mat-form-field style="width: 28%">
                     <mat-select  placeholder="Customer Segment" formControlName="fk_customer_segment">
                             <mat-option>
                                     Select
@@ -93,7 +106,7 @@
                     </mat-select>
                     <!-- <mat-error *ngIf="pdMain.fk_customer_segment.hasError('required')">Customer Segment Required.</mat-error> -->
                 </mat-form-field>    
-                <mat-form-field style="width: 32%">
+                <mat-form-field style="width: 28%">
                     <mat-select  placeholder="PD Type" formControlName="fk_pd_type">
                             <mat-option>
                                     Select
@@ -107,7 +120,7 @@
                     <!-- <mat-error *ngIf="pdMain.fk_pd_type.hasError('required')">PD Type Required.</mat-error> -->
     
             </mat-form-field>
-            <mat-form-field style="width: 32%">
+            <mat-form-field style="width: 28%">
                             <input matInput autocomplete="off" placeholder="Loan Amount" formControlName="loan_amount" (keypress)="keyPress($event)" (keyup)="inWords($event,1)" required autocomplete="off">
                             <mat-hint align="start" style="font-size:70%" *ngIf="pdMain.loan_amount.value">{{"&#8377;"}} {{loanAmtInWords}} Only</mat-hint>
                             <!-- <mat-error *ngIf="pdMain.loan_amount.hasError('required')">Amount Required.</mat-error> -->
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.html
index f7f4bb755..e66657954 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.html
@@ -15,7 +15,7 @@
                         <div formArrayName="main_raw_materials">
                             <div *ngFor="let items of item.controls.main_raw_materials['controls']; let l=index" [formGroupName]="l">
                                 <mat-card style="margin: 12px;">
-                                    <h6 style="margin: 12px;padding:10px !important;">Raw Material #{{l+1}}</h6>
+                                    <h6 style="margin: 12px;padding:10px !important;">Product #{{l+1}}</h6>
                                     <div fxLayout="row wrap" fxLayoutGap="2px" fxLayoutAlign="start none">
                                       <!--<pre>{{m_manufacturingProducts[0] | json}}</pre>-->
                                         <mat-form-field style="width:30%">
@@ -94,7 +94,7 @@
                                     </div>
                                     <div fxLayout="row wrap" fxLayoutGap="2px" fxLayoutAlign="start none">
                                         <mat-form-field style="width: 30%">
-                                            <input matInput placeholder="Contact Person Mobile Number" formControlName="trade_product_contact_person_mobile_number">
+                                            <input matInput placeholder="Contact Person Mobile Number" formControlName="trade_product_contact_person_mobile_number" (keypress)="keyPress($event)">
                                         </mat-form-field>
                                         <mat-form-field style="width: 30%">
                                             <mat-select placeholder="Payment Type" formControlName="trade_product_payment_type">
@@ -128,16 +128,16 @@
             </mat-card>
             <!--===========================: service provider details : START-->
             <mat-card *ngIf="serviceProviderForm">
-                <h5 style="margin: 12px;padding:10px !important;">Service Provider Product Details</h5>
+                <!--<h5 style="margin: 12px;padding:10px !important;">Service Provider Product Details</h5>-->
                 <div formArrayName="service_provider_details">
                     <div *ngFor="let item of _supplierQuesFrom.controls.service_provider_details['controls']; let i=index" [formGroupName]="i">
                         <div formArrayName="service_products">
                             <div *ngFor="let items of item.controls.service_products['controls']; let l=index" [formGroupName]="l">
                                 <mat-card style="margin: 12px;">
-                                    <h6 style="margin: 12px;padding:10px !important;">Service Provider Product #{{l+1}}</h6>
+                                    <h6 style="margin: 12px;padding:10px !important;">Service Provided #{{l+1}}</h6>
                                     <div fxLayout="row wrap" fxLayoutGap="2px" fxLayoutAlign="start none">
                                         <mat-form-field style="width: 100%">
-                                            <mat-select placeholder="Service Provider Product Name" formControlName="service_provider_product_name">
+                                            <mat-select placeholder="Select the Service Provided" formControlName="service_provider_product_name">
                                                 <mat-option *ngFor="let pm of m_suplierProducts[0]" [value]="pm.name">{{ pm.name }}</mat-option>
                                             </mat-select>
                                         </mat-form-field>
@@ -174,7 +174,7 @@
                         </div>
                         <div>
                             <mat-form-field style="width: 100%">
-                                <input matInput placeholder="% of total service provider products credit values" formControlName="service_products_total_payments_percent_on_credit"
+                                <input matInput placeholder="What % of total services provided are on credit?" formControlName="service_products_total_payments_percent_on_credit"
                                     type="number">
                             </mat-form-field>
                             <div fxFlex="100" align="end">
@@ -207,5 +207,5 @@
 <div *ngIf="!noRecordsFound">
    <div style="margin: 12px; font-size: 18px;"> {{ errorMessage }} </div>
 </div>
-<!--
-<notifier-container></notifier-container>-->
\ No newline at end of file
+
+<notifier-container></notifier-container>
\ 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 3da828bb1..9dab22634 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html
@@ -25,7 +25,7 @@
 
                                                     <div style="width:100%">
                                                         <mat-form-field style="width:35%">
-                                                            <mat-label>Starting Financial Year</mat-label>
+                                                            <mat-label>Enter year from which financials provided</mat-label>
                                                             <input matInput autocomplete="off" placeholder="YYYY eg.2018" formControlName="staring_financial_year" (keypress)="keyPress($event)" [readonly]="isReadOnly">
                                                             <mat-error> Invalid year format</mat-error>
                                                         </mat-form-field>
@@ -125,10 +125,7 @@
                                                                         </mat-form-field>
                                                                 </span>
                                                     
-                                                                <mat-form-field *ngIf="i != 0 && customerCommentsFlag" style="width:65%">
-                                                                    <!-- <input matInput autocomplete="off" placeholder="Reason For Major Difference" formControlName="financial_reason" > -->
-                                                                    <input matInput autocomplete="off" placeholder="Customer Comments on variances in Financials" formControlName="financial_reason" >
-                                                                </mat-form-field>
+                                                                
                                         
                                                                 <!-- <button type="button" mat-raised-button mat-icon-button (click)="addDate()"
                                                                 matTooltip="Add More Financial Statements" matTooltipPosition="above" class="mr-1 mb-1 hover-icon" color="primary" *ngIf="i==0">
@@ -139,8 +136,13 @@
                                                                     <mat-icon>delete</mat-icon>
                                                                 </button> -->
                                                             </mat-card-content>
+
                                                         </div>
                                                     </div>
+                                                    <mat-form-field *ngIf="i != 0 && customerCommentsFlag" style="width:65%">
+                                                                    <!-- <input matInput autocomplete="off" placeholder="Reason For Major Difference" formControlName="financial_reason" > -->
+                                                                    <input matInput autocomplete="off" placeholder="Customer Comments on Financials" formControlName="financial_reason" >
+                                                                </mat-form-field>
                                                 </mat-card>
                                     </div>
                                     </div>
@@ -149,7 +151,7 @@
                                                    <!-- start co applicant form details -->                 
                                                    <mat-card>
                                                         <mat-card-header>
-                                                                <mat-card-title><p> Actual Values as per Customer</p></mat-card-title>
+                                                                <mat-card-title><p> Financial as per Customer</p></mat-card-title>
                                                         </mat-card-header>
 
                                                             <mat-form-field *ngIf="total_financial_year != ''" style="width:35%">
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 7aa145080..866d610e5 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html
@@ -111,7 +111,7 @@
                                                             <mat-hint align="start" style="font-size:70%" *ngIf="mfg.get('finished_goods_value').value != ''">{{"&#8377;"}} {{M_financialGoodsValueInWords[b]}} Only</mat-hint> 
                                                         </mat-form-field>
                                                         <mat-form-field style="width:90%">
-                                                            <mat-select placeholder="Is the stock of finished goods observed ?" formControlName="is_sufficiant_goods"  >
+                                                            <mat-select placeholder="Is the stock of Finished Goods Observed sufficient considering the size of operations?" formControlName="is_sufficiant_goods"  >
                                                                 <mat-option value="yes" >Yes</mat-option>
                                                                 <mat-option value="no" >No</mat-option>
                                                             </mat-select>
@@ -229,7 +229,7 @@
                                                         </mat-form-field>
                                                         <mat-form-field style="width:90%">
                                                         
-                                                            <mat-select placeholder="Is the stock of finished goods observed ?" formControlName="is_sufficiant_goods"  >
+                                                            <mat-select placeholder="Is the stock of Finished Goods Observed sufficient considering the size of operations?" formControlName="is_sufficiant_goods"  >
                                                                <mat-option value="yes" >Yes</mat-option>
                                                                <mat-option value="no" >No</mat-option>
                                                             </mat-select>
@@ -348,7 +348,7 @@
                                                         </mat-form-field>
                                                         <mat-form-field style="width:90%">
                                                         
-                                                            <mat-select placeholder="Is the stock of finished goods observed ?" formControlName="is_sufficiant_goods"  >
+                                                            <mat-select placeholder="Is the stock of Finished Goods Observed sufficient considering the size of operations?" formControlName="is_sufficiant_goods"  >
                                                                                         <mat-option value="yes" >Yes</mat-option>
                                                                                         <mat-option value="no" >No</mat-option>
                                                             </mat-select>
@@ -560,7 +560,7 @@
 </form>
 </div>
 
-<!-- <notifier-container></notifier-container> -->
+ <notifier-container></notifier-container> 
 <!-- <mat-card style="padding: 12px;">
 <p>Stock Details</p>
 <form [formGroup]="stockForms" class="address"> -->
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 b79948469..b5fa4f3c6 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.html
@@ -50,7 +50,7 @@
                         </div>
                         <div>
                             <mat-form-field style="width: 100%">
-                                <input matInput placeholder="% of total manufacturing raw materials credit values" formControlName="main_raw_materials_total_payments_percent_on_credit"
+                                <input matInput placeholder="What % of total purchase is done on Credit?" formControlName="main_raw_materials_total_payments_percent_on_credit"
                                     type="number">
                             </mat-form-field>
                             <div fxFlex="100" align="end">
@@ -77,12 +77,12 @@
                                             <input matInput placeholder="Supplier Name" formControlName="trade_supplier_name">
                                         </mat-form-field>
                                         <mat-form-field style="width: 30%">
-                                            <input matInput placeholder="Contact Person Name" formControlName="trade_product_contact_person_name">
+                                            <input matInput placeholder="Contact Person Name" formControlName="trade_product_contact_person_name" maxlength="10">
                                         </mat-form-field>
                                     </div>
                                     <div fxLayout="row wrap" fxLayoutGap="2px" fxLayoutAlign="start none">
                                         <mat-form-field style="width: 30%">
-                                            <input matInput placeholder="Contact Person Mobile Number" formControlName="trade_product_contact_person_mobile_number">
+                                            <input matInput placeholder="Contact Person Mobile Number" formControlName="trade_product_contact_person_mobile_number" (keypress)="keyPress($event)">
                                         </mat-form-field>
                                         <mat-form-field style="width: 30%">
                                             <mat-select (selectionChange)="selectedPM($event)" placeholder="Payment Type" formControlName="trade_product_payment_type">
@@ -135,5 +135,5 @@
 <div *ngIf="!noRecordsFound">
    <div style="margin: 12px; font-size: 18px;"> {{ errorMessage }} </div>
 </div>
-<!--
-<notifier-container></notifier-container>-->
\ No newline at end of file
+
+<notifier-container></notifier-container>
\ No newline at end of file