From ff347496b13007fc1855a98e70633261f985b1b3 Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Mon, 29 Apr 2019 20:16:06 +0530
Subject: [PATCH] Titlecase applicant : ps

---
 .../assets-info/assets-info.component.html    |  4 +-
 .../banking-details.component.html            |  4 +-
 .../business-assets-info.component.html       | 10 ++--
 .../business-banking-details.component.html   |  4 +-
 .../business-info.component.html              |  2 +-
 .../client-info/client-info.component.html    |  9 ++--
 .../current-loan/current-loan.component.html  |  4 +-
 .../current-loan/current-loan.component.ts    | 23 ++++++--
 ...usiness-other-family-member.component.html |  2 +-
 .../other-applicant-details.component.html    |  2 +-
 .../family-details.component.html             | 10 ++--
 .../final-remarks.component.html              |  6 +--
 .../general-info/general-info.component.html  |  2 +-
 .../neighbour-hood.component.html             | 11 ++--
 .../neighbour-hood.component.ts               | 53 ++++++++++---------
 .../other-income/other-income.component.html  |  6 +--
 .../personal-info.component.html              |  3 +-
 .../supplier-info.component.html              |  5 +-
 ng6-seed/src/environments/environment.ts      |  2 +-
 19 files changed, 93 insertions(+), 69 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 786522a1f..63dad2962 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
@@ -326,14 +326,14 @@
                                     [compareWith]="compareObjects" (selectionChange)="setOtherOwner($event.value,i)">
                                     <mat-optgroup *ngFor="let group of mergeCompanyApplicant" [label]="group.groupName">
                                       <mat-option *ngFor="let val of group.groupValues" [value]="val">
-                                        {{val.name}}
+                                        {{val.group_id != 2 ? val.name : val.name | titlecase}}
                                       </mat-option>
                                     </mat-optgroup>
                                   </mat-select>
                                 </mat-form-field>
 
                                 <mat-form-field *ngIf="isOtherOwner[i]" style="width:45%">
-                                  <input matInput placeholder="Specify Owner Name" formControlName="other_owner"
+                                  <input matInput placeholder="Specify Owner Name" formControlName="other_owner" [value]="sup.get('other_owner').value | titlecase"
                                     autocomplete="off">
                                   <mat-error *ngIf="sup.controls['other_owner'].hasError('required')">Owner Name Required</mat-error>
                                 </mat-form-field>
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 e1cee77d8..c6b8ece55 100755
--- 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
@@ -102,7 +102,7 @@
                                             [compareWith]="compareObjects">
                                             <mat-optgroup *ngFor="let group of mergeCompanyApplicant" [label]="group.groupName">
                                                 <mat-option *ngFor="let val of group.groupValues" [value]="val">
-                                                    {{val.name}}
+                                                    {{val.group_id != 2 ? val.name : val.name | titlecase}}
                                                 </mat-option>
                                             </mat-optgroup>
                                         </mat-select>
@@ -110,7 +110,7 @@
                                     <mat-form-field *ngIf="checkOthers(itemrow.get('applicant_name').value)===true"
                                         style="width:45%">
                                         <input matInput placeholder="Specify Applicant Name" formControlName="other_applicant"
-                                            autocomplete="off">
+                                            autocomplete="off" [value]="itemrow.get('other_applicant').value | titlecase">
                                         <mat-error *ngIf="itemrow.controls['other_applicant'].hasError('required')">Applicant Name Required</mat-error>
                                     </mat-form-field>
 
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.html
index 9bd046f59..7bf29ea3f 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.html
@@ -114,7 +114,7 @@
                               [compareWith]="compareObjects" (selectionChange)="setOtherOwnerOfAddress($event.value,i)">
                               <mat-optgroup *ngFor="let group of mergeCompanyApplicant" [label]="group.groupName">
                                 <mat-option *ngFor="let val of group.groupValues" [value]="val">
-                                  {{val.name}}
+                                  {{val.group_id != 2 ? val.name : val.name | titlecase}}
                                 </mat-option>
                               </mat-optgroup>
                             </mat-select>
@@ -122,8 +122,8 @@
                           </mat-form-field>
 
                           <mat-form-field style="width:45%" *ngIf="isOtherOwnerForAddress[i]">
-                            <input matInput placeholder="Specify Asset Owned Name" formControlName="business_name_of_the_other_owner"
-                              autocomplete="off">
+                            <input matInput placeholder="Specify Asset Owned Name" formControlName="business_name_of_the_other_owner" [value]="itemrow.get('business_name_of_the_other_owner').value | titlecase"
+                              autocomplete="off" >
                               <mat-error *ngIf="itemrow.controls['business_name_of_the_other_owner'].hasError('required')">Asset Owned by Required</mat-error>
                           </mat-form-field>
 
@@ -315,7 +315,7 @@
                                     [compareWith]="compareObjects" (selectionChange)="setOtherOwnerOfAsset($event.value,i)">
                                     <mat-optgroup *ngFor="let group of mergeCompanyApplicant" [label]="group.groupName">
                                       <mat-option *ngFor="let val of group.groupValues" [value]="val">
-                                        {{val.name}}
+                                          {{val.group_id != 2 ? val.name : val.name | titlecase}}
                                       </mat-option>
                                     </mat-optgroup>
                                   </mat-select>
@@ -324,7 +324,7 @@
 
                                 <mat-form-field *ngIf="isOtherOwner[i]" style="width:45%">
                                   <input matInput placeholder="Specify Asset Owned Name" formControlName="business_name_of_the_other_owner"
-                                    autocomplete="off">
+                                    autocomplete="off" [value]="sup.get('business_name_of_the_other_owner').value | titlecase">
                                     <mat-error *ngIf="sup.controls['business_name_of_the_other_owner'].hasError('required')">Asset Owned by is Required</mat-error>
                                 </mat-form-field>
 
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-banking-details/business-banking-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-banking-details/business-banking-details.component.html
index c6df84f1b..a12b47278 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-banking-details/business-banking-details.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-banking-details/business-banking-details.component.html
@@ -35,7 +35,7 @@
                                             [compareWith]="compareObjects">
                                             <mat-optgroup *ngFor="let group of mergeCompanyApplicant" [label]="group.groupName">
                                                 <mat-option *ngFor="let val of group.groupValues" [value]="val">
-                                                    {{val.name}}
+                                                    {{val.group_id != 2 ? val.name : val.name | titlecase}}
                                                 </mat-option>
                                             </mat-optgroup>
                                         </mat-select>
@@ -43,7 +43,7 @@
                                     <mat-form-field *ngIf="checkOthers(itemrow.get('applicant_name').value)===true"
                                         style="width:45%">
                                         <input matInput placeholder="Specify Applicant Name" formControlName="other_applicant"
-                                            autocomplete="off">
+                                            autocomplete="off" [value]="itemrow.get('other_applicant').value | titlecase">
                                         <mat-error *ngIf="itemrow.controls['other_applicant'].hasError('required')">Applicant Name Required</mat-error>
                                     </mat-form-field>
 
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html
index 9c69fc080..e9069d829 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html
@@ -50,7 +50,7 @@
                                             </mat-form-field>
                                             <mat-form-field style="width: 40%;" *ngIf="members.value.partner_name=='Others'">
                                                 <input matInput placeholder="Specify Others" formControlName="partner_other_name"
-                                                    required>
+                                                    required [value]="members.get('partner_other_name').value | titlecase">
                                                 <mat-error *ngIf="members.controls['partner_other_name'].hasError('required')">Name Required</mat-error>
                                             </mat-form-field>
                                             <button type="button" class="mr-1 mb-1 hover-icon" mat-raised-button
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 a93ed0ed7..e423fbdf0 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
@@ -53,7 +53,8 @@
                                             </mat-select>
                                         </mat-form-field>
                                         <mat-form-field style="width: 35%">
-                                            <input matInput placeholder="Client Contact Person Name" formControlName="manufacturing_contact_person_name">
+                                            <input matInput placeholder="Client Contact Person Name" formControlName="manufacturing_contact_person_name"
+                                            [value]="items.get('manufacturing_contact_person_name').value | titlecase">
                                         </mat-form-field>
                                         <mat-form-field style="width: 35%">
                                             <mat-select placeholder="Contact Person Designation" formControlName="person_designation"
@@ -186,7 +187,8 @@
                                             </mat-select>
                                         </mat-form-field>
                                         <mat-form-field style="width: 35%">
-                                            <input matInput placeholder="Client Contact Person Name" formControlName="trade_product_contact_person_name">
+                                            <input matInput placeholder="Client Contact Person Name" formControlName="trade_product_contact_person_name"
+                                            [value]="items.get('trade_product_contact_person_name').value | titlecase">
                                         </mat-form-field>
                                         <mat-form-field style="width: 35%">
                                             <mat-select placeholder="Contact Person Designation" formControlName="person_designation"
@@ -322,7 +324,8 @@
                                             </mat-select>
                                         </mat-form-field>
                                         <mat-form-field style="width: 35%">
-                                            <input matInput placeholder="Client Contact Person Name" formControlName="service_provider_product_contact_person_name">
+                                            <input matInput placeholder="Client Contact Person Name" formControlName="service_provider_product_contact_person_name"
+                                            [value]="items.get('service_provider_product_contact_person_name').value | titlecase">
                                         </mat-form-field>
                                         <mat-form-field style="width: 35%">
                                             <mat-select placeholder="Contact Person Designation" formControlName="person_designation"
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 0eb8db80f..640ec3c97 100755
--- 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
@@ -90,7 +90,7 @@
                                                                 [label]="group.groupName">
                                                                 <mat-option *ngFor="let val of group.groupValues"
                                                                     [value]="val">
-                                                                    {{val.name}}
+                                                                    {{val.group_id != 2 ? val.name : val.name | titlecase}}
                                                                 </mat-option>
                                                             </mat-optgroup>
                                                         </mat-select>
@@ -99,7 +99,7 @@
                                                     <!-- <mat-form-field *ngIf="details.get('loan_taken_by').value == 0">     -->
                                                     <mat-form-field *ngIf="isOtherLoanTakenBy[i]">
                                                         <input matInput autocomplete="off" placeholder="Specify Borrower"
-                                                            formControlName="others_loan_taken">
+                                                            formControlName="others_loan_taken" [value]="details.get('others_loan_taken').value | titlecase">
                                                         <mat-error *ngIf="details.controls['others_loan_taken'].hasError('required')">Borrower Required</mat-error>
                                                     </mat-form-field>
 
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 7c61a8032..0d12f92e4 100755
--- 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
@@ -274,7 +274,8 @@ export class CurrentLoanComponent implements OnInit {
                                         if (val.owner_name.length > 0) {
                                             owner = val.owner_name.map((e => {
                                                 // return e.name.split(',')
-                                                return (e.name == 'Others' ? val.other_owner : e.name).split(',');
+                                                // return (e.name == 'Others' ? val.other_owner : e.name).split(',');
+                                                return (e.name == 'Others' ? this.titleCaseWord(val.other_owner) : this.titleCaseWord(e.name) ).split(',');
                                             }));
                                         }
 
@@ -290,7 +291,7 @@ export class CurrentLoanComponent implements OnInit {
                                     if (val.owner_name.length > 0) {
                                         owner = val.owner_name.map((e => {
                                             // return e.name.split(',')
-                                            return (e.name == 'Others' ? val.other_owner : e.name).split(',');
+                                            return (e.name == 'Others' ? this.titleCaseWord(val.other_owner) : this.titleCaseWord(e.name) ).split(',');
                                         }));
                                     }
                                     let description = data != '' ? ' ( ' + data + ' )' : '';
@@ -304,7 +305,7 @@ export class CurrentLoanComponent implements OnInit {
                                     if (val.owner_name.length > 0) {
                                         owner = val.owner_name.map((e => {
                                             // return e.name.split(',')
-                                            return (e.name == 'Others' ? val.other_owner : e.name).split(',');
+                                            return (e.name == 'Others' ? this.titleCaseWord(val.other_owner) : this.titleCaseWord(e.name) ).split(',');
                                         }));
                                     }
                                     let description = data != '' ? ' ( ' + data + ' )' : '';
@@ -315,7 +316,7 @@ export class CurrentLoanComponent implements OnInit {
                                     if (val.owner_name.length > 0) {
                                         owner = val.owner_name.map((e => {
                                             // return e.name.split(',')
-                                            return (e.name == 'Others' ? val.other_owner : e.name).split(',');
+                                            return (e.name == 'Others' ? this.titleCaseWord(val.other_owner) : this.titleCaseWord(e.name) ).split(',');
                                         }));
                                     }
 
@@ -332,7 +333,7 @@ export class CurrentLoanComponent implements OnInit {
                                     if (val.owner_name.length > 0) {
                                         owner = val.owner_name.map((e => {
                                             // return e.name.split(',')
-                                            return (e.name == 'Others' ? val.other_owner : e.name).split(',');
+                                            return (e.name == 'Others' ? this.titleCaseWord(val.other_owner) : this.titleCaseWord(e.name) ).split(',');
                                         }));
                                     }
                                     let description = data != '' ? '( ' + data + ' )' : '';
@@ -674,4 +675,16 @@ export class CurrentLoanComponent implements OnInit {
                   item.controls.other_frequency.updateValueAndValidity();
         }
     }
+
+
+
+    titleCaseWord(word:string) {
+        const unicodeWordMatch =
+        /(?:[A-Za-z\xAA\xB5\xBA\xC0-\xD6\xD8-\xF6\xF8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0370-\u0374\u0376\u0377\u037A-\u037D\u037F\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u048A-\u052F\u0531-\u0556\u0559\u0561-\u0587\u05D0-\u05EA\u05F0-\u05F2\u0620-\u064A\u066E\u066F\u0671-\u06D3\u06D5\u06E5\u06E6\u06EE\u06EF\u06FA-\u06FC\u06FF\u0710\u0712-\u072F\u074D-\u07A5\u07B1\u07CA-\u07EA\u07F4\u07F5\u07FA\u0800-\u0815\u081A\u0824\u0828\u0840-\u0858\u0860-\u086A\u08A0-\u08B4\u08B6-\u08BD\u0904-\u0939\u093D\u0950\u0958-\u0961\u0971-\u0980\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BD\u09CE\u09DC\u09DD\u09DF-\u09E1\u09F0\u09F1\u09FC\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A59-\u0A5C\u0A5E\u0A72-\u0A74\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABD\u0AD0\u0AE0\u0AE1\u0AF9\u0B05-\u0B0C\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3D\u0B5C\u0B5D\u0B5F-\u0B61\u0B71\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BD0\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C39\u0C3D\u0C58-\u0C5A\u0C60\u0C61\u0C80\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBD\u0CDE\u0CE0\u0CE1\u0CF1\u0CF2\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D3A\u0D3D\u0D4E\u0D54-\u0D56\u0D5F-\u0D61\u0D7A-\u0D7F\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0E01-\u0E30\u0E32\u0E33\u0E40-\u0E46\u0E81\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA\u0EAB\u0EAD-\u0EB0\u0EB2\u0EB3\u0EBD\u0EC0-\u0EC4\u0EC6\u0EDC-\u0EDF\u0F00\u0F40-\u0F47\u0F49-\u0F6C\u0F88-\u0F8C\u1000-\u102A\u103F\u1050-\u1055\u105A-\u105D\u1061\u1065\u1066\u106E-\u1070\u1075-\u1081\u108E\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u1380-\u138F\u13A0-\u13F5\u13F8-\u13FD\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u16F1-\u16F8\u1700-\u170C\u170E-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176C\u176E-\u1770\u1780-\u17B3\u17D7\u17DC\u1820-\u1877\u1880-\u1884\u1887-\u18A8\u18AA\u18B0-\u18F5\u1900-\u191E\u1950-\u196D\u1970-\u1974\u1980-\u19AB\u19B0-\u19C9\u1A00-\u1A16\u1A20-\u1A54\u1AA7\u1B05-\u1B33\u1B45-\u1B4B\u1B83-\u1BA0\u1BAE\u1BAF\u1BBA-\u1BE5\u1C00-\u1C23\u1C4D-\u1C4F\u1C5A-\u1C7D\u1C80-\u1C88\u1CE9-\u1CEC\u1CEE-\u1CF1\u1CF5\u1CF6\u1D00-\u1DBF\u1E00-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u2071\u207F\u2090-\u209C\u2102\u2107\u210A-\u2113\u2115\u2119-\u211D\u2124\u2126\u2128\u212A-\u212D\u212F-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2183\u2184\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CEE\u2CF2\u2CF3\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D80-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u2E2F\u3005\u3006\u3031-\u3035\u303B\u303C\u3041-\u3096\u309D-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312E\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FEA\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA61F\uA62A\uA62B\uA640-\uA66E\uA67F-\uA69D\uA6A0-\uA6E5\uA717-\uA71F\uA722-\uA788\uA78B-\uA7AE\uA7B0-\uA7B7\uA7F7-\uA801\uA803-\uA805\uA807-\uA80A\uA80C-\uA822\uA840-\uA873\uA882-\uA8B3\uA8F2-\uA8F7\uA8FB\uA8FD\uA90A-\uA925\uA930-\uA946\uA960-\uA97C\uA984-\uA9B2\uA9CF\uA9E0-\uA9E4\uA9E6-\uA9EF\uA9FA-\uA9FE\uAA00-\uAA28\uAA40-\uAA42\uAA44-\uAA4B\uAA60-\uAA76\uAA7A\uAA7E-\uAAAF\uAAB1\uAAB5\uAAB6\uAAB9-\uAABD\uAAC0\uAAC2\uAADB-\uAADD\uAAE0-\uAAEA\uAAF2-\uAAF4\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uAB30-\uAB5A\uAB5C-\uAB65\uAB70-\uABE2\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D\uFB1F-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE70-\uFE74\uFE76-\uFEFC\uFF21-\uFF3A\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC]|\uD800[\uDC00-\uDC0B\uDC0D-\uDC26\uDC28-\uDC3A\uDC3C\uDC3D\uDC3F-\uDC4D\uDC50-\uDC5D\uDC80-\uDCFA\uDE80-\uDE9C\uDEA0-\uDED0\uDF00-\uDF1F\uDF2D-\uDF40\uDF42-\uDF49\uDF50-\uDF75\uDF80-\uDF9D\uDFA0-\uDFC3\uDFC8-\uDFCF]|\uD801[\uDC00-\uDC9D\uDCB0-\uDCD3\uDCD8-\uDCFB\uDD00-\uDD27\uDD30-\uDD63\uDE00-\uDF36\uDF40-\uDF55\uDF60-\uDF67]|\uD802[\uDC00-\uDC05\uDC08\uDC0A-\uDC35\uDC37\uDC38\uDC3C\uDC3F-\uDC55\uDC60-\uDC76\uDC80-\uDC9E\uDCE0-\uDCF2\uDCF4\uDCF5\uDD00-\uDD15\uDD20-\uDD39\uDD80-\uDDB7\uDDBE\uDDBF\uDE00\uDE10-\uDE13\uDE15-\uDE17\uDE19-\uDE33\uDE60-\uDE7C\uDE80-\uDE9C\uDEC0-\uDEC7\uDEC9-\uDEE4\uDF00-\uDF35\uDF40-\uDF55\uDF60-\uDF72\uDF80-\uDF91]|\uD803[\uDC00-\uDC48\uDC80-\uDCB2\uDCC0-\uDCF2]|\uD804[\uDC03-\uDC37\uDC83-\uDCAF\uDCD0-\uDCE8\uDD03-\uDD26\uDD50-\uDD72\uDD76\uDD83-\uDDB2\uDDC1-\uDDC4\uDDDA\uDDDC\uDE00-\uDE11\uDE13-\uDE2B\uDE80-\uDE86\uDE88\uDE8A-\uDE8D\uDE8F-\uDE9D\uDE9F-\uDEA8\uDEB0-\uDEDE\uDF05-\uDF0C\uDF0F\uDF10\uDF13-\uDF28\uDF2A-\uDF30\uDF32\uDF33\uDF35-\uDF39\uDF3D\uDF50\uDF5D-\uDF61]|\uD805[\uDC00-\uDC34\uDC47-\uDC4A\uDC80-\uDCAF\uDCC4\uDCC5\uDCC7\uDD80-\uDDAE\uDDD8-\uDDDB\uDE00-\uDE2F\uDE44\uDE80-\uDEAA\uDF00-\uDF19]|\uD806[\uDCA0-\uDCDF\uDCFF\uDE00\uDE0B-\uDE32\uDE3A\uDE50\uDE5C-\uDE83\uDE86-\uDE89\uDEC0-\uDEF8]|\uD807[\uDC00-\uDC08\uDC0A-\uDC2E\uDC40\uDC72-\uDC8F\uDD00-\uDD06\uDD08\uDD09\uDD0B-\uDD30\uDD46]|\uD808[\uDC00-\uDF99]|\uD809[\uDC80-\uDD43]|[\uD80C\uD81C-\uD820\uD840-\uD868\uD86A-\uD86C\uD86F-\uD872\uD874-\uD879][\uDC00-\uDFFF]|\uD80D[\uDC00-\uDC2E]|\uD811[\uDC00-\uDE46]|\uD81A[\uDC00-\uDE38\uDE40-\uDE5E\uDED0-\uDEED\uDF00-\uDF2F\uDF40-\uDF43\uDF63-\uDF77\uDF7D-\uDF8F]|\uD81B[\uDF00-\uDF44\uDF50\uDF93-\uDF9F\uDFE0\uDFE1]|\uD821[\uDC00-\uDFEC]|\uD822[\uDC00-\uDEF2]|\uD82C[\uDC00-\uDD1E\uDD70-\uDEFB]|\uD82F[\uDC00-\uDC6A\uDC70-\uDC7C\uDC80-\uDC88\uDC90-\uDC99]|\uD835[\uDC00-\uDC54\uDC56-\uDC9C\uDC9E\uDC9F\uDCA2\uDCA5\uDCA6\uDCA9-\uDCAC\uDCAE-\uDCB9\uDCBB\uDCBD-\uDCC3\uDCC5-\uDD05\uDD07-\uDD0A\uDD0D-\uDD14\uDD16-\uDD1C\uDD1E-\uDD39\uDD3B-\uDD3E\uDD40-\uDD44\uDD46\uDD4A-\uDD50\uDD52-\uDEA5\uDEA8-\uDEC0\uDEC2-\uDEDA\uDEDC-\uDEFA\uDEFC-\uDF14\uDF16-\uDF34\uDF36-\uDF4E\uDF50-\uDF6E\uDF70-\uDF88\uDF8A-\uDFA8\uDFAA-\uDFC2\uDFC4-\uDFCB]|\uD83A[\uDC00-\uDCC4\uDD00-\uDD43]|\uD83B[\uDE00-\uDE03\uDE05-\uDE1F\uDE21\uDE22\uDE24\uDE27\uDE29-\uDE32\uDE34-\uDE37\uDE39\uDE3B\uDE42\uDE47\uDE49\uDE4B\uDE4D-\uDE4F\uDE51\uDE52\uDE54\uDE57\uDE59\uDE5B\uDE5D\uDE5F\uDE61\uDE62\uDE64\uDE67-\uDE6A\uDE6C-\uDE72\uDE74-\uDE77\uDE79-\uDE7C\uDE7E\uDE80-\uDE89\uDE8B-\uDE9B\uDEA1-\uDEA3\uDEA5-\uDEA9\uDEAB-\uDEBB]|\uD869[\uDC00-\uDED6\uDF00-\uDFFF]|\uD86D[\uDC00-\uDF34\uDF40-\uDFFF]|\uD86E[\uDC00-\uDC1D\uDC20-\uDFFF]|\uD873[\uDC00-\uDEA1\uDEB0-\uDFFF]|\uD87A[\uDC00-\uDFE0]|\uD87E[\uDC00-\uDE1D])\S*/g;
+        
+        if (!word) return word;
+        return word.replace(
+            unicodeWordMatch, (txt => txt[0].toUpperCase() + txt.substr(1).toLowerCase()));
+        // return word[0].toUpperCase() + word.substr(1).toLowerCase();
+    }
 }
\ No newline at end of file
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/dialogue/business-other-family-member/business-other-family-member.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/dialogue/business-other-family-member/business-other-family-member.component.html
index 666af3141..eac023539 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/dialogue/business-other-family-member/business-other-family-member.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/dialogue/business-other-family-member/business-other-family-member.component.html
@@ -12,7 +12,7 @@
           <mat-card *ngFor="let family of _OtherForm.controls.family_list['controls']; let f = index;" [formGroupName]="f">
               <mat-card-content>
                   <mat-form-field style="width: 40%">
-                      <input matInput placeholder="Name" formControlName="name" type="text" required>
+                      <input matInput placeholder="Name" formControlName="name" type="text" required [value]="family.get('name').value | titlecase">
               </mat-form-field>
                   <mat-form-field style="width: 40%">
                       <mat-select placeholder="Relationship"
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/dialogue/other-applicant-details/other-applicant-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/dialogue/other-applicant-details/other-applicant-details.component.html
index 78c6a9351..00d27f5e9 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/dialogue/other-applicant-details/other-applicant-details.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/dialogue/other-applicant-details/other-applicant-details.component.html
@@ -24,7 +24,7 @@
                     <mat-error *ngIf="applicant.controls['applicant_title_name'].invalid">Title Required</mat-error>
                 </mat-form-field>
                 <mat-form-field style="width: 60%">
-                    <input matInput placeholder="Name" formControlName="applicant_name" type="text" required>
+                    <input matInput placeholder="Name" formControlName="applicant_name" [value]="applicant.get('applicant_name').value | titlecase" type="text" required>
                     <mat-error *ngIf="applicant.controls['applicant_name'].invalid">Name Required</mat-error>
                 </mat-form-field>
                 <mat-form-field style="width: 30%">
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.html
index 5594504f4..febc7b04b 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.html
@@ -28,7 +28,7 @@
                                                     (selectionChange)="selectedPerson($event.value,ix)" required>
                                                     <mat-option>Select</mat-option>
                                                     <mat-option value="{{person.pd_co_applicant_id}}" *ngFor="let person of selectPerson">
-                                                        {{person.applicant_name}}
+                                                        {{person.applicant_name | titlecase }}
                                                     </mat-option>
                                                 </mat-select>
                                                 <!-- <input matInput placeholder="person" formControlName="selected_person" required> -->
@@ -68,7 +68,7 @@
                                                 </mat-select>
                                             </mat-form-field>
                                             <mat-form-field *ngIf="sup.get('residence_pin').value == 1" style="width:45%;">
-                                                <input matInput placeholder="Specify PinCode" formControlName="residence_other_pincode">
+                                                <input matInput placeholder="Specify PinCode" formControlName="residence_other_pincode" OnlyNumber type="text">
                                             </mat-form-field>
 
                                             <!-- <mat-form-field>
@@ -132,7 +132,7 @@
                                                             </mat-form-field>
                                                             <mat-form-field>
                                                                 <input matInput placeholder="Name" formControlName="family_member_name"
-                                                                    required>
+                                                                    required [value]="item.get('family_member_name').value | titlecase">
                                                             </mat-form-field>
                                                             <mat-form-field>
                                                                 <mat-select placeholder="Relationship" formControlName="family_member_relationship"
@@ -145,7 +145,7 @@
                                                                 </mat-select>
                                                             </mat-form-field>
                                                             <mat-form-field>
-                                                                <input matInput placeholder="Age" formControlName="family_member_age">
+                                                                <input matInput placeholder="Age" formControlName="family_member_age" OnlyNumber type="text">
                                                             </mat-form-field>
                                                         </div>
                                                         <div>
@@ -188,7 +188,7 @@
                                                             </mat-form-field>
                                                             <mat-form-field style="width:45%;">
                                                                 <input matInput placeholder="No. of years in Employment/Business"
-                                                                    formControlName="earning_number_of_years_in_employment_or_business"
+                                                                    formControlName="earning_number_of_years_in_employment_or_business" OnlyNumber type="text"
                                                                     required>
                                                             </mat-form-field>
                                                         </div>
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.html
index 0272e1dd1..08d88f5d2 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.html
@@ -129,9 +129,9 @@
                         <mat-select placeholder="Mode of Transport Used to Visit the PD address" formControlName="mode_of_transport_during_visit"
                             required>
                             <mat-option>Select</mat-option>
-                            <mat-option value="two-wheeler"> Two Wheeler</mat-option>
-                            <mat-option value="four-wheeler"> Four Wheeler</mat-option>
-                            <mat-option value="public-transport"> Public Transport</mat-option>
+                            <mat-option value="two_wheeler"> Two Wheeler</mat-option>
+                            <mat-option value="four_wheeler"> Four Wheeler</mat-option>
+                            <mat-option value="public_transport"> Public Transport</mat-option>
                             <mat-option value="others"> Others</mat-option>                            
                         </mat-select>
                         <mat-error *ngIf="_finalRemarkForm.controls['mode_of_transport_during_visit'].hasError('required')">Mode of Transport Used to Visit the PD address Required</mat-error>
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html
index b7aa0b40e..46b573381 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html
@@ -28,7 +28,7 @@
                     <ng-container matColumnDef="applicant_name">
                         <mat-header-cell *matHeaderCellDef> Name </mat-header-cell>
                         <mat-cell *matCellDef="let details;let i = index;" [formGroupName]="i">
-                            <input class="capitalize" matInput placeholder="ApplicantName" formControlName="applicant_name"
+                            <input matInput placeholder="ApplicantName" formControlName="applicant_name" [value]="details.get('applicant_name').value | titlecase"
                                 autocomplete="off" (change)="ApplicantName($event,details.value.pd_co_applicant_id)">
                             <!-- {{details.value.applicant_name | titlecase}} -->
                         </mat-cell>
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html
index 7045bf34f..a2b09df0c 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html
@@ -31,7 +31,7 @@
                                         <mat-card-content>
                                             <mat-form-field style="width: 42%">
                                                 <input matInput autocomplete="off" placeholder="Neighbour Name" formControlName="neighbourhood_name"
-                                                    type="text">
+                                                [value]="neighbourhood.get('neighbourhood_name').value | titlecase" type="text">
                                             </mat-form-field>
                     
                                             <mat-form-field style="width: 40%">
@@ -75,7 +75,7 @@
                                                             (selectionChange)="getOtherOrganisationOwner($event.value,n)">
                                                             <mat-optgroup *ngFor="let group of mergeCompanyApplicant" [label]="group.groupName">
                                                                 <mat-option *ngFor="let val of group.groupValues" [value]="val">
-                                                                    {{val.name}}
+                                                                    {{val.name | titlecase}}
                                                                 </mat-option>
                                                             </mat-optgroup>
                                                         </mat-select>
@@ -85,9 +85,9 @@
                                                     </ng-template>
                                                 </div>
                                                 <div fxFlex="20">
-                                                    <mat-form-field style="width: 95%" *ngIf="isOrganisationOwner[n]">
+                                                    <mat-form-field style="width: 95%" *ngIf="isOrganisationOwner[n] && !isDisplay2[n]">
                                                         <input matInput autocomplete="off" placeholder="Specify Owner name" formControlName="other_organisation_owner"
-                                                            type="text">
+                                                            type="text" [value]="neighbourhood.controls.other_organisation_owner.value | titlecase">
                                                     </mat-form-field>
                                                 </div>
                                                 <div fxFlex="10" style="text-align: center;">
@@ -122,7 +122,8 @@
                                         [formGroupName]="r">
                                         <mat-card-content>
                                             <mat-form-field style="width: 25%">
-                                                <input matInput autocomplete="off" placeholder="Name" formControlName="reference_name" type="text">
+                                                <input matInput autocomplete="off" placeholder="Name" formControlName="reference_name" type="text"
+                                                [value]="reference.get('reference_name').value | titlecase">
                                             </mat-form-field>
                                             <mat-form-field style="width: 24%">
                                                 <input matInput autocomplete="off" placeholder="Mobile Number" formControlName="mobile"
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.ts
index 7086ed7dc..9aeb62346 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.ts
@@ -290,14 +290,14 @@ pdf(fileURL){
     // const referencecheckControl = <FormGroup>this._neighbourhoodForm.controls['referencecheck_list'];
     // const referencecheckControl = this._neighbourhoodForm.get('referencecheck_list') as FormControl;
     // let RefCtrlLength : any = referencecheckControl.controls.length;
-    // const neighbourhoodControl : FormGroup = this._neighbourhoodForm.controls['neighbourhood_list'] as FormGroup;
-    // let NbhdCtrlLength: any = neighbourhoodControl.controls.length;
-    //   if (NbhdCtrlLength > 0) {
-    //    let Ncnt = 0;
-      //  while(Ncnt < NbhdCtrlLength){
-
-        // let nbhdChildCtrl : any = neighbourhoodControl.controls[Ncnt]; 
-
+    const neighbourhoodControl : FormGroup = this._neighbourhoodForm.controls['neighbourhood_list'] as FormGroup;
+    let NbhdCtrlLength: any = neighbourhoodControl.controls.length;
+       if (NbhdCtrlLength > 0) {
+        let Ncnt = 0;
+        while(Ncnt < NbhdCtrlLength){
+          
+         let nbhdChildCtrl : any = neighbourhoodControl.controls[Ncnt]; 
+         
         // nbhdChildCtrl.controls['neighbourhood_name'].setValidators([Validators.required]);
         // nbhdChildCtrl.controls['neighbourhood_name'].updateValueAndValidity();
 
@@ -311,28 +311,32 @@ pdf(fileURL){
         //   nbhdChildCtrl.controls['how_long_do_know_in_year'].setValidators([Validators.required]);
         //   nbhdChildCtrl.controls['how_long_do_know_in_year'].updateValueAndValidity();  
         // }
-        // else if(nbhdChildCtrl.controls.did_not_know_the_business_operation.value == true){
+        // else 
+           if(nbhdChildCtrl.controls.did_not_know_the_business_operation.value == true){
         
-        //   nbhdChildCtrl.controls['how_long_do_know_in_month'].setValue('');
-        //   // nbhdChildCtrl.controls['how_long_do_know_in_month'].clearValidators();
-        //   nbhdChildCtrl.controls['how_long_do_know_in_month'].updateValueAndValidity();
-        //   nbhdChildCtrl.controls['how_long_do_know_in_year'].setValue('');
-        //   nbhdChildCtrl.controls['how_long_do_know_in_year'].clearValidators();
-        //   nbhdChildCtrl.controls['how_long_do_know_in_year'].updateValueAndValidity();  
-        // }
+              nbhdChildCtrl.controls['how_long_do_know_in_month'].setValue('');
+              // nbhdChildCtrl.controls['how_long_do_know_in_month'].clearValidators();
+              nbhdChildCtrl.controls['how_long_do_know_in_month'].updateValueAndValidity();
+              nbhdChildCtrl.controls['how_long_do_know_in_year'].setValue('');
+              // nbhdChildCtrl.controls['how_long_do_know_in_year'].clearValidators();
+              nbhdChildCtrl.controls['how_long_do_know_in_year'].updateValueAndValidity();  
+          }
 
         // if(nbhdChildCtrl.controls.did_not_know_the_owner.value == '' || nbhdChildCtrl.controls.did_not_know_the_owner.value == false){
         //   nbhdChildCtrl.controls['organisation_owner'].setValidators([Validators.required]);
         //   nbhdChildCtrl.controls['organisation_owner'].updateValueAndValidity();
         // }
-        // else if(nbhdChildCtrl.controls.did_not_know_the_owner.value == true){
-        //   nbhdChildCtrl.controls['organisation_owner'].setValue('');
-        //   nbhdChildCtrl.controls['organisation_owner'].clearValidators();
-        //   nbhdChildCtrl.controls['organisation_owner'].updateValueAndValidity();
-        // }
-        // Ncnt++;
-      //  }
-    // }
+        // else 
+           if(nbhdChildCtrl.controls.did_not_know_the_owner.value == true){
+              nbhdChildCtrl.controls['organisation_owner'].setValue('');
+              // nbhdChildCtrl.controls['organisation_owner'].clearValidators();
+              nbhdChildCtrl.controls['organisation_owner'].updateValueAndValidity();
+              nbhdChildCtrl.controls['other_organisation_owner'].setValue('');
+              nbhdChildCtrl.controls['other_organisation_owner'].updateValueAndValidity();
+            }
+         Ncnt++;
+        }
+     }
 
     this._neighbourhoodForm.controls.neighbourhood_status.setValidators([Validators.required]);
     this._neighbourhoodForm.controls.neighbourhood_status.updateValueAndValidity();
@@ -476,6 +480,7 @@ toggleVisibility(e,index,flag){
   }
   else if(flag==2){
     this.isDisplay2[index] = e;
+    // console.log(this.isOrganisationOwner[index]);
   }
 }
 
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 b4e5ceb5d..20958ceb4 100755
--- 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
@@ -85,20 +85,20 @@
                                                     [compareWith]="compareObjects" (selectionChange)="getOtherIncomeEarnedBy($event.value,i)">
                                                     <mat-optgroup *ngFor="let group of mergeCompanyApplicant" [label]="group.groupName">
                                                         <mat-option *ngFor="let val of group.groupValues" [value]="val">
-                                                            {{val.name}}
+                                                            {{val.name | titlecase}}
                                                         </mat-option>
                                                     </mat-optgroup>
                                                 </mat-select>
                                             </mat-form-field>
                                             <mat-form-field style="width:45%" *ngIf="isIncomeEarnedBy[i]">
-                                                <input matInput autocomplete="off" placeholder="Specify Income earned by"
+                                                <input matInput autocomplete="off" placeholder="Specify Income earned by" [value]="details.get('others_income_earned_by').value | titlecase"
                                                     formControlName="others_income_earned_by">
                                                 <mat-error *ngIf="details.controls['others_income_earned_by'].hasError('required')">Income earned by is Required</mat-error>
                                             </mat-form-field>
 
                                             <mat-form-field style="width:45%">
                                                 <input matInput autocomplete="off" placeholder="Amount" formControlName="amount"
-                                                    OnlyNumber type="text" (keyup)="inWords($event,i)">
+                                                    OnlyNumber type="text">
                                                 <mat-hint align="start" style="font-size:90%" *ngIf="details.get('amount').value  != ''">{{"&#8377;"}} {{ details.get('amount').value | numberToWords}} Only</mat-hint>                                                    
                                             </mat-form-field>
 
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.html
index d5166a691..a660918d4 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.html
@@ -112,7 +112,8 @@
                                       <mat-card-content>
                                                 <mat-form-field style="width: 20%">
                                                     <!-- <mat-label>{{coDetails.controls.pd_question.value}}</mat-label> -->
-                                                    <input matInput placeholder="Name" formControlName="name_ans" type="text" required>
+                                                    <input matInput placeholder="Name" formControlName="name_ans" type="text" required
+                                                    [value]="coDetails.get('name_ans').value | titlecase">
                                                 </mat-form-field>
                                                 
                                                 <mat-form-field style="width: 20%">
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 7d4aeb3c3..d965986e4 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
@@ -44,7 +44,8 @@
                                             </mat-select>
                                         </mat-form-field>
                                         <mat-form-field style="width: 35%">
-                                            <input matInput placeholder="Contact Person Name" formControlName="manufacturing_contact_person_name">
+                                            <input matInput placeholder="Contact Person Name" formControlName="manufacturing_contact_person_name"
+                                            [value]="items.get('manufacturing_contact_person_name').value | titlecase">
                                         </mat-form-field>
                                         <mat-form-field style="width: 35%">
                                             <mat-select placeholder="Contact Person Designation" formControlName="person_designation"
@@ -181,7 +182,7 @@
                                         </mat-form-field>
                                         <mat-form-field style="width: 35%">
                                             <input matInput placeholder="Contact Person Name" formControlName="trade_product_contact_person_name"
-                                                maxlength="10">
+                                                maxlength="10" [value]="items.get('trade_product_contact_person_name').value | titlecase">
                                         </mat-form-field>
                                         <mat-form-field style="width: 35%">
                                             <mat-select placeholder="Contact Person Designation" formControlName="person_designation"
diff --git a/ng6-seed/src/environments/environment.ts b/ng6-seed/src/environments/environment.ts
index af7a9fb85..67aab72f9 100755
--- a/ng6-seed/src/environments/environment.ts
+++ b/ng6-seed/src/environments/environment.ts
@@ -25,5 +25,5 @@ export const environment = {
   s3_endpoint: '',
   accessToken:'',
   //apiUrl:'http://localhost/sparqapi/api/'
-  apiEndpoint: 'https://ssa.sineedge.com/sparqtest/api/'
+  apiEndpoint: 'https://ssa.sineedge.com/sparqapi/api/'
 };