From 98d18945e968f57417791378f784487352be98fd Mon Sep 17 00:00:00 2001
From: saravanakumarkandasami <saravanakumar.k@venbainfotech.com>
Date: Mon, 19 Nov 2018 17:52:57 +0530
Subject: [PATCH] Form validation

---
 .../banking-details.component.html            | 18 +++++------
 .../banking-details.component.ts              |  9 ++++++
 .../current-loan/current-loan.component.html  | 16 +++++-----
 .../current-loan/current-loan.component.ts    |  9 ++++++
 .../employment-info.component.html            | 32 +++++++++----------
 .../employment-info.component.ts              |  9 ++++++
 .../loan-details/loan-details.component.html  | 30 ++++++++---------
 .../loan-details/loan-details.component.ts    |  9 ++++++
 .../other-income/other-income.component.html  |  8 ++---
 .../other-income/other-income.component.ts    | 10 ++++++
 .../start-pd/forms/stock/stock.component.html | 24 +++++++-------
 .../start-pd/forms/stock/stock.component.ts   |  9 ++++++
 12 files changed, 119 insertions(+), 64 deletions(-)

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 910aa3602..9cc8986b0 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
@@ -85,14 +85,14 @@
                                 </mat-expansion-panel-header>
                                 <mat-form-field>
                                     <input matInput placeholder="Applicant Name"
-                                           formControlName="applicant_name">
+                                           formControlName="applicant_name" required>
                                 </mat-form-field>
                                 <mat-form-field>
-                                    <input matInput placeholder="Bank Name" formControlName="bank_name">
+                                    <input matInput placeholder="Bank Name" formControlName="bank_name" required>
                                 </mat-form-field>
                 
                                 <mat-form-field>
-                                    <mat-select placeholder="Account Type" formControlName="account_type">
+                                    <mat-select placeholder="Account Type" formControlName="account_type" required>
                                     <mat-option *ngFor="let prop of m_accountType" [value]="prop.id">{{ prop.name }}</mat-option>
                                   </mat-select>
                                     <!--<mat-select placeholder="Account Type"
@@ -107,26 +107,26 @@
                 
                                 <mat-form-field>
                                     <mat-select placeholder="Salary Credited in this account"
-                                                formControlName="salary">
+                                                formControlName="salary" required>
                                         <mat-option value="Yes">Yes</mat-option>
                                         <mat-option value="No">No</mat-option>
                                         <mat-option value="NA">NA</mat-option>
-                                    </mat-select>
+                                    </mat-select> 
                                 </mat-form-field>
                                 <mat-form-field>
                                     <input matInput placeholder="Limit in case of OD / CC account"
-                                           formControlName="limit">
+                                           formControlName="limit" (keypress)="keyPress($event)" required>
                                 </mat-form-field>
                                 <mat-form-field>
                                     <mat-select placeholder="Is this the main business account"
-                                                formControlName="is_main">
+                                                formControlName="is_main" required>
                                         <mat-option value="Yes">Yes</mat-option>
                                         <mat-option value="No">No</mat-option>
                                     </mat-select>
                                 </mat-form-field>
                                 <mat-form-field>
                                     <input matInput placeholder="Approximate Vintage"
-                                           formControlName="vintage">
+                                           formControlName="vintage" required>
                                 </mat-form-field>
                                 <button *ngIf="i > 0" mat-raised-button mat-icon-button matTooltip="Delete" matTooltipPosition="above"  (click)="deleteBankdetails(i)">
                                         <mat-icon  >delete</mat-icon>
@@ -142,7 +142,7 @@
                             <div fxFlex="60" class="pb-0 text-sm-left">
                               <mat-form-field appearance="outline" style="width: 100%">
                                 <mat-label>Remarks</mat-label>
-                                <textarea matInput placeholder="Remarks" formControlName="banking_form_remark"></textarea>
+                                <textarea matInput placeholder="Remarks" formControlName="banking_form_remark" required></textarea>
                               </mat-form-field>
                             </div>
                           </div>
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.ts
index 08279586e..c83c49c1e 100644
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.ts
@@ -150,4 +150,13 @@ export class BankingDetailsComponent implements OnInit {
             }
         });
     }
+    /** On Key Press Event For Numbers  */
+    keyPress(event: any) {
+        const pattern = /[0-9]/;
+    
+        let inputChar = String.fromCharCode(event.charCode);
+        if (event.keyCode != 8 && !pattern.test(inputChar)) {
+          event.preventDefault();
+        }
+      }
 }
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 ec2f92b62..d3ce744d2 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
@@ -4,7 +4,7 @@
             <form [formGroup]="currentLoanForm" class="address">
                 <mat-form-field>
                     <mat-select  (selectionChange)="selectedLoanChanges($event)" placeholder="Do you have any other existing loan"
-                                formControlName="existing_loan">
+                                formControlName="existing_loan" required>
                         <mat-option value="Yes">Yes</mat-option>
                         <mat-option value="No">No</mat-option>
                     </mat-select>
@@ -18,22 +18,22 @@
                              [formGroupName]="i">
                             <mat-card-content class="matcard">
                                 <mat-form-field>
-                                    <input matInput placeholder="Loan Amount" formControlName="loan_amount">
+                                    <input matInput placeholder="Loan Amount" formControlName="loan_amount" (keypress)="keyPress($event)" required>
                                 </mat-form-field>
                                 <mat-form-field>
-                                    <input matInput placeholder="EMI" formControlName="emi">
+                                    <input matInput placeholder="EMI" formControlName="emi" (keypress)="keyPress($event)" required>
                                 </mat-form-field>
                                 <mat-form-field>
-                                    <input matInput placeholder="Loan Type" formControlName="loan_type">
+                                    <input matInput placeholder="Loan Type" formControlName="loan_type" required>
                                 </mat-form-field>
                                 <mat-form-field>
-                                    <input matInput placeholder="Lender" formControlName="lender">
+                                    <input matInput placeholder="Lender" formControlName="lender" required>
                                 </mat-form-field>
                                 <mat-form-field>
-                                    <input matInput placeholder="Original Tenure in Months" formControlName="original_tenure">
+                                    <input matInput placeholder="Original Tenure in Months" formControlName="original_tenure" required>
                                 </mat-form-field>
                                 <mat-form-field>
-                                    <input matInput placeholder="Current Balance Tenure in Months" formControlName="current_balance_tenure">
+                                    <input matInput placeholder="Current Balance Tenure in Months" formControlName="current_balance_tenure" required>
                                 </mat-form-field>
                                 <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">
@@ -51,7 +51,7 @@
                     <div fxFlex="60" class="pb-0 text-sm-left">
                         <mat-form-field appearance="outline" style="width: 100%">
                             <mat-label>Remarks</mat-label>
-                            <textarea matInput placeholder="Remarks" formControlName="currentloan_remarks"></textarea>
+                            <textarea matInput placeholder="Remarks" formControlName="currentloan_remarks" required></textarea>
                         </mat-form-field>
                     </div>
                 </div>
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.ts
index 99521e2a6..78dd06331 100644
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.ts
@@ -138,4 +138,13 @@ export class CurrentLoanComponent implements OnInit {
             }
         });
     }
+    /** On Key Press Event For Amount  */
+    keyPress(event: any) {
+        const pattern = /[0-9]/;
+    
+        let inputChar = String.fromCharCode(event.charCode);
+        if (event.keyCode != 8 && !pattern.test(inputChar)) {
+          event.preventDefault();
+        }
+      }
 }
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 6ace32f28..761f49237 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
@@ -2,55 +2,55 @@
     <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" required>
     </mat-form-field>
     <div>
         <label>Since how long working with this employer?</label>
         <br>
         <div fxLayout="row" fxLayoutGap="2px" fxLayoutAlign="start none">
             <mat-form-field>
-                <input matInput type="number" placeholder="Year" formControlName="how_long_year">
+                <input matInput type="number" placeholder="Year" formControlName="how_long_year" required>
             </mat-form-field>
             <mat-form-field>
-                <input matInput type="number" placeholder="Month" formControlName="how_long_month">
+                <input matInput type="number" placeholder="Month" formControlName="how_long_month" required>
             </mat-form-field>
         </div>
     </div>
     <mat-form-field *ngIf="pd_cus_segment!='SAL-CHQ'">
         <mat-select placeholder="Was the employer met?"
-                    formControlName="was_met">
+                    formControlName="was_met" required>
             <mat-option value="yes">Yes</mat-option>
             <mat-option value="no">No</mat-option>
         </mat-select>
     </mat-form-field>
     <div fxLayout="row" fxLayoutGap="2px" fxLayoutAlign="start none" *ngIf="employmentForm.controls['was_met'].value == 'yes'">
-        <mat-form-field>
-            <input matInput placeholder="Name of person met" formControlName="name_person_met">
+        <mat-form-field fxFlex="50">
+            <input matInput placeholder="Name of Person Met" formControlName="name_person_met" required>
         </mat-form-field>
-        <mat-form-field>
-            <input matInput placeholder="Designation of person met" formControlName="designation_person_met">
+        <mat-form-field fxFlex="50">
+            <input matInput placeholder="Designation of Person Met" formControlName="designation_person_met" required>
         </mat-form-field>
     </div>
     <mat-form-field *ngIf="pd_cus_segment!='SAL-CHQ'">
         <mat-select placeholder="Salary amount confirmed ?"
-                    formControlName="confirm_salary">
+                    formControlName="confirm_salary" required>
             <mat-option value="yes">Yes</mat-option>
             <mat-option value="no">No</mat-option>
         </mat-select>
     </mat-form-field>
     <mat-form-field *ngIf="employmentForm.controls['confirm_salary'].value == 'yes'">
-        <input matInput placeholder="What is the salary amount confirmed?" formControlName="confirm_salary_amount">
+        <input matInput placeholder="What is the salary amount confirmed?" formControlName="confirm_salary_amount" (keypress)="keyPress($event)">
     </mat-form-field>
     <mat-form-field *ngIf="pd_cus_segment!='SAL-CHQ'">
         <mat-select placeholder="Attendance register  seen ?"
-                    formControlName="attendance_seen">
+                    formControlName="attendance_seen" required>
             <mat-option value="yes">Yes</mat-option>
             <mat-option value="no">No</mat-option>
         </mat-select>
     </mat-form-field>
     <mat-form-field *ngIf="pd_cus_segment!='SAL-CHQ'">
         <mat-select placeholder="Salary register  seen ?"
-                    formControlName="sal_reg_seen">
+                    formControlName="sal_reg_seen" required>
             <mat-option value="yes">Yes</mat-option>
             <mat-option value="no">No</mat-option>
         </mat-select>
@@ -61,18 +61,18 @@
         </mat-card-header>
         <mat-card-content class="matcard">
             <mat-form-field>
-                <input matInput placeholder="Gross Monthly Salary" formControlName="gross_monthly_salary">
+                <input matInput placeholder="Gross Monthly Salary" formControlName="gross_monthly_salary" (keypress)="keyPress($event)" required>
             </mat-form-field>
 
             <mat-form-field>
                 <input matInput placeholder="Net Monthly Salary"
-                       formControlName="net_monthly_salary">
+                       formControlName="net_monthly_salary" (keypress)="keyPress($event)" required>
                 <!-- <input matInput placeholder="Net Take Home"
                        formControlName="net_take_home"> -->
             </mat-form-field>
             <mat-form-field>
                 <input matInput placeholder="Bonus or Incentive"
-                       formControlName="bonus_incentive">
+                       formControlName="bonus_incentive" (keypress)="keyPress($event)" required>
             </mat-form-field>
              <mat-form-field>
                 <input matInput placeholder="Any Delays"
@@ -84,7 +84,7 @@
         <div fxFlex="60" class="pb-0 text-sm-left">
             <mat-form-field appearance="outline" style="width: 100%">
                 <mat-label>Remarks</mat-label>
-                <textarea matInput placeholder="Remarks" formControlName="employment_remarks"></textarea>
+                <textarea matInput placeholder="Remarks" formControlName="employment_remarks" required></textarea>
             </mat-form-field>
         </div>
     </div>
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.ts
index 119ac1e7a..16186a06e 100644
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.ts
@@ -128,5 +128,14 @@ export class EmploymentInfoComponent implements OnInit {
             this.notifier.notify('warning', 'Something Wents Wrong Try Again.!');
         })
     }
+    /** On Key Press Event For Numbers  */
+    keyPress(event: any) {
+        const pattern = /[0-9]/;
+    
+        let inputChar = String.fromCharCode(event.charCode);
+        if (event.keyCode != 8 && !pattern.test(inputChar)) {
+          event.preventDefault();
+        }
+      }
 
 }
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 db7dbacfa..f8d933f6f 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
@@ -2,10 +2,10 @@
     <p>Loan Details</p>
 <form [formGroup]="loanDetailsForm" class="address">
     <mat-form-field>
-        <input matInput placeholder="Loan Amount Applied" formControlName="loan_amount">
+        <input matInput placeholder="Loan Amount Applied" formControlName="loan_amount" (keypress)="keyPress($event)" required >
     </mat-form-field>
     <mat-form-field>
-        <mat-select multiple (selectionChange)="endUserChange($event)" placeholder="What is the end use" formControlName="end_use">
+        <mat-select multiple (selectionChange)="endUserChange($event)" placeholder="What is the end use" formControlName="end_use" required>
             <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"
@@ -25,34 +25,34 @@
     </mat-form-field>
     <mat-form-field>
         <mat-select placeholder="Is there a balance transfer"
-                    formControlName="is_transfer">
+                    formControlName="is_transfer" required>
             <mat-option value="yes">Yes</mat-option>
             <mat-option value="no">No</mat-option>
         </mat-select>
     </mat-form-field>
     
     <mat-form-field *ngIf="loanDetailsForm.controls['is_transfer'].value == 'yes'">
-            <input matInput placeholder="Balance Transfer Amount" formControlName="balance_transfer_amount">
+            <input matInput placeholder="Balance Transfer Amount" (keypress)="keyPress($event)" formControlName="balance_transfer_amount">
         </mat-form-field>
     <mat-form-field *ngIf="loanDetailsForm.controls['is_transfer'].value == 'yes'">
         <mat-select  placeholder="Is there a Top Up"
-                    formControlName="is_topup">
+                    formControlName="is_topup" required> 
             <mat-option value="yes">Yes</mat-option>
             <mat-option value="no">No</mat-option>
         </mat-select>
     </mat-form-field>
     <mat-form-field  *ngIf="loanDetailsForm.controls['is_transfer'].value == 'yes' && loanDetailsForm.controls['is_topup'].value == 'yes'">
-        <input matInput placeholder="Top Up Amt" formControlName="topup_amount">
+        <input matInput placeholder="Top Up Amt" (keypress)="keyPress($event)" formControlName="topup_amount">
     </mat-form-field>
     <mat-form-field *ngIf="loanDetailsForm.controls['is_transfer'].value == 'yes'">
         <input matInput placeholder="Lender from where balance transfer done" formControlName="lender">
     </mat-form-field>
     <mat-form-field>
-        <input matInput placeholder="Amount of Own Contribution" formControlName="own_contribution">
+        <input matInput placeholder="Amount of Own Contribution" formControlName="own_contribution" (keypress)="keyPress($event)" required> 
     </mat-form-field>
 
     <mat-form-field>
-        <mat-select placeholder="Source" formControlName="source">
+        <mat-select placeholder="Source" formControlName="source" required>
             <mat-option *ngFor="let sour of m_sourceofamount" [value]="sour.id">{{ sour.name }}</mat-option>
         </mat-select>
 
@@ -67,7 +67,7 @@
         <input matInput placeholder="Specify Lender Name and Type" formControlName="lender_name_type">
     </mat-form-field>
     <mat-form-field>
-        <input matInput placeholder="EMI Comfort Level" formControlName="emi_level">
+        <input matInput placeholder="EMI Comfort Level" formControlName="emi_level" (keypress)="keyPress($event)" required>
     </mat-form-field>
     <mat-card>
         <mat-card-header>
@@ -76,7 +76,7 @@
         </mat-card-header>
         <mat-card-content class="matcard">
             <mat-form-field>
-                <mat-select placeholder="Type of Property" formControlName="property_type">
+                <mat-select placeholder="Type of Property" formControlName="property_type" required>
                     <mat-option *ngFor="let typeprop of m_mortageTypeProperty" [value]="typeprop.id">{{ typeprop.name }}</mat-option>
                 </mat-select>
                 
@@ -102,13 +102,13 @@
             </mat-form-field>
             <mat-form-field>
                 <mat-select multiple placeholder="Name of Owner"
-                            formControlName="owner_name" (selectionChange)="ownerNameChange($event)">
+                            formControlName="owner_name" (selectionChange)="ownerNameChange($event)" required>
                     <mat-option value="{{owner.pd_co_applicant_id}}" *ngFor="let owner of applicants">{{owner.applicant_name}}</mat-option>
                 </mat-select>
             </mat-form-field>
             <mat-form-field>
 
-                <mat-select placeholder="Status of Construction" formControlName="construction_status">
+                <mat-select placeholder="Status of Construction" formControlName="construction_status" required>
                     <mat-option *ngFor="let status of m_statusofCunstruction" [value]="status.id">{{ status.name }}</mat-option>
                 </mat-select>
 
@@ -122,11 +122,11 @@
 
             <mat-form-field>
                 <input matInput placeholder="EMV as Per Customer"
-                       formControlName="emv_per_customer">
+                       formControlName="emv_per_customer" (keypress)="keyPress($event)" required>
             </mat-form-field>
             <mat-form-field>
                 <input matInput placeholder="Value as Per Agreement"
-                       formControlName="value_per_agreement">
+                       formControlName="value_per_agreement" (keypress)="keyPress($event)" required>
             </mat-form-field>
         </mat-card-content>
     </mat-card>
@@ -134,7 +134,7 @@
         <div fxFlex="60" class="pb-0 text-sm-left">
             <mat-form-field appearance="outline" style="width: 100%">
                 <mat-label>Remarks</mat-label>
-                <textarea matInput placeholder="Remarks" formControlName="loandetails_remarks"></textarea>
+                <textarea matInput placeholder="Remarks" formControlName="loandetails_remarks" required></textarea>
             </mat-form-field>
         </div>
     </div>
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 4ef4ef4d2..b3733c7af 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
@@ -269,4 +269,13 @@ getM_sourceofamount() {
             }
         });
     }
+     /** On Key Press Event For Amount  */
+     keyPress(event: any) {
+        const pattern = /[0-9]/;
+    
+        let inputChar = String.fromCharCode(event.charCode);
+        if (event.keyCode != 8 && !pattern.test(inputChar)) {
+          event.preventDefault();
+        }
+      }
 }
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 b11c1e4ea..d5a3080f8 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
@@ -65,7 +65,7 @@
                                 <mat-card-content class="matcard">
                                     <mat-form-field>
                                         <mat-select placeholder="Source"
-                                                    formControlName="source">
+                                                    formControlName="source" required>
                                             <mat-option value="rental_income">Rental Income</mat-option>
                                             <mat-option value="interest_income">Interest Income</mat-option>
                                             <mat-option value="agricultural_income">Agricultural Income</mat-option>
@@ -73,10 +73,10 @@
                                         </mat-select>
                                     </mat-form-field>
                                     <mat-form-field>
-                                        <input matInput placeholder="Amount" formControlName="amount">
+                                        <input matInput placeholder="Amount" formControlName="amount" (keypress)="keyPress($event)" required>  
                                     </mat-form-field>
                                     <mat-form-field>
-                                            <mat-select placeholder="Frequency" formControlName="frequency">
+                                            <mat-select placeholder="Frequency" formControlName="frequency" required>
                                                 <mat-option value="{{frq.frequency_id}}" *ngFor="let frq of frequencyData">{{frq.name}}</mat-option>
                                             </mat-select>
                                     </mat-form-field>
@@ -96,7 +96,7 @@
                     <div fxFlex="60" class="pb-0 text-sm-left">
                         <mat-form-field appearance="outline" style="width: 100%">
                             <mat-label>Remarks</mat-label>
-                            <textarea matInput placeholder="Remarks" formControlName="otherincome_remarks"></textarea>
+                            <textarea matInput placeholder="Remarks" formControlName="otherincome_remarks" required></textarea>
                         </mat-form-field>
                     </div>
                 </div>
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.ts
index f21f60196..d03418f98 100644
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.ts
@@ -148,4 +148,14 @@ export class OtherIncomeComponent implements OnInit {
             }
         });
     }
+
+    /** On Key Press Event For Amount  */
+     keyPress(event: any) {
+    const pattern = /[0-9]/;
+
+    let inputChar = String.fromCharCode(event.charCode);
+    if (event.keyCode != 8 && !pattern.test(inputChar)) {
+      event.preventDefault();
+    }
+  }
 }
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 d293f4b58..9dbbffb9d 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
@@ -11,19 +11,19 @@
                  [formGroupName]="i">
                 <mat-card-content class="matcard">
                     <mat-form-field>
-                        <input matInput placeholder="Name" formControlName="raw_name">
+                        <input matInput placeholder="Name" formControlName="raw_name" required>
                     </mat-form-field>
                     <mat-form-field>
-                        <input matInput placeholder="Quantity" formControlName="raw_quantity">
+                        <input matInput placeholder="Quantity" formControlName="raw_quantity" required>
                     </mat-form-field>
                     <mat-form-field>
-                        <input matInput placeholder="Value" formControlName="raw_value">
+                        <input matInput placeholder="Value" formControlName="raw_value" (keypress)="keyPress($event)"  required>
                     </mat-form-field>
                     <mat-form-field style="width:76%">
-                        <input matInput placeholder="Value of raw materials as per financial Statements" formControlName="rawmaterial_value">
+                        <input matInput placeholder="Value of raw materials as per financial Statements" formControlName="rawmaterial_value" (keypress)="keyPress($event)" required>
                     </mat-form-field>
                     <mat-form-field style="width:76%">
-                        <input matInput placeholder="Is the stock of raw materials sufficient ?" formControlName="is_sufficiant_raw">
+                        <input matInput placeholder="Is the stock of raw materials sufficient ?" formControlName="is_sufficiant_raw"  required>
                     </mat-form-field>
 
                     <button type="button" mat-raised-button mat-icon-button (click)="addRawMaterials()"
@@ -47,19 +47,19 @@
                  [formGroupName]="i">
                 <mat-card-content class="matcard">
                     <mat-form-field>
-                        <input matInput placeholder="Name" formControlName="goods_name">
+                        <input matInput placeholder="Name" formControlName="goods_name" required>
                     </mat-form-field>
                     <mat-form-field>
-                        <input matInput placeholder="Quantity" formControlName="goods_quantity">
+                        <input matInput placeholder="Quantity" formControlName="goods_quantity" required>
                     </mat-form-field>
-                    <mat-form-field>
-                        <input matInput placeholder="Value" formControlName="goods_value">
+                    <mat-form-field>  
+                        <input matInput placeholder="Value" formControlName="goods_value" (keypress)="keyPress($event)" required>
                     </mat-form-field>
                     <mat-form-field style="width:76%">
-                        <input matInput placeholder="Value of finished goods as per financial statements" formControlName="finished_goods_value">
+                        <input matInput placeholder="Value of finished goods as per financial statements" formControlName="finished_goods_value" (keypress)="keyPress($event)" required>
                     </mat-form-field>
                     <mat-form-field style="width:76%">
-                        <input matInput placeholder="Is the stock of finished goods sufficient ?" formControlName="is_sufficiant_goods">
+                        <input matInput placeholder="Is the stock of finished goods sufficient ?" formControlName="is_sufficiant_goods" required>
                     </mat-form-field>
 
                     <button type="button" mat-raised-button mat-icon-button (click)="addGoods()"
@@ -80,7 +80,7 @@
                 <mat-label>Remarks</mat-label>
                 <textarea matInput placeholder="Remarks" formControlName="stock_remarks"></textarea>
             </mat-form-field>
-        </div>
+        </div> 
     </div>
     <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>
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.ts
index aaddf2420..bd452b347 100644
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.ts
@@ -148,4 +148,13 @@ export class StockComponent implements OnInit {
             }
         });
     }
+    /** On Key Press Event For Numbers  */
+    keyPress(event: any) {
+        const pattern = /[0-9]/;
+    
+        let inputChar = String.fromCharCode(event.charCode);
+        if (event.keyCode != 8 && !pattern.test(inputChar)) {
+          event.preventDefault();
+        }
+      }
 }