diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html
index 0782fddcf..0853db580 100644
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html
@@ -15,19 +15,18 @@
         </mat-select>
     </mat-form-field>
 
-
     <mat-form-field *ngIf="addressForm.controls['address_type'].value == 12">
             <input matInput placeholder="Address Type Others" formControlName="address_type_others">
     </mat-form-field>
  
-    <mat-form-field>
-        
+    <mat-form-field>        
         <mat-select placeholder="Locality" formControlName="locality" required>
             <mat-option value="{{m_locality.locality_id}}"
                                 *ngFor="let m_locality of localityData">{{m_locality.locality_name}}
-                    </mat-option>
+            </mat-option>
         </mat-select>
     </mat-form-field>
+
     <mat-form-field *ngIf="addressForm.controls.locality.value == 'Others'">
         <input matInput placeholder="Specify Locality"
                formControlName="locality_others">
@@ -46,14 +45,15 @@
             </mat-option>
         </mat-select>
     </mat-form-field>
-    <mat-form-field>
+    <!--  Don't Remove To replace atlast of the PD Completion and creating new form (Customer Behaviour 221118 review doc : s.no 3.e )
+     <mat-form-field>
         <mat-select placeholder="Customer Behaviour"
                     formControlName="customer_behaviour" required>
             <mat-option value="{{data.customer_behaviour_id}}"
                         *ngFor="let data of customerData">{{data.description}}
             </mat-option>
         </mat-select>
-    </mat-form-field>
+     </mat-form-field>--(Customer Behaviour)-->
     <mat-form-field>
             <mat-select placeholder="Ownership" formControlName="address_ownership">
                 <mat-option value="{{ownerShip.id}}"
@@ -83,7 +83,8 @@
                     <input matInput placeholder="Bussiness Address Type Others" formControlName="bussiness_address_type_others">
     </mat-form-field>
 
-    <mat-card>
+    <!--- Don't Remove To replace atlast of the PD Completion and creating new form (Neighbourhood check) --
+        <mat-card>
         <mat-card-header>
             <p>Neighbourhood</p>     
         </mat-card-header>
@@ -119,7 +120,7 @@
                     <!-- <mat-form-field>
                         <input matInput placeholder="How long do you know the applicant"
                                formControlName="how_long">
-                    </mat-form-field> -->
+                    </mat-form-field> ->-
                     <div>
                             <label>How long do you know the applicant?</label>
                             <br>
@@ -148,6 +149,7 @@
             </div>
         </div>
     </mat-card>
+    End of Neighbourhood Check-->
     <div fxLayout="row">
       <div fxFlex="60" class="pb-0 text-sm-left">
         <mat-form-field appearance="outline" style="width: 100%">
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.ts
index 6e5dfb0f7..d5bb9f5fb 100644
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.ts
@@ -33,13 +33,13 @@ export class AddressComponent implements OnInit {
 
     locationdata: any = [];
     commentData: any = [];
-    customerData: any = [];
+    //customerData: any = []; 221118 review doc s.no 3.e
     addressData:any = [];
     localityData:any = [];
     ownerShipData:any = [];
 
-    neighbourStatusData:any=["Yes","No"];
-    applicantOwnerData:any=["Yes","No","Dont Know"];
+    //neighbourStatusData:any=["Yes","No"];
+    //applicantOwnerData:any=["Yes","No","Dont Know"];
 
     public currentLoanForm: FormGroup;
     private notifier: NotifierService;
@@ -65,7 +65,7 @@ export class AddressComponent implements OnInit {
         console.clear();
         this.getMasterDetails('PDLOCATIONAPPROACH',1);
         this.getMasterDetails('COMMENTSONLOCALITY',2);
-        this.getMasterDetails('CUSTOMERBEHAVIOUR',3);
+        //this.getMasterDetails('CUSTOMERBEHAVIOUR',3);review doc s.no 3.e
         this.getMasterDetails('LOCALITY',4);
         this.getMasterDetails('ADDRESSTYPE',5);
         this.getMasterDetails('RESIDENCEOWNERSHIP',6);
@@ -75,11 +75,11 @@ export class AddressComponent implements OnInit {
         params.pd_form_id = '5';
         this._pd.retriveForm(params).subscribe(data => {
             console.log('data', data);
-            const control = <FormArray>this.addressForm.controls['neighbourhood'];
+            //const control = <FormArray>this.addressForm.controls['neighbourhood'];
            if(data.status == 200) {
-               var result = Object.keys(data.records.neighbourhood).map(function (key) {
-                   return data.records.neighbourhood[key];
-               });
+            //    var result = Object.keys(data.records.neighbourhood).map(function (key) {
+            //        return data.records.neighbourhood[key];
+            //    });
                this.addressForm.controls.address.setValue(data.records.address);
                this.addressForm.controls.pd_location.setValue(data.records.pd_location);
                this.addressForm.controls.address_type.setValue(data.records.address_type);
@@ -87,7 +87,7 @@ export class AddressComponent implements OnInit {
                 this.addressForm.controls.address_type_others.setValue(data.records.address_type_others);
                }
                this.addressForm.controls.comment_locality.setValue(data.records.comment_locality);
-               this.addressForm.controls.customer_behaviour.setValue(data.records.customer_behaviour);
+            //    this.addressForm.controls.customer_behaviour.setValue(data.records.customer_behaviour);
                this.addressForm.controls.locality.setValue(data.records.locality);
                this.addressForm.controls.address_form_remark.setValue(data.records.address_form_remark);
                this.addressForm.controls.address_ownership.setValue(data.records.address_ownership);
@@ -101,16 +101,16 @@ export class AddressComponent implements OnInit {
                if (data.records.locality_others) {
                    this.addressForm.controls.locality_others.setValue(data.records.locality_others);
                }
-               if (result.length == 0) {
-                   control.push(this.createNeighbour());
-               } else {
-                   result.forEach(datas => {
-                       control.push(this.createNeighbour());
-                   });
-                   this.addressForm.controls.neighbourhood.setValue(result);
-               }
+            //    if (result.length == 0) {
+            //        control.push(this.createNeighbour());
+            //    } else {
+            //        result.forEach(datas => {
+            //            control.push(this.createNeighbour());
+            //        });
+            //        this.addressForm.controls.neighbourhood.setValue(result);
+            //    }
            } else {
-               control.push(this.createNeighbour());
+               //control.push(this.createNeighbour());
            }
         });
     }
@@ -123,8 +123,8 @@ export class AddressComponent implements OnInit {
             locality_others: [''],
             pd_location: ['', Validators.compose([Validators.required])],
             comment_locality: ['', Validators.compose([Validators.required])],
-            customer_behaviour: ['', Validators.compose([Validators.required])],
-            neighbourhood: this.fb.array([]),
+            //customer_behaviour: ['', Validators.compose([Validators.required])],
+            //neighbourhood: this.fb.array([]),
             address_form_remark:[''],
             address_ownership:[''],
             bussiness_activity:[''],
@@ -136,20 +136,20 @@ export class AddressComponent implements OnInit {
         this.locality = this.addressForm.controls['locality'];
         this.pdLocation = this.addressForm.controls['pd_location'];
         this.commentlocality = this.addressForm.controls['comment_locality'];
-        this.customerBehaviour = this.addressForm.controls['customer_behaviour'];
+        //this.customerBehaviour = this.addressForm.controls['customer_behaviour'];
         this.ownership = this.addressForm.controls['address_ownership'];
         this.bussinessActivity = this.addressForm.controls['bussiness_activity'];
         // this.bussiessAddressType = this.addressForm.controls['bussiness_address_type'];
     }
-    createNeighbour(): FormGroup {
-        return this.fb.group({
-            name: ['', Validators.compose([Validators.required])],
-            do_you_know: ['', Validators.compose([Validators.required])],
-            how_long_year: ['', Validators.compose([Validators.required])],
-            how_long_month: ['', Validators.compose([Validators.required])],
-            is_owner: ['', Validators.compose([Validators.required])],
-        });
-    }
+    // createNeighbour(): FormGroup {
+    //     return this.fb.group({
+    //         name: ['', Validators.compose([Validators.required])],
+    //         do_you_know: ['', Validators.compose([Validators.required])],
+    //         how_long_year: ['', Validators.compose([Validators.required])],
+    //         how_long_month: ['', Validators.compose([Validators.required])],
+    //         is_owner: ['', Validators.compose([Validators.required])],
+    //     });
+    // }
     getMasterDetails(table:string,type:number){
         this._pd.getAllMasterDatas(table).subscribe(data => {
             data.records.forEach(val => {
@@ -159,9 +159,9 @@ export class AddressComponent implements OnInit {
                 else if(type==2 && val.isactive == 1){
                     this.commentData.push(val);
                 }
-                else if(type==3 && val.isactive == 1){
-                    this.customerData.push(val);
-                }
+                /* else if(type==3 && val.isactive == 1){
+                     this.customerData.push(val);
+                 } //221118 review doc s.no 3.e */
                 else if(type==4 && val.isactive == 1){
                     this.localityData.push(val);
                 }
@@ -174,6 +174,7 @@ export class AddressComponent implements OnInit {
             })
         });
     }
+    /*221118 review doc s.no 3.f
     addNeighbour() {
         const control = <FormArray>this.addressForm.controls['neighbourhood'];
         if (control.length <= 1) {
@@ -183,12 +184,13 @@ export class AddressComponent implements OnInit {
     removeNeighbour(index) {
         const control = <FormArray>this.addressForm.controls['neighbourhood'];
         control.removeAt(index);
-    }
+    }*/
     onSubmit() {
+        console.log('form data', this.addressForm.value);
         if (!this.addressForm.valid) {
                 return;
         }
-        console.log('form', this.addressForm.value);
+        
         let records: any = {};
         records.address = this.address.value;
         records.address_type = this.addressType.value;
@@ -201,8 +203,8 @@ export class AddressComponent implements OnInit {
         }
         records.pd_location = this.pdLocation.value;
         records.comment_locality = this.commentlocality.value;
-        records.customer_behaviour = this.commentlocality.value;
-        records.neighbourhood = this.addressForm.controls.neighbourhood.value;
+        //records.customer_behaviour = this.commentlocality.value;
+        //records.neighbourhood = this.addressForm.controls.neighbourhood.value;
         records.address_form_remark = this.addressForm.controls.address_form_remark.value;
         records.address_ownership = this.ownership.value;
         records.bussiness_activity = this.bussinessActivity.value;
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 f6a5614f5..953ef338c 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
@@ -71,7 +71,7 @@
     <mat-card-content>
         <p>Banking Information</p>
             <form [formGroup]="bankingForm" class="bankForm">
-                    <div formArrayName="itemRows">
+                    <div formArrayName="itemRows" autocomplete="off">
                         <mat-accordion 
                                 *ngFor="let itemrow of bankingForm.controls.itemRows['controls']; let i=index"
                                 [formGroupName]="i">
@@ -84,15 +84,39 @@
                                     </mat-panel-title>
                                 </mat-expansion-panel-header>
                                 <mat-form-field>
+                                    <mat-select placeholder="Applicant Name"
+                                    formControlName="applicant_name" required>
+                                        
+                                        <mat-option value="{{owner.pd_co_applicant_id}}" *ngFor="let owner of applicants">{{owner.applicant_name}}</mat-option>
+                                        <mat-option value="Others">Others</mat-option>
+                                    </mat-select>
+                                </mat-form-field>
+                                <mat-form-field *ngIf="itemrow.get('applicant_name').value == 'Others'">
+                                    <input matInput placeholder="Specify Other Applicant"
+                                           formControlName="other_applicant">
+                                </mat-form-field>
+
+                                <!-- <mat-form-field>
                                     <input matInput placeholder="Applicant Name"
                                            formControlName="applicant_name" required>
-                                </mat-form-field>
-                                <mat-form-field>
+                                </mat-form-field> -->
+                                <!-- <mat-form-field>
                                     <input matInput placeholder="Bank Name" formControlName="bank_name" required>
+                                </mat-form-field> -->
+
+                                <mat-form-field>
+                                    <mat-select placeholder="Bank Name" formControlName="bank_name" required>
+                                            <mat-option *ngFor="let btLen of m_btLenderList" [value]="btLen.bt_lender_list_id">{{ btLen.lender_name }}</mat-option>
+                                    </mat-select>
                                 </mat-form-field>
+                                <mat-form-field *ngIf="itemrow.get('bank_name').value == 3">
+                                    <input matInput placeholder="Specify Other Bank Name"
+                                           formControlName="other_bank">
+                                </mat-form-field>
+
                 
                                 <mat-form-field>
-                                    <mat-select placeholder="Account Type" formControlName="account_type" required>
+                                    <mat-select (selectionChange)="selectedAccTypeChanges($event)" 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"
@@ -113,7 +137,8 @@
                                         <mat-option value="NA">NA</mat-option>
                                     </mat-select> 
                                 </mat-form-field>
-                                <mat-form-field>
+                                
+                                <mat-form-field *ngIf="itemrow.get('account_type').value != 2">
                                     <input matInput placeholder="Limit in case of OD / CC account"
                                            formControlName="limit" (keypress)="keyPress($event)" required>
                                 </mat-form-field>
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 02dfce354..868d57c9f 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
@@ -34,7 +34,9 @@ export class BankingDetailsComponent implements OnInit {
     step: number;
     private notifier: NotifierService;
     public pd_cus_segment:string;
+    public applicants: any;
     m_accountType= [];
+    m_btLenderList = [];
 
     constructor(notifier: NotifierService, private fb: FormBuilder, private route: ActivatedRoute,
                 private router: Router,
@@ -43,15 +45,17 @@ export class BankingDetailsComponent implements OnInit {
 
     }
 
-    ngOnInit() {
+    ngOnInit() { 
         this.step = 0;
         this.initBankingForm();
         this.getM_AccountType();
+        this.getM_BTLenderList();
         this.pd_cus_segment = this.pd_all_details.pdmaster_details.customer_segment_abbr.toUpperCase();
         // console.log("(0,3): "   + this.pd_cus_segment.substring(0,3)); 
         // console.log(this.pd_all_details.pdmaster_details);
         // console.log(this.pd_cus_segment);
         this.pd_cus_segment = this.pd_cus_segment.substring(0,3);
+        this.applicants = this.pd_all_details.pdapplicants_detials;
         let params: any = {};
         params.pd_id = this.pdid;
         params.pd_form_id = '7';
@@ -91,6 +95,13 @@ export class BankingDetailsComponent implements OnInit {
     )
   }
 
+  getM_BTLenderList(){
+    this._pd.getAllMasterDatas('BTLENDERLIST').subscribe(
+      data => {
+        this.m_btLenderList = data.records.filter(data => data.isactive == 1);
+      })
+  }
+
     public initBankingForm(): void {
         this.bankingForm = this.fb.group({
             banking_form_remark: [''],
@@ -101,7 +112,9 @@ export class BankingDetailsComponent implements OnInit {
     createBankarray() {
         return this.fb.group({
             applicant_name: ['', Validators.compose([Validators.required])],
+            other_applicant : [''],
             bank_name: ['', Validators.compose([Validators.required])],
+            other_bank: [''],
             account_type: ['', Validators.compose([Validators.required])],
             salary: ['', Validators.compose([Validators.required])],
             limit: ['', Validators.compose([Validators.required])],
@@ -166,6 +179,33 @@ export class BankingDetailsComponent implements OnInit {
             }
         });
     }
+
+    selectedAccTypeChanges(event: any){
+         console.log('First Time',event);
+         console.log('First Time Value',event.value);
+        if(event.value == 2) {   
+            const control = <FormArray>this.bankingForm.controls['itemRows'];
+            console.log('Inside If Condition');
+            console.log(control);
+            console.log(control.controls);
+            
+            control.controls[0].get('limit').clearValidators();
+            control.controls[0].get('limit').updateValueAndValidity();
+
+            //this.loanDetailsForm.controls['is_topup'].setValidators([Validators.required]);
+            // this.bankingForm.controls['itemRows'].
+            // this.bankingForm.controls.get('limit').clearValidators();
+            // this.bankingForm.controls.itemRows['controls'].get('limit').updateValueAndValidity();
+            // const control = <FormArray>this.bankingForm.controls['itemRows'];
+            //       console.log(control.controls['limit'].value);
+            
+        }
+        else{
+            alert('sd');
+        }
+
+    }
+
     /** On Key Press Event For Numbers  */
     keyPress(event: any) {
         const pattern = /[0-9]/;
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 4dc50790e..863f0db6f 100644
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html
@@ -4,9 +4,16 @@
     <mat-form-field>
         <input matInput placeholder="Name of Business / Profession" formControlName="profession_name" required>
     </mat-form-field>
-    <mat-form-field>
-        <input matInput placeholder="How many years in business" formControlName="business_years" required>
-    </mat-form-field>
+    
+        <div fxLayout="row" fxLayoutGap="2px" fxLayoutAlign="start none">
+            <mat-form-field>
+                <input matInput type="number" placeholder="Business Experience in Year" formControlName="business_years" required min='0'>
+            </mat-form-field>
+            <mat-form-field>
+                <input matInput type="number" placeholder="Business Experience in Month" formControlName="business_month" required min='0' max='12'>
+            </mat-form-field>
+        </div>
+    
     <mat-form-field>
         <mat-select placeholder="Industry"
                     formControlName="industry" required>
@@ -19,10 +26,43 @@
             <mat-option value="{{type.type_of_activity_id}}" *ngFor="let type of activityData">{{type.name}}</mat-option>
         </mat-select>
     </mat-form-field>
-    <mat-form-field>
-        <input matInput placeholder="Seasonality" formControlName="seasonality" required>
+    <mat-form-field *ngIf="businessForm.controls['type_of_activity'].value == 5">
+            <input matInput placeholder="Specify Other Activity"
+                   formControlName="other_activity_type">
     </mat-form-field>
-    <mat-card>
+    <mat-form-field>
+        <!-- <input matInput placeholder="Seasonality" formControlName="seasonality" required> -->
+        <mat-select placeholder="Is the business Seasonal?"
+        formControlName="seasonality" required>
+     <mat-option value="yes">Yes</mat-option>
+     <mat-option value="no">No</mat-option>
+ </mat-select>
+    </mat-form-field>
+    
+    <mat-form-field *ngIf="businessForm.controls['seasonality'].value == 'yes'">
+        <input matInput placeholder="How many months in a year does the business run?" formControlName="month_of_business_run">
+    </mat-form-field>
+
+    <mat-form-field *ngIf="businessForm.controls['seasonality'].value == 'yes'">
+        <mat-select multiple placeholder="What is the peak period of business ? "
+                    formControlName="peak_period_of_business" required>
+            <mat-option value="1">January</mat-option>
+            <mat-option value="2">February</mat-option>
+            <mat-option value="3">March</mat-option>
+            <mat-option value="4">April</mat-option>
+            <mat-option value="5">May</mat-option>
+            <mat-option value="6">June</mat-option>
+            <mat-option value="7">July</mat-option>
+            <mat-option value="8">August</mat-option>
+            <mat-option value="9">September</mat-option>
+            <mat-option value="10">October</mat-option>
+            <mat-option value="11">November</mat-option>
+            <mat-option value="12">December</mat-option>
+            
+        </mat-select>
+    </mat-form-field>
+
+    <!--<mat-card>
         <mat-card-header>
             <p>Designation
             </p>
@@ -48,18 +88,24 @@
                 </mat-card-content>
             </div>
         </div>
-    </mat-card>
+    </mat-card>-->
     <mat-form-field>
         <mat-select placeholder="Who started the business / professions"
                     formControlName="who_started" required>
-            <mat-option value="applicant">Started by Applicant</mat-option>
+            <mat-option value="applicant">Started by Applicants</mat-option>
             <mat-option value="family_business">Family Business</mat-option>
+            <mat-option value="others">Others</mat-option>
         </mat-select>
     </mat-form-field>
+    <mat-form-field *ngIf="businessForm.controls['who_started'].value == 'others'">
+            <input matInput placeholder="Specify Other Bussiness Started"
+                   formControlName="other_bussiness_who_started">
+    </mat-form-field>
     <mat-form-field>
         <mat-select placeholder="Main person running the businesss"
                     formControlName="main_person" required>
-            <mat-option value="applicants">One of the applicants</mat-option>
+            <!-- <mat-option value="applicants">One of the applicants</mat-option> -->
+            <mat-option value="{{owner.pd_co_applicant_id}}" *ngFor="let owner of applicants">{{owner.applicant_name}}</mat-option>
             <mat-option value="Relative">Relative of an applicant</mat-option>
             <mat-option value="Others">Others</mat-option>
         </mat-select>
@@ -75,9 +121,18 @@
         </mat-select>
     </mat-form-field>
     <mat-form-field>
-        <input matInput placeholder="Any other business before"
+        <!-- <input matInput placeholder="Any other business before"
+               formControlName="before_business" required> -->
+               <mat-select placeholder="Were the loan applicants involved in any other business before starting this business?"
                formControlName="before_business" required>
+            <mat-option value="yes">Yes</mat-option>
+            <mat-option value="no">No</mat-option>
+        </mat-select>
     </mat-form-field>
+    <mat-form-field *ngIf="businessForm.controls['before_business'].value == 'yes'">
+            <input matInput placeholder="Description for before starting this business"
+                   formControlName="before_business_description">
+        </mat-form-field>
     <mat-form-field>
         <input matInput placeholder="Any delays"
                formControlName="any_delays" required>
@@ -96,13 +151,21 @@
                                formControlName="partner_name" required>
                     </mat-form-field>
                     <mat-form-field>
-                        <input matInput placeholder="Share of Profit / Shareholding"
+                        <input matInput placeholder="Share of Profit / Shareholding (%)" (keypress)="keyPress($event)"
                                formControlName="shareholding" required>
                     </mat-form-field>
-                    <mat-form-field>
-                        <input matInput placeholder="No. of yrs in this business"
-                               formControlName="current_business_experiance" required>
-                    </mat-form-field>
+                    <div>
+                        <label>How many years and month in this business</label>
+                        <br>
+                        <div fxLayout="col" fxLayoutGap="2px" fxLayoutAlign="start none">
+                            <mat-form-field>
+                                <input matInput type="number" placeholder="Year" formControlName="current_business_experiance_year"  required min='0'>
+                            </mat-form-field>
+                            <mat-form-field>
+                                <input matInput type="number" placeholder="Month" formControlName="current_business_experiance_month" required min='0' max='12'>
+                            </mat-form-field>
+                        </div>
+                    </div>
                     <mat-form-field>
                         <input matInput placeholder="Total Business Experience"
                                formControlName="total_business_experiance" required>
@@ -141,7 +204,7 @@
     </mat-card>
     <mat-card>
         <mat-card-header>
-            <p>As per PD Officer
+            <p>No of Employees sighted by PD officer during his visit
             </p>
         </mat-card-header>
         <mat-card-content class="matcard">
@@ -149,19 +212,19 @@
                 <input matInput placeholder="Total"
                        formControlName="officer_total" required>
             </mat-form-field>
-            <mat-form-field>
+            <!-- <mat-form-field>
                 <input matInput placeholder="Permanent"
                        formControlName="officer_permanent" required>
-            </mat-form-field>
-            <mat-form-field>
+            </mat-form-field> -->
+            <!-- <mat-form-field>
                 <input matInput placeholder="Temporary"
                        formControlName="officer_temporary" required>
-            </mat-form-field>
+            </mat-form-field> -->
         </mat-card-content>
     </mat-card>
     <mat-card>
         <mat-card-header>
-            <p>Investments
+            <p>Investment in business by Applicants
             </p>
         </mat-card-header>
         <mat-card-content class="matcard">
@@ -169,10 +232,10 @@
                 <input matInput placeholder="Amount Invested by Applicant"
                        formControlName="invested_amount" required>
             </mat-form-field>
-            <mat-form-field>
+            <!-- <mat-form-field>
                 <input matInput placeholder="Monthly Working Capital Needed"
                        formControlName="working_capital" required>
-            </mat-form-field>
+            </mat-form-field> -->
         </mat-card-content>
     </mat-card>
     <mat-card>
@@ -192,7 +255,7 @@
             </mat-form-field>
         </mat-card-content>
     </mat-card>
-    <mat-card>
+    <!-- <mat-card>
         <mat-card-header>
             <p>Business Setup
             </p>
@@ -216,10 +279,10 @@
                        formControlName="rent_paid" (keypress)="keyPress($event)">
             </mat-form-field>
         </mat-card-content>
-    </mat-card>
+    </mat-card> -->
     <mat-card>
         <mat-card-header>
-            <p>Is the below documents seen and photo captured ?
+            <p>Documents Sighted
             </p>
         </mat-card-header>
         <mat-card-content class="matcard">
@@ -277,6 +340,7 @@
                             formControlName="other_documents" required>
                     <mat-option value="yes">Yes</mat-option>
                     <mat-option value="no">No</mat-option>
+                    <mat-option value="not applicable">Not Applicable</mat-option>
                 </mat-select>
             </mat-form-field>
             <div formArrayName="documents" *ngIf="businessForm.controls['other_documents'].value == 'yes'">
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts
index b24341aea..e5ae10d50 100644
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts
@@ -31,10 +31,12 @@ import {ActivatedRoute, Router} from "@angular/router";
 export class BusinessInfoComponent implements OnInit {
     @Input() pdid: number;
     @Input() form_id: number;
+    @Input() applicant_details: any;
     relationData: any = [];
     industryData: any = [];
     activityData: any = [];
     relativeNames: any;
+    applicants: any;
     public businessForm: FormGroup;
     private notifier: NotifierService;
 
@@ -44,6 +46,7 @@ export class BusinessInfoComponent implements OnInit {
         this.notifier = notifier;
     }
     ngOnInit() {
+        this.applicants = this.applicant_details.pdapplicants_detials;
         this.getRelation();
         this.getIndustry();
         this.getActivity();
@@ -58,15 +61,14 @@ export class BusinessInfoComponent implements OnInit {
             let businessVal = data.records;
             console.log('data', businessVal);
             let constVal: any;
-            const Desgn = <FormArray>this.businessForm.controls['designation'];
+            //const Desgn = <FormArray>this.businessForm.controls['designation'];
             const Partnr = <FormArray>this.businessForm.controls['partners'];
             const otherDoc = <FormArray>this.businessForm.controls['documents'];
-
             if (data.status == 200) {
                 let DocArray: any;
-                let DesgnArray = Object.keys(data.records.designation).map(function (key) {
-                    return data.records.designation[key];
-                });
+                // let DesgnArray = Object.keys(data.records.designation).map(function (key) {
+                //     return data.records.designation[key];
+                // });
                 let PartnrArray = Object.keys(data.records.partners).map(function (key) {
                     return data.records.partners[key];
                 });
@@ -81,14 +83,14 @@ export class BusinessInfoComponent implements OnInit {
                     existRelative.push(val);
                 });
                 this.relativeNames = existRelative;
-                if (DesgnArray.length == 0) {
-                    Desgn.push(this.createDesignation());
-                } else {
-                    DesgnArray.forEach(datas => {
-                        Desgn.push(this.createDesignation());
-                    });
+                // if (DesgnArray.length == 0) {
+                //     Desgn.push(this.createDesignation());
+                // } else {
+                //     DesgnArray.forEach(datas => {
+                //         Desgn.push(this.createDesignation());
+                //     });
                        
-                }
+                // }
                 if (PartnrArray.length == 0) {
                     Partnr.push(this.createPartners());
                 } else {
@@ -107,23 +109,23 @@ export class BusinessInfoComponent implements OnInit {
                     DocArray = [{document: ''}];
                     otherDoc.push(this.createDocument());
                 }
-                if (data.records.ownership_setup != 'others') {
-                    businessVal.ownership_others  = '';
-                }
-                if (data.records.ownership_setup != 'rented') {
-                    businessVal.rent_paid  = '';
-                }
+                // if (data.records.ownership_setup != 'others') {
+                //     businessVal.ownership_others  = '';
+                // }
+                // if (data.records.ownership_setup != 'rented') {
+                //     businessVal.rent_paid  = '';
+                // }
                 businessVal.family_members_involved  = enduse;
                 businessVal.pdid  = this.pdid;
                 businessVal.formid  = this.form_id;
                 businessVal.fk_createdby  = this.pdid;
-                businessVal.designation  = DesgnArray;
+                //businessVal.designation  = DesgnArray;
                 businessVal.partners  = PartnrArray;
                 businessVal.documents  = DocArray;
 
                 this.businessForm.setValue(businessVal);
             } else {
-                Desgn.push(this.createDesignation());
+                //Desgn.push(this.createDesignation());
                 Partnr.push(this.createPartners());
                 otherDoc.push(this.createDocument());
             }
@@ -140,23 +142,27 @@ export class BusinessInfoComponent implements OnInit {
             fk_createdby: this.pdid,
             profession_name: ['', Validators.compose([Validators.required])],
             business_years: ['', Validators.compose([Validators.required])],
+            business_month: ['', Validators.compose([Validators.required])],
             industry: ['', Validators.compose([Validators.required])],
             type_of_activity: ['', Validators.compose([Validators.required])],
+            other_activity_type : [''],
             seasonality: ['', Validators.compose([Validators.required])],
-            designation: this.fb.array([]),
+            month_of_business_run : [''],
+            peak_period_of_business : [''],
+            //designation: this.fb.array([]),
             partners: this.fb.array([]),
             employees_total: ['', Validators.compose([Validators.required])],
             employees_permanent: ['', Validators.compose([Validators.required])],
             employees_temporary: ['', Validators.compose([Validators.required])],
             officer_total: ['', Validators.compose([Validators.required])],
-            officer_permanent: ['', Validators.compose([Validators.required])],
-            officer_temporary: ['', Validators.compose([Validators.required])],
+            // officer_permanent: ['', Validators.compose([Validators.required])],
+            // officer_temporary: ['', Validators.compose([Validators.required])],
             invested_amount: ['', Validators.compose([Validators.required])],
-            working_capital: ['', Validators.compose([Validators.required])],
+            //working_capital: ['', Validators.compose([Validators.required])],
             is_service_provided: ['', Validators.compose([Validators.required])],
-            ownership_setup: ['', Validators.compose([Validators.required])],
-            ownership_others: [''],
-            rent_paid: [''],
+            // ownership_setup: ['', Validators.compose([Validators.required])],
+            // ownership_others: [''],
+            // rent_paid: [''],
             shop_eat_act_cert: ['', Validators.compose([Validators.required])],
             gst_Regn_cert: ['', Validators.compose([Validators.required])],
             export_import_cert: ['', Validators.compose([Validators.required])],
@@ -168,24 +174,27 @@ export class BusinessInfoComponent implements OnInit {
             documents: this.fb.array([]),
             business_remarks: ['', Validators.compose([Validators.required])],
             who_started: ['', Validators.compose([Validators.required])],
+            other_bussiness_who_started : [''],
             main_person: ['', Validators.compose([Validators.required])],
             other_main_person: [''],
             family_members_involved: ['', Validators.compose([Validators.required])],
             before_business: ['', Validators.compose([Validators.required])],
+            before_business_description: [''],
             any_delays: ['', Validators.compose([Validators.required])],
         });
     }
-    createDesignation(): FormGroup {
-        return this.fb.group({
-            sec_name: ['', Validators.compose([Validators.required])],
-            sec_designation: ['', Validators.compose([Validators.required])],
-        });
-    }
+    // createDesignation(): FormGroup {
+    //     return this.fb.group({
+    //         sec_name: ['', Validators.compose([Validators.required])],
+    //         sec_designation: ['', Validators.compose([Validators.required])],
+    //     });
+    // }
     createPartners(): FormGroup {
         return this.fb.group({
             partner_name: ['', Validators.compose([Validators.required])],
             shareholding: ['', Validators.compose([Validators.required])],
-            current_business_experiance: ['', Validators.compose([Validators.required])],
+            current_business_experiance_year: ['', Validators.compose([Validators.required])],
+            current_business_experiance_month: ['', Validators.compose([Validators.required])],
             total_business_experiance: ['', Validators.compose([Validators.required])],
         });
     }
@@ -194,14 +203,14 @@ export class BusinessInfoComponent implements OnInit {
             document: ['']
         });
     }
-    addDesignation() {
-        const control = <FormArray>this.businessForm.controls['designation'];
-        control.push(this.createDesignation());
-    }
-    deleteDesignation(index) {
-        const control = <FormArray>this.businessForm.controls['designation'];
-        control.removeAt(index);
-    }
+    // addDesignation() {
+    //     const control = <FormArray>this.businessForm.controls['designation'];
+    //     control.push(this.createDesignation());
+    // }
+    // deleteDesignation(index) {
+    //     const control = <FormArray>this.businessForm.controls['designation'];
+    //     control.removeAt(index);
+    // }
     addPartnerDetails() {
         const control = <FormArray>this.businessForm.controls['partners'];
         control.push(this.createPartners());
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 d3ce744d2..20416eb11 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
@@ -1,14 +1,20 @@
 <mat-card  style="min-height: 550px;">
     <mat-card-content>
-            <p>Current Loan Details</p>
+            <p>Existing Loan Obligations</p>
             <form [formGroup]="currentLoanForm" class="address">
-                <mat-form-field>
+            <!-- <div fxLayout="row">
+              <div fxFlex="60" class="pb-0 text-sm-left"> -->
+                <mat-form-field style="width:60% !important;">
                     <mat-select  (selectionChange)="selectedLoanChanges($event)" placeholder="Do you have any other existing loan"
                                 formControlName="existing_loan" required>
                         <mat-option value="Yes">Yes</mat-option>
                         <mat-option value="No">No</mat-option>
                     </mat-select>
                 </mat-form-field>
+            <!-- </div>
+            </div> -->
+            
+             
                 <mat-card *ngIf="currentLoanForm.controls.existing_loan.value == 'Yes'">
                     <mat-card-header>
                         <p>Loan Details<p>
@@ -16,19 +22,43 @@
                     <div formArrayName="loan_details">
                         <div *ngFor="let details of currentLoanForm.get('loan_details').controls; let i=index"
                              [formGroupName]="i">
+                             <!-- {{frequencyData | json}} -->
                             <mat-card-content class="matcard">
                                 <mat-form-field>
                                     <input matInput placeholder="Loan Amount" formControlName="loan_amount" (keypress)="keyPress($event)" required>
                                 </mat-form-field>
                                 <mat-form-field>
-                                    <input matInput placeholder="EMI" formControlName="emi" (keypress)="keyPress($event)" required>
+                                        <mat-select (selectionChange)="selectedfrequency($event,i)" placeholder="Frequency"
+                                        formControlName="frequency" required>
+                                            <mat-option *ngFor="let freq of frequencyData" value="{{freq.frequency_id}}">{{freq.name}}</mat-option>
+                                        </mat-select>
+                                </mat-form-field>
+                                <mat-form-field>
+                                    <input matInput [placeholder]="placeholderName != '' && IDXval == i ? placeholderName :'Instalment Amount' " formControlName="emi" (keypress)="keyPress($event)" required>
                                 </mat-form-field>
                                 <mat-form-field>
                                     <input matInput placeholder="Loan Type" formControlName="loan_type" required>
                                 </mat-form-field>
                                 <mat-form-field>
-                                    <input matInput placeholder="Lender" formControlName="lender" required>
+                                    <mat-select placeholder="Loan Taken By" formControlName="loan_taken_by" required>
+                                            <mat-option value="{{owner.pd_co_applicant_id}}" *ngFor="let owner of applicants">{{owner.applicant_name}}</mat-option>
+                                            <mat-option value="Others">Others</mat-option>
+                                    </mat-select>   
                                 </mat-form-field>
+                                <mat-form-field *ngIf="details.get('loan_taken_by').value == 'Others'">
+                                    <input matInput placeholder="Specify Others Loan Taken" formControlName="others_loan_taken">
+                                </mat-form-field>
+                                <mat-form-field>
+                                        <mat-select placeholder="Lender" formControlName="lender" required>
+                                                <mat-option *ngFor="let btLen of lenderData" [value]="btLen.bt_lender_list_id">{{ btLen.lender_name }}</mat-option>
+                                        </mat-select>
+                                </mat-form-field>
+                                <mat-form-field *ngIf="details.get('lender').value == 3">
+                                    <input matInput placeholder="Specify Others Loan Taken" formControlName="others_loan_taken">
+                                </mat-form-field>
+                                <!-- <mat-form-field>
+                                    <input matInput placeholder="Lender" formControlName="lender" required>
+                                </mat-form-field> -->
                                 <mat-form-field>
                                     <input matInput placeholder="Original Tenure in Months" formControlName="original_tenure" required>
                                 </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 78dd06331..e493001ef 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
@@ -33,6 +33,13 @@ export class CurrentLoanComponent implements OnInit {
     private notifier: NotifierService;
     @Input() pdid: number;
     @Input() form_id: number;
+    @Input() applicant_details: any;
+    lenderData: any = [];
+    frequencyData: any = [];
+    applicants: any;
+    placeholderName : any;
+    holder: any = 'amount';
+    IDXval : any;
 
     constructor(notifier: NotifierService, private fb: FormBuilder, private route: ActivatedRoute,
         private router: Router,
@@ -41,10 +48,13 @@ export class CurrentLoanComponent implements OnInit {
 
     }
     ngOnInit() {
+        this.getMasterDetails('BTLENDERLIST',1);
+        this.getMasterDetails('FREQUENCY',2);
         this.initCurrentloanForm();
         let params: any = {};
         params.pd_id = this.pdid;
         params.pd_form_id = this.form_id;
+        this.applicants = this.applicant_details.pdapplicants_detials;
         this._pd.retriveForm(params).subscribe(value => {
             console.log('value', value);
             const control = <FormArray>this.currentLoanForm.controls['loan_details'];
@@ -88,12 +98,36 @@ export class CurrentLoanComponent implements OnInit {
             arr.removeAt(0);
         }
     }
+    
+    selectedfrequency(e,i){
+        // console.log(+e.value);
+        // console.log(i);
+        
+        
+        this.IDXval = i;
+        
+        switch(+e.value){
+            case 1: this.placeholderName = 'Weekly Installment Amount';  break;
+            case 2: this.placeholderName = 'Daily Installment Amount';  break;
+            case 3: this.placeholderName = 'Annual Installment Amount'; break;
+            case 4: this.placeholderName = 'Hourly Installment Amount'; break;
+            case 5: this.placeholderName = 'EMI Amount'; break;
+            case 6: this.placeholderName = 'Quarterly Installment Amount'; break;
+            case 7: this.placeholderName = 'HalfYearly Installment Amount'; break;
+            default : this.placeholderName = ''; break;
+        }
+    }
+
     createLoanDetail() {
         return this.fb.group({
             loan_amount: ['', Validators.compose([Validators.required])],
+            frequency:['', Validators.compose([Validators.required])],
             emi: ['', Validators.compose([Validators.required])],
             loan_type: ['', Validators.compose([Validators.required])],
+            loan_taken_by:[''],
+            others_loan_taken:[''],
             lender: ['', Validators.compose([Validators.required])],
+            others_lender:[''],
             original_tenure: ['', Validators.compose([Validators.required])],
             current_balance_tenure: ['', Validators.compose([Validators.required])],
         });
@@ -138,6 +172,18 @@ export class CurrentLoanComponent implements OnInit {
             }
         });
     }
+    getMasterDetails(table:string,type:number){
+        this._pd.getAllMasterDatas(table).subscribe(data => {
+            data.records.forEach(val => {
+                if (type==1 && val.isactive == 1) {
+                    this.lenderData.push(val);
+                }
+                else if(type==2 && val.isactive == 1){
+                    this.frequencyData.push(val);
+                }
+            })
+        });
+    }
     /** On Key Press Event For Amount  */
     keyPress(event: any) {
         const pattern = /[0-9]/;
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 5053fbe6c..2142bd66d 100644
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.html
@@ -3,7 +3,7 @@
     <mat-card-content>
         <p>Family Details</p>
 <form class="address" [formGroup]="familyForm">
-    <mat-form-field>
+    <!-- <mat-form-field>
         <mat-select placeholder="Person Met" formControlName="person" required>
             <mat-option *ngFor="let personMet of personMetData" [value]="personMet.person_met_id">
                 {{personMet.person_met_name}}
@@ -12,9 +12,9 @@
     </mat-form-field>
     <mat-form-field *ngIf="person.value ==8">
         <input matInput placeholder="Enter the relationship" formControlName="personOther">
-    </mat-form-field>
+    </mat-form-field> -->
     <mat-form-field>
-        <input matInput placeholder="No. Of Family Members" formControlName="members" required>
+        <input matInput placeholder="Number Of Family Members" formControlName="members" required>
     </mat-form-field>
     <mat-card>
         <mat-card-header>
@@ -25,8 +25,16 @@
             <div *ngFor="let item of familyForm.controls.earningMembers['controls']; let i=index"
                  [formGroupName]="i">
                 <mat-card-content class="matcards">
+                        <mat-form-field>
+                                <input matInput placeholder="Name"
+                                       formControlName="earning_member_name" required>
+                        </mat-form-field>
+                        <mat-form-field>
+                                    <input matInput placeholder="Age" (keypress)="keyPress($event)"
+                                           formControlName="earning_member_age" required>
+                        </mat-form-field>
                     <mat-form-field>
-                        <mat-select placeholder="Relation" formControlName="relation">
+                        <mat-select placeholder="Relation" formControlName="relation" required>
                             <mat-option value="{{relations.relationship_id}}"
                                         *ngFor="let relations of relationData">
                                 {{relations.name}}
@@ -34,7 +42,7 @@
                         </mat-select>
                     </mat-form-field>
                     <mat-form-field>
-                        <mat-select placeholder="Segment" formControlName="segment">
+                        <mat-select placeholder="Segment" formControlName="segment" required>
                                 <mat-option value="{{cusSeg.customer_segment_id}}"
                                 *ngFor="let cusSeg of customerSegData">
                         {{cusSeg.name}}
@@ -44,11 +52,11 @@
                     </mat-form-field>
                     <mat-form-field>
                         <input matInput placeholder="Income / Revenue"
-                               formControlName="income">
+                               formControlName="income" required>
                     </mat-form-field>
                     <mat-form-field>
                         <input matInput placeholder="Name of Employer / Business"
-                               formControlName="employer_name">
+                               formControlName="employer_name" required>
                     </mat-form-field>
                     <button type="button" mat-raised-button mat-icon-button *ngIf="i==0" color="primary"
                     matTooltip="Add More Earning Members" matTooltipPosition="above"  (click)="addearningMembers()">
@@ -71,27 +79,39 @@
             <div *ngFor="let members of familyForm.controls.nonEarningMembers['controls']; let i=index"
                  [formGroupName]="i">
                 <mat-card-content class="matcard">
-                    <mat-form-field>
-                        <mat-select placeholder="Relation"
-                                    formControlName="relationship">
-                            <mat-option value="{{relation.relationship_id}}"
+                        <mat-form-field>
+                                <input matInput placeholder="Name"
+                                       formControlName="non_earning_member_name" required>
+                        </mat-form-field>
+                        <mat-form-field>
+                                    <input matInput placeholder="Age" (keypress)="keyPress($event)"
+                                           formControlName="non_earning_member_age" required>
+                        </mat-form-field>
+                        <mat-form-field>
+                            <mat-select placeholder="Relation"
+                                    formControlName="relationship" required>
+                                <mat-option value="{{relation.relationship_id}}"
                                         *ngFor="let relation of relationData">
                                 {{relation.name}}
-                            </mat-option>
-                        </mat-select>
-                    </mat-form-field>
-                    <mat-form-field>
-                        <mat-select placeholder="Occupation"
-                                    formControlName="occupation">
-                            <mat-option value="{{occupation.occupation_non_earning_member_id}}"
+                                </mat-option>
+                            </mat-select>
+                        </mat-form-field>
+                        <mat-form-field>
+                            <mat-select placeholder="Occupation"
+                                    formControlName="occupation" required>
+                                <mat-option value="{{occupation.occupation_non_earning_member_id}}"
                                         *ngFor="let occupation of occupationData">{{occupation.name}}
-                            </mat-option>
-                        </mat-select>
-                    </mat-form-field>
+                                </mat-option>
+                            </mat-select>
+                        </mat-form-field>
                     <mat-form-field *ngIf="members['controls'].occupation.value==3">
                         <input matInput placeholder="Retired From"
                                formControlName="retired">
                     </mat-form-field>
+                    <mat-form-field *ngIf="members['controls'].occupation.value==9">
+                            <input matInput placeholder="Specify Others Occupation"
+                                   formControlName="others_occupation">
+                        </mat-form-field>
                     <button type="button" mat-raised-button mat-icon-button (click)="addMembers()" color="primary"
                     matTooltip="Add More Non Earning Members" matTooltipPosition="above"  *ngIf="i==0">
                         <mat-icon>add</mat-icon>
@@ -113,8 +133,8 @@
                 <input matInput placeholder="Residence Address"
                        formControlName="residence" required>
             </mat-form-field>
-            <mat-form-field>
-                <input matInput placeholder="No.of yrs" formControlName="years" required>
+            <mat-form-field> 
+                <input matInput placeholder="Number of yrs" formControlName="years" required>
             </mat-form-field>
             <mat-form-field>
                 <mat-select placeholder="Ownership" formControlName="ownership" required>
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.ts
index f5c65ad57..932040e87 100644
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.ts
@@ -35,8 +35,8 @@ export class FamilyDetailsComponent implements OnInit {
     private notifier: NotifierService;
     public familyForm: FormGroup;
 
-    public person: AbstractControl;
-    public personOther: AbstractControl;
+    // public person: AbstractControl;
+    // public personOther: AbstractControl;
     public members: AbstractControl;
     public residence: AbstractControl;
     public years: AbstractControl;
@@ -46,9 +46,11 @@ export class FamilyDetailsComponent implements OnInit {
 
     relationData: any = [];
     occupationData: any = [];
-    personMetData: any = [];
+    //personMetData: any = [];
     ownerShipData: any = [];
     customerSegData: any = [];
+    // earnMemberArrCount :any ;
+    // nonEarnMemberArrCount :any ;
     constructor(notifier: NotifierService, private fb: FormBuilder, private route: ActivatedRoute,
                 private router: Router,
                 private _pd: PdTrigerService) {
@@ -57,7 +59,7 @@ export class FamilyDetailsComponent implements OnInit {
     ngOnInit() {
         this.getMasterDetails('RELATIONSHIPS',1);
         this.getMasterDetails('OCCUPATIONMEMBERS',2);
-        this.getMasterDetails('PERSONSMET',3);
+        //this.getMasterDetails('PERSONSMET',3);
         this.getMasterDetails('RESIDENCEOWNERSHIP',4);
         this.getMasterDetails('CUSTOMERSEGMENT',5)
         this.initFamilyForm();
@@ -74,10 +76,10 @@ export class FamilyDetailsComponent implements OnInit {
                 var earning = Object.keys(data.records.earning_members).map(function (key) {
                     return data.records.earning_members[key];
                 });
-                this.familyForm.controls.person.setValue(data.records.person_met);
-                if (data.records.person_met_other) {
-                    this.familyForm.controls.personOther.setValue(data.records.person_met_other);
-                }
+                // this.familyForm.controls.person.setValue(data.records.person_met);
+                // if (data.records.person_met_other) {
+                //     this.familyForm.controls.personOther.setValue(data.records.person_met_other);
+                // }
                 this.familyForm.controls.members.setValue(data.records.family_members);
                 this.familyForm.controls.years.setValue(data.records.no_of_years);
                 this.familyForm.controls.ownership.setValue(data.records.ownership);
@@ -112,8 +114,8 @@ export class FamilyDetailsComponent implements OnInit {
     }
     public initFamilyForm(): void {
         this.familyForm = this.fb.group({
-            person: ['', Validators.compose([Validators.required])],
-            personOther: [''],
+            // person: ['', Validators.compose([Validators.required])],
+            // personOther: [''],
             members: ['', Validators.compose([Validators.required])],
             residence: ['', Validators.compose([Validators.required])],
             years: ['', Validators.compose([Validators.required])],
@@ -124,8 +126,8 @@ export class FamilyDetailsComponent implements OnInit {
             nonEarningMembers: this.fb.array([]),
             family_details_form_remark: ['']
         });
-        this.person = this.familyForm.controls['person'];
-        this.personOther = this.familyForm.controls['personOther'];
+        // this.person = this.familyForm.controls['person'];
+        // this.personOther = this.familyForm.controls['personOther'];
         this.members = this.familyForm.controls['members'];
         this.residence = this.familyForm.controls['residence'];
         this.years = this.familyForm.controls['years'];
@@ -135,6 +137,8 @@ export class FamilyDetailsComponent implements OnInit {
     }
     createMembers(): FormGroup {
         return this.fb.group({
+            earning_member_name : ['', Validators.compose([Validators.required])],
+            earning_member_age : ['', Validators.compose([Validators.required])],
             relation: ['', Validators.compose([Validators.required])],
             segment: ['', Validators.compose([Validators.required])],
             income: ['', Validators.compose([Validators.required])],
@@ -143,19 +147,44 @@ export class FamilyDetailsComponent implements OnInit {
     }
     createNonMembers(): FormGroup {
         return this.fb.group({
+            non_earning_member_name : ['', Validators.compose([Validators.required])],
+            non_earning_member_age : ['', Validators.compose([Validators.required])],
             relationship: ['', Validators.compose([Validators.required])],
             occupation: ['', Validators.compose([Validators.required])],
             retired: [''],
+            others_occupation : ['']
         });
     }
 
     addearningMembers() {
+        
         const control = <FormArray>this.familyForm.controls['earningMembers'];
+        //this.earnMemberArrCount = control.length;
+
+        if(control.length == this.familyForm.controls['members'].value)
+        {
+
+        }else{
         control.push(this.createMembers());
+        //console.log('Add earn member',this.familyForm.controls['members'].value);
+        }
+        
+        // console.log(this.earnMemberArrCount);
+        // console.log(this.nonEarnMemberArrCount);
     }
     addMembers() {
         const control = <FormArray>this.familyForm.controls['nonEarningMembers'];
-        control.push(this.createNonMembers());
+        // this.nonEarnMemberArrCount = control.length;
+        // console.log(this.earnMemberArrCount);
+        // console.log(this.nonEarnMemberArrCount);
+        if(control.length == this.familyForm.controls['members'].value)
+        {
+
+        }else{
+            control.push(this.createNonMembers());
+        }
+        
+        
     }
     deleteEarningMembers(index) {
         const control = <FormArray>this.familyForm.controls['earningMembers'];
@@ -176,9 +205,9 @@ export class FamilyDetailsComponent implements OnInit {
                 else if(type==2){
                     this.occupationData=data.records.filter(item => item.isactive == 1);
                 }
-                else if(type==3){
-                    this.personMetData=data.records.filter(item => item.isactive == 1);
-                }
+                // else if(type==3){
+                //     this.personMetData=data.records.filter(item => item.isactive == 1);
+                // }
                 else if(type==4){
                     this.ownerShipData=data.records.filter(item => item.isactive == 1);
                 }
@@ -204,14 +233,16 @@ export class FamilyDetailsComponent implements OnInit {
         if (this.ownership.value == 3) {
             records.what_rent = this.rent.value;
         }
-        if (this.person.value == 8) {
-            records.person_met_other = this.personOther.value;
-        }
-        records.person_met = this.person.value;
+        // if (this.person.value == 8) {
+        //     records.person_met_other = this.personOther.value;
+        // }
+        //records.person_met = this.person.value;
         records.family_members = this.members.value;
         records.earning_members = this.familyForm.controls['earningMembers'].value;
-       // filter retired conditions
+       // filter re conditions
         let non_earning_members_filter = this.familyForm.controls['nonEarningMembers'].value.map(function(obj) {
+         
+        console.log(obj.occupation);
         if(obj.occupation==3){
             return obj;
         }
@@ -219,6 +250,13 @@ export class FamilyDetailsComponent implements OnInit {
              obj.retired='';
             return obj;
         }
+        if(obj.occupation==9){
+            return obj;
+        }
+        else{
+             obj.others_occupation='';
+            return obj;
+        }
         });
         records.non_earning_members = non_earning_members_filter;
         records.family_details_form_remark = this.familyForm.controls['family_details_form_remark'].value;
@@ -241,4 +279,15 @@ export class FamilyDetailsComponent implements OnInit {
             }
         });
     }
+
+     /** On Key Press Event For Age  */
+     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 082d27377..e67d73036 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,7 +2,8 @@
     <p>Loan Details</p>
 <form [formGroup]="loanDetailsForm" class="address">
     <mat-form-field>
-        <input matInput placeholder="Loan Amount Applied" formControlName="loan_amount" (keypress)="keyPress($event)" required >
+        <input matInput placeholder="Loan Amount Applied for ? " formControlName="loan_amount" (keypress)="keyPress($event)" (keyup)="inWords($event,1)" required >
+        <mat-hint align="end" *ngIf="loanDetailsForm.controls['loan_amount'].value != ''">{{"&#8377;"}} {{loanAmtInWords}} Only</mat-hint>
     </mat-form-field>
     <mat-form-field>
         <mat-select multiple (selectionChange)="endUserChange($event)" placeholder="What is the end use" formControlName="end_use" required>
@@ -24,7 +25,7 @@
         <input matInput placeholder="Specify End Use" formControlName="end_use_other">
     </mat-form-field>
     <mat-form-field>
-        <mat-select placeholder="Is there a balance transfer" (selectionChange)="selectedBalancesTransferChanges($event)"
+        <mat-select placeholder="Is there a balance transfer ? " (selectionChange)="selectedBalancesTransferChanges($event)"
                     formControlName="is_transfer" required>
             <mat-option value="yes">Yes</mat-option>
             <mat-option value="no">No</mat-option>
@@ -32,7 +33,8 @@
     </mat-form-field>
     
     <mat-form-field *ngIf="loanDetailsForm.controls['is_transfer'].value == 'yes'">
-            <input matInput placeholder="Balance Transfer Amount" (keypress)="keyPress($event)" formControlName="balance_transfer_amount">
+            <input matInput placeholder="What is the amount required for Balance Transfer ? " (keypress)="keyPress($event)" formControlName="balance_transfer_amount" (keyup)="inWords($event,2)">
+              <mat-hint align="end" *ngIf="loanDetailsForm.controls['loan_amount'].value != ''">{{"&#8377;"}} {{balTxrfAmtInWords}} Only</mat-hint>
         </mat-form-field>
     <mat-form-field *ngIf="loanDetailsForm.controls['is_transfer'].value == 'yes'">
         <mat-select  placeholder="Is there a Top Up"
@@ -41,14 +43,23 @@
             <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" (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-select placeholder="Lender from where balance transfer done" 
+            formControlName="lender">
+    <mat-option *ngFor="let btLen of m_btLenderList" [value]="btLen.bt_lender_list_id">{{ btLen.lender_name }}</mat-option>
+    
+</mat-select>
+    </mat-form-field>
+    <mat-form-field *ngIf="loanDetailsForm.controls['lender'].value == 3">
+            <input matInput placeholder="Specify Others Lender" formControlName="other_bt_lender">
+    </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" (keypress)="keyPress($event)" formControlName="topup_amount" (keyup)="inWords($event,5)">
+        <mat-hint align="end" *ngIf="loanDetailsForm.controls['topup_amount'].value != ''">{{"&#8377;"}} {{topUpAmtInWords}} Only</mat-hint>
     </mat-form-field>
     <mat-form-field>
-        <input matInput placeholder="Amount of Own Contribution" formControlName="own_contribution" (keypress)="keyPress($event)" required> 
+        <input matInput placeholder="Amount of Own Contribution" formControlName="own_contribution" (keypress)="keyPress($event)" required (keyup)="inWords($event,4)">
+        <mat-hint align="end" *ngIf="loanDetailsForm.controls['own_contribution'].value != ''">{{"&#8377;"}} {{ownContributionInWords}} Only</mat-hint>
     </mat-form-field>
 
     <mat-form-field>
@@ -104,13 +115,21 @@
                 <mat-select multiple placeholder="Name of Owner"
                             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-option value="Others">Others</mat-option>
                 </mat-select>
             </mat-form-field>
+            
             <mat-form-field>
 
                 <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-option *ngFor="let status of m_statusofCunstruction" [value]="status.id">{{ status.name }} {{status.id}}</mat-option>
                 </mat-select>
+            </mat-form-field>
+
+                <mat-form-field *ngIf="loanDetailsForm.controls['construction_status'].value == 4">
+                        <input matInput placeholder="What is the approximate stage of construction (%)?"
+                               formControlName="percentage_of_construction" (keypress)="keyPress($event)" required>
+                </mat-form-field>
 
                 <!--<mat-select placeholder="Status of construction"
                             formControlName="construction_status">
@@ -118,16 +137,16 @@
                     <mat-option value="other_purpose">Complete</mat-option>
                     <mat-option value="other_purpose">Vacant Land</mat-option>
                 </mat-select>-->
-            </mat-form-field>
-
+            
             <mat-form-field>
-                <input matInput placeholder="EMV as Per Customer"
+                <input matInput placeholder="Estimate Market Value as Per Customer"
                        formControlName="emv_per_customer" (keypress)="keyPress($event)" required>
             </mat-form-field>
-            <mat-form-field>
+            <!-- <mat-form-field>
                 <input matInput placeholder="Value as Per Agreement"
-                       formControlName="value_per_agreement" (keypress)="keyPress($event)" required>
-            </mat-form-field>
+                       formControlName="value_per_agreement" (keypress)="keyPress($event)" required (keyup)="inWords($event,3)">
+                       <mat-hint align="end" *ngIf="loanDetailsForm.controls['loan_amount'].value != ''">{{"&#8377;"}} {{valAsPerAgmtInWords}} Only</mat-hint>
+            </mat-form-field> -->
         </mat-card-content>
     </mat-card>
     <div fxLayout="row">
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 70da10836..39a681d7f 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
@@ -43,6 +43,14 @@ export class LoanDetailsComponent implements OnInit {
     m_sourceofamount = [];
     m_mortageTypeProperty = [];
     m_statusofCunstruction = [];
+    m_btLenderList = [];
+    
+    loanAmtInWords : any;
+    balTxrfAmtInWords : any;
+    valAsPerAgmtInWords : any;
+    ownContributionInWords : any;
+    topUpAmtInWords: any;
+
     constructor(notifier: NotifierService, private fb: FormBuilder, private route: ActivatedRoute,
                 private router: Router,
                 private _pd: PdTrigerService) {
@@ -50,12 +58,17 @@ export class LoanDetailsComponent implements OnInit {
         this.notifier = notifier;
     }
     ngOnInit() {
+        
+        console.log(this.applicant_details.pdapplicants_detials);
+        console.log(this.applicant_details);
         this.applicants = this.applicant_details.pdapplicants_detials;
+
         this.initloanDetailsForm();
         this.getM_EndUseofLoad();
         this.getM_sourceofamount();
         this.getM_MortageTypeProperty();
         this.getM_StatusofCunstruction();
+        this.getM_BTLenderList();
         let params: any = {};
         params.pd_id = this.pdid;
         params.pd_form_id = this.form_id;
@@ -79,7 +92,10 @@ export class LoanDetailsComponent implements OnInit {
                 });
                 console.log('enduse', enduse);
                 console.log('ownername', ownername);
+                
                 this.loanDetailsForm.controls['loan_amount'].setValue(value.records.loan_amount);
+                if(value.records.loan_amount){ this.loanAmtInWords = this._pd.convertNumberToWords(value.records.loan_amount); }
+
                 this.loanDetailsForm.controls['end_use'].setValue(enduse);
                 if (value.records.end_use_other) {
                     this.loanDetailsForm.controls['end_use_other'].setValue(value.records.end_use_other);
@@ -88,14 +104,22 @@ export class LoanDetailsComponent implements OnInit {
                 this.loanDetailsForm.controls['is_topup'].setValue(value.records.is_topup);
                 if (value.records.balance_transfer_amount) {
                     this.loanDetailsForm.controls['balance_transfer_amount'].setValue(value.records.balance_transfer_amount);
+                    this.balTxrfAmtInWords = this._pd.convertNumberToWords(value.records.balance_transfer_amount); 
                 }
                 if (value.records.topup_amount) {
                     this.loanDetailsForm.controls['topup_amount'].setValue(value.records.topup_amount);
+                    this.topUpAmtInWords = this._pd.convertNumberToWords(value.records.topup_amount); 
                 }
                 if (value.records.lender) {
                     this.loanDetailsForm.controls['lender'].setValue(value.records.lender);
                 }
+                if (value.records.other_bt_lender) {
+                    this.loanDetailsForm.controls['other_bt_lender'].setValue(value.records.other_bt_lender);
+                }
+                
                 this.loanDetailsForm.controls['own_contribution'].setValue(value.records.own_contribution);
+                if(value.records.own_contribution){ this.ownContributionInWords = this._pd.convertNumberToWords(value.records.own_contribution); }
+                
                 this.loanDetailsForm.controls['source'].setValue(value.records.source);
                 if (value.records.lender_name_type) {
                     this.loanDetailsForm.controls['lender_name_type'].setValue(value.records.lender_name_type);
@@ -104,8 +128,15 @@ export class LoanDetailsComponent implements OnInit {
                 this.loanDetailsForm.controls['property_type'].setValue(value.records.property_type);
                 this.loanDetailsForm.controls['owner_name'].setValue(ownername);
                 this.loanDetailsForm.controls['construction_status'].setValue(value.records.construction_status);
+                if(value.records.construction_status == 4 ){
+                    this.loanDetailsForm.controls['percentage_of_construction'].setValue(value.records.percentage_of_construction);
+                }
+                else{
+                    this.loanDetailsForm.controls['percentage_of_construction'].setValue('');
+                }
                 this.loanDetailsForm.controls['emv_per_customer'].setValue(value.records.emv_per_customer);
-                this.loanDetailsForm.controls['value_per_agreement'].setValue(value.records.value_per_agreement);
+                // this.loanDetailsForm.controls['value_per_agreement'].setValue(value.records.value_per_agreement);
+                // if(value.records.value_per_agreement){ this.valAsPerAgmtInWords = this._pd.convertNumberToWords(value.records.value_per_agreement); }
                 this.loanDetailsForm.controls['loandetails_remarks'].setValue(value.records.loandetails_remarks);
             }
         })
@@ -161,6 +192,12 @@ getM_sourceofamount() {
     )
   }
 
+  getM_BTLenderList(){
+    this._pd.getAllMasterDatas('BTLENDERLIST').subscribe(
+      data => {
+        this.m_btLenderList = data.records.filter(data => data.isactive == 1);
+      })
+  }
 
 
 // ==================
@@ -175,6 +212,7 @@ getM_sourceofamount() {
             balance_transfer_amount: [''],
             topup_amount: [''],
             lender: [''],
+            other_bt_lender : [''],
             own_contribution: ['', Validators.compose([Validators.required])],
             source: ['', Validators.compose([Validators.required])],
             lender_name_type: [''],
@@ -182,8 +220,9 @@ getM_sourceofamount() {
             property_type: ['', Validators.compose([Validators.required])],
             owner_name: ['', Validators.compose([Validators.required])],
             construction_status: ['', Validators.compose([Validators.required])],
+            percentage_of_construction : [''],
             emv_per_customer: ['', Validators.compose([Validators.required])],
-            value_per_agreement: ['', Validators.compose([Validators.required])],
+            //value_per_agreement: ['', Validators.compose([Validators.required])],
             loandetails_remarks: ['', Validators.compose([Validators.required])],
         });
     }
@@ -235,6 +274,10 @@ getM_sourceofamount() {
         if (this.loanDetailsForm.controls['is_topup'].value == 'yes' || this.loanDetailsForm.controls['is_transfer'].value == 'yes') {
             records.lender = this.loanDetailsForm.controls['lender'].value;
         }
+        if(this.loanDetailsForm.controls['lender'].value == 3){
+            records.other_bt_lender = this.loanDetailsForm.controls['other_bt_lender'].value;
+        }
+        
         records.own_contribution = this.loanDetailsForm.controls['own_contribution'].value;
         records.source = this.loanDetailsForm.controls['source'].value;
         if (this.loanDetailsForm.controls['source'].value == 'other') {
@@ -250,8 +293,9 @@ getM_sourceofamount() {
                 });
         records.owner_name_group = dataOwner_name;
         records.construction_status = this.loanDetailsForm.controls['construction_status'].value;
+        records.percentage_of_construction = this.loanDetailsForm.controls['percentage_of_construction'].value;
         records.emv_per_customer = this.loanDetailsForm.controls['emv_per_customer'].value;
-        records.value_per_agreement = this.loanDetailsForm.controls['value_per_agreement'].value;
+        //records.value_per_agreement = this.loanDetailsForm.controls['value_per_agreement'].value;
         records.loandetails_remarks = this.loanDetailsForm.controls['loandetails_remarks'].value;
         console.log('data', records);
         this._pd.saveForm(records).subscribe(data => {
@@ -297,4 +341,28 @@ getM_sourceofamount() {
           event.preventDefault();
         }
       }
+    
+    /** To Convert Amount into Words  */
+        inWords(e,flag:number){
+            switch(flag){
+            case 1 :
+                this.loanAmtInWords = this._pd.convertNumberToWords(e.target.value);    
+                break;
+            case 2 : 
+                this.balTxrfAmtInWords = this._pd.convertNumberToWords(e.target.value);    
+                break;
+            case 3 :
+                this.valAsPerAgmtInWords = this._pd.convertNumberToWords(e.target.value);    
+                break;
+            case 4 :
+                this.ownContributionInWords = this._pd.convertNumberToWords(e.target.value);    
+                break;
+            case 5 :
+                this.topUpAmtInWords = this._pd.convertNumberToWords(e.target.value);    
+                break;
+            default:
+                break;
+         }
+        }
+
 }
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 d5a3080f8..a80002002 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
@@ -20,7 +20,7 @@
     <mat-card-content>
         <p>Other Income Details</p>
             <form [formGroup]="otherIncomeForm" class="address">
-                    <mat-form-field>
+                    <mat-form-field style="width:25% !important;">
                         <mat-select (selectionChange)="selectedLoanChanges($event)" placeholder="Other Income"
                                     formControlName="other_income">
                             <mat-option value="Yes">Yes</mat-option>
@@ -70,8 +70,14 @@
                                             <mat-option value="interest_income">Interest Income</mat-option>
                                             <mat-option value="agricultural_income">Agricultural Income</mat-option>
                                             <mat-option value="dividend_income">Dividend Income</mat-option>
+                                            <mat-option value="others">Others</mat-option>
                                         </mat-select>
                                     </mat-form-field>
+                                    <mat-form-field *ngIf="details.get('source').value == 'others'">     
+                                        <input matInput placeholder="Specify Others Source"
+                                        formControlName="others_source">
+                                    </mat-form-field>
+
                                     <mat-form-field>
                                         <input matInput placeholder="Amount" formControlName="amount" (keypress)="keyPress($event)" required>  
                                     </mat-form-field>
@@ -80,6 +86,13 @@
                                                 <mat-option value="{{frq.frequency_id}}" *ngFor="let frq of frequencyData">{{frq.name}}</mat-option>
                                             </mat-select>
                                     </mat-form-field>
+                                    
+                                    <!-- {{otherIncomeForm.controls.frequency.value}} -->
+                                    
+                                        <mat-form-field *ngIf="details.get('frequency').value == 8">     
+                                                <input matInput placeholder="Specify Others Frequency"
+                                                formControlName="others_frequency">
+                                        </mat-form-field>
                                     <button type="button" matTooltip="Add More Income Details" class="mr-1 mb-1 hover-icon"  matTooltipPosition="above" mat-raised-button mat-icon-button   (click)="addIncomeDetails()"
                                            color="primary" *ngIf="i==0">
                                         <mat-icon>add</mat-icon>
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 d03418f98..4e5c50d57 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
@@ -92,10 +92,13 @@ export class OtherIncomeComponent implements OnInit {
     createDetail() {
         return this.fb.group({
             source: ['', Validators.compose([Validators.required])],
+            others_source : [''],
             amount: ['', Validators.compose([Validators.required])],
             frequency: ['', Validators.compose([Validators.required])],
+            others_frequency : ['']
         });
     }
+    
     getFrequency() {
         let master_name = 'FREQUENCY';
         this._pd.getAllMasterDatas(master_name).subscribe(data => {
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.html
index d843ac592..32038fb05 100644
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.html
@@ -413,7 +413,7 @@
                              <app-banking-details [pdid]="startPD" [pd_all_details]="pdFullDetails" ></app-banking-details>
                             </ng-container>
                             <ng-container *ngSwitchCase="8">
-                                <app-current-loan [pdid]="startPD" [form_id]="selectedFormsCategory.form_id"></app-current-loan>
+                                <app-current-loan [pdid]="startPD" [form_id]="selectedFormsCategory.form_id" [applicant_details]="pdFullDetails"></app-current-loan>
                             </ng-container>
                             <ng-container *ngSwitchCase="9">
                                 <app-other-income [pdid]="startPD" [form_id]="selectedFormsCategory.form_id"></app-other-income>
@@ -428,7 +428,7 @@
                                 <app-employment-info [pdid]="startPD" [form_id]="selectedFormsCategory.form_id" [pd_all_details]="pdFullDetails"></app-employment-info>
                             </ng-container>
                             <ng-container *ngSwitchCase="13">
-                                <app-business-info [pdid]="startPD" [form_id]="selectedFormsCategory.form_id"></app-business-info>
+                                <app-business-info [pdid]="startPD" [form_id]="selectedFormsCategory.form_id" [applicant_details]="pdFullDetails"></app-business-info>
                             </ng-container>
                             <ng-container *ngSwitchCase="14">
                                 <app-financial-info [pdid]="startPD" [form_id]="selectedFormsCategory.form_id"></app-financial-info>
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.ts
index 34c87317c..4e186d96a 100644
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.ts
@@ -297,6 +297,7 @@ pdFullDetails:any=[];
             this.categoryFormButtons = data.records.template_forms;
             console.log('formButtons', this.categoryFormButtons);
             let filterApplicantName= data.records.pdapplicants_detials.filter(item => item.applicant_type == 1);
+            console.log(filterApplicantName);
             this.mainApplicantName = filterApplicantName[0].applicant_name;
             this.currentPDStatus = data.records.pdmaster_details.pd_status;
 
diff --git a/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts b/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts
index 97ab9f238..ced9ed0d4 100644
--- a/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts
+++ b/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts
@@ -289,6 +289,84 @@ getPDFormDetailsWithID(pdID, formID ):Observable<any> {
     )
   }
 
+  
+//   inWords(num) {
+//     let a : any = ['','one ','two ','three ','four ', 'five ','six ','seven ','eight ','nine ','ten ','eleven ','twelve ','thirteen ','fourteen ','fifteen ','sixteen ','seventeen ','eighteen ','nineteen '];
+//     let b : any = ['', '', 'twenty','thirty','forty','fifty', 'sixty','seventy','eighty','ninety'];
+//     if ((num = num.toString()).length > 9) return 'overflow';
+//     let n : any = ('000000000' + num).substr(-9).match(/^(\d{2})(\d{2})(\d{2})(\d{1})(\d{2})$/);
+//     if (!n) return; var str = '';
+//     str += (n[1] != 0) ? (a[Number(n[1])] || b[n[1][0]] + ' ' + a[n[1][1]]) + 'crore ' : '';
+//     str += (n[2] != 0) ? (a[Number(n[2])] || b[n[2][0]] + ' ' + a[n[2][1]]) + 'lakh ' : '';
+//     str += (n[3] != 0) ? (a[Number(n[3])] || b[n[3][0]] + ' ' + a[n[3][1]]) + 'thousand ' : '';
+//     str += (n[4] != 0) ? (a[Number(n[4])] || b[n[4][0]] + ' ' + a[n[4][1]]) + 'hundred ' : '';
+//     str += (n[5] != 0) ? ((str != '') ? 'and ' : '') + (a[Number(n[5])] || b[n[5][0]] + ' ' + a[n[5][1]]) + 'only ' : '';
+//     return str;
+//   }
+
+convertNumberToWords(amount) {
+    //let words : any = new Array();
+    let words :any = ['','One','Two','Three','Four','Five','Six','Seven','Eight','Nine','Ten','Eleven','Twelve','Thirteen','Fourteen','Fifteen','Sixteen','Seventeen','Eighteen','Nineteen','Twenty'];
+    words[30] = 'Thirty';
+    words[40] = 'Forty';
+    words[50] = 'Fifty';
+    words[60] = 'Sixty';
+    words[70] = 'Seventy';
+    words[80] = 'Eighty';
+    words[90] = 'Ninety';
+    amount = amount.toString();
+    let atemp = amount.split(".");
+    let number = atemp[0].split(",").join("");
+    let n_length = number.length;
+    let words_string = "";
+    let value : any;
+    if (n_length <= 9) {
+        var n_array = new Array(0, 0, 0, 0, 0, 0, 0, 0, 0);
+        var received_n_array = new Array();
+        for (var i = 0; i < n_length; i++) {
+            received_n_array[i] = number.substr(i, 1);
+        }
+        for (var i = 9 - n_length, j = 0; i < 9; i++, j++) {
+            n_array[i] = received_n_array[j];
+        }
+        for (var i = 0, j = 1; i < 9; i++, j++) {
+            if (i == 0 || i == 2 || i == 4 || i == 7) {
+                if (n_array[i] == 1) {
+                    n_array[j] = 10 + (+n_array[j]);
+                    n_array[i] = 0;
+                }
+            }
+        }
+        value = "";
+        for (var i = 0; i < 9; i++) {
+            if (i == 0 || i == 2 || i == 4 || i == 7) {
+                value = n_array[i] * 10;
+            } else {
+                value = n_array[i];
+            }
+            if (value != 0) {
+                words_string += words[value] + " ";
+            }
+            if ((i == 1 && value != 0) || (i == 0 && value != 0 && n_array[i + 1] == 0)) {
+                words_string += "Crores ";
+            }
+            if ((i == 3 && value != 0) || (i == 2 && value != 0 && n_array[i + 1] == 0)) {
+                words_string += "Lakhs ";
+            }
+            if ((i == 5 && value != 0) || (i == 4 && value != 0 && n_array[i + 1] == 0)) {
+                words_string += "Thousand ";
+            }
+            if (i == 6 && value != 0 && (n_array[i + 1] != 0 && n_array[i + 2] != 0)) {
+                words_string += "Hundred and ";
+            } else if (i == 6 && value != 0) {
+                words_string += "Hundred ";
+            }
+        }
+        words_string = words_string.split("  ").join(" ");
+    }
+    return words_string;
+}
+
   // private handleError<T>(operation = 'operation', result?: T) {
   //   return (error: any): Observable<T> => {
   //     return of(result as T);