From a932c0207bcaf80f66ee39561c2fe896948a2cde Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Wed, 9 Jan 2019 16:21:08 +0530
Subject: [PATCH 1/2] UI Changes

---
 .../list-pd/add-pd/add-pd.component.html      | 36 +++++++++++--------
 .../client-info/client-info.component.html    | 12 +++----
 .../financial-info.component.html             | 14 ++++----
 .../start-pd/forms/stock/stock.component.html |  6 ++--
 .../supplier-info.component.html              |  6 ++--
 5 files changed, 42 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 9da9d7551..e360db3fa 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,23 +38,31 @@
                             </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: 32%">
-                <input matInput autocomplete="off" placeholder="Lender Contact 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 Mobile Number. </mat-error>  
+                  <mat-form-field style="width: 28%">
+                <input matInput autocomplete="off" placeholder="Lender Mobile Number" formControlName="" type="text"  maxlength="10">
     
         </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 +75,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 +90,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 +101,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 +115,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..58bc4f619 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">
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..7b505e661 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>
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..cc3e58656 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">

From 9b8237ee7bf367b11821480586a751a3a6949b31 Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Wed, 9 Jan 2019 18:14:45 +0530
Subject: [PATCH 2/2] UI Changes

---
 .../start-pd/forms/client-info/client-info.component.html     | 4 ++--
 .../list-pd/start-pd/forms/stock/stock.component.html         | 2 +-
 .../start-pd/forms/supplier-info/supplier-info.component.html | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

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 58bc4f619..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
@@ -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/stock/stock.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html
index 7b505e661..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
@@ -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 cc3e58656..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
@@ -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