From b20e611df85583d451d7d625f83f7de24c230923 Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Mon, 21 Jan 2019 18:37:36 +0530
Subject: [PATCH] general-info/general-info.component.html

---
 .../assets-info/assets-info.component.html    | 63 +++++++-----
 .../banking-details.component.html            | 28 ++++--
 .../employment-info.component.html            |  4 +-
 .../employment-info.component.ts              | 13 +++
 .../family-details.component.html             |  7 ++
 .../family-details.component.ts               | 35 +++++--
 .../general-info/general-info.component.html  |  1 +
 .../neighbour-hood.component.html             | 98 +++++++++++--------
 .../other-income/other-income.component.html  | 23 ++++-
 .../other-income/other-income.component.ts    |  4 +
 10 files changed, 194 insertions(+), 82 deletions(-)

diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html
index c8c15dc16..106b35c4e 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html
@@ -1,16 +1,15 @@
 <form *ngIf="apiLoadFinish && loadDetails" [formGroup]="_assetsQuesFrom" (submit)="onSubmit()" novalidate>
 
-<h2 mat-dialog-title class="paragraph_change">
-        <div fxFlex="70" align="left" style="padding: 10px !important;">
-                {{pageTitle}}
-        </div>
-        <div fxFlex="30" align="end" style="padding: 10px !important;">
-                <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Close" matTooltipPosition="right" mat-dialog-close><mat-icon>close</mat-icon></button>
-        </div>
-</h2>
-
-<mat-dialog-content>
+    <h2 mat-dialog-title class="paragraph_change">
+            <div fxFlex="70" align="left" style="padding: 10px !important;">
+                    {{pageTitle}}
+            </div>
+            <div fxFlex="30" align="end" style="padding: 10px !important;">
+                    <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Close" matTooltipPosition="right" mat-dialog-close><mat-icon>close</mat-icon></button>
+            </div>
+    </h2>
 
+    <mat-dialog-content>
 
         <mat-tab-group>
             <mat-tab label="Assets Used For  Business">
@@ -21,7 +20,7 @@
                                   <mat-card-content>
                                       <div fxLayout="row" fxLayoutAlign="start none">
                                         <div formArrayName="business_assets_details" fxFill>
-                                          <div *ngFor="let sup of _assetsQuesFrom.controls.business_assets_details['controls']; let i=index">
+                                          <div *ngFor="let sup of _assetsQuesFrom.controls.business_assets_details['controls']; let i=index; let last=last;">
                                             <mat-card>
                                               <mat-card-content>
                                                 <div [formGroupName]="i">
@@ -260,24 +259,34 @@
                                       
 
                                                 
-                                                  <div fxLayout="row" fxLayoutGap="12px" fxLayoutAlign="start none">
+                                                  <!-- <div fxLayout="row" fxLayoutGap="12px" fxLayoutAlign="start none"> -->
                                                     <!-- <div fxFlex="20"> -->
-                                                      <span *ngIf="_assetsQuesFrom.controls.business_assets_details.controls.length > 1" (click)="removeAssetsDetails(i,2)"> 
+                                                      <!-- <span *ngIf="_assetsQuesFrom.controls.business_assets_details.controls.length > 1" (click)="removeAssetsDetails(i,2)"> 
                                                           <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Delete" matTooltipPosition="above"><mat-icon>delete</mat-icon></button>
-                                                      </span>
+                                                      </span> -->
                                                     <!-- </div> -->
-                                                  </div>
+                                                  <!-- </div> -->
                                                 </div>
                                               </mat-card-content>
+                                              <mat-card-actions align="center">
+                                                  <button type="button" mat-flat-button (click)="addAssetDetails($event,2); false"
+                                                  matTooltip="Add More" matTooltipPosition="left" color="primary" *ngIf="last">
+                                                  <strong>Add More Business Asset </strong>
+                                                  </button> 
+                                                  <button type="button" mat-flat-button (click)="removeAssetsDetails(i,2)"
+                                                  matTooltip="Delete"matTooltipPosition="left" color="primary" *ngIf="!last">
+                                                  <strong>Delete Business Assets </strong>
+                                                  </button> 
+                                              </mat-card-actions>
                                             </mat-card>
                                           </div>
                                         </div>
                                       </div>
                                       
-                                      <div class="row" style="text-align:right;">
+                                      <!-- <div class="row" style="text-align:right;">
                                         <button mat-raised-button mat-icon-button mat-button color="primary" matTooltip="Add More Business Asset Details" matTooltipPosition="above"
                                           class="mr-1 mb-1 hover-icon" (click)="addAssetDetails($event,2); false"><mat-icon>add</mat-icon></button>
-                                      </div>
+                                      </div> -->
                                     
                                   </mat-card-content>
 
@@ -297,7 +306,7 @@
                                     <mat-card-content>
                                         <div fxLayout="row" fxLayoutAlign="start none">
                                           <div formArrayName="assets_details" fxFill>
-                                            <div *ngFor="let sup of _assetsQuesFrom.controls.assets_details['controls']; let i=index">
+                                            <div *ngFor="let sup of _assetsQuesFrom.controls.assets_details['controls']; let i=index; let last=last">
                                               <mat-card>
                                                 <mat-card-content>
                                                   <div [formGroupName]="i">
@@ -581,24 +590,34 @@
           
                                                         </div>
                                                   </div>
-                                                    <div fxLayout="row" fxLayoutGap="12px" fxLayoutAlign="start none">
+                                                    <!-- <div fxLayout="row" fxLayoutGap="12px" fxLayoutAlign="start none">
                                                       <div fxFlex="20">
                                                         <span *ngIf="_assetsQuesFrom.controls.assets_details.controls.length > 1" (click)="removeAssetsDetails(i,1)"> 
                                                             <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Delete" matTooltipPosition="above"><mat-icon>delete</mat-icon></button>
                                                           </span>
                                                       </div>
-                                                    </div>
+                                                    </div> -->
               
                                                 </mat-card-content>
+                                                <mat-card-actions align="center">
+                                                    <button type="button" mat-flat-button (click)="addAssetDetails($event,1); false"
+                                                    matTooltip="Add More" matTooltipPosition="left" color="primary" *ngIf="last">
+                                                    <strong>Add More Other Asset </strong>
+                                                    </button> 
+                                                    <button type="button" mat-flat-button (click)="removeAssetsDetails(i,1)"
+                                                    matTooltip="Delete"matTooltipPosition="left" color="primary" *ngIf="!last">
+                                                    <strong>Delete Other Assets </strong>
+                                                    </button> 
+                                                </mat-card-actions>
                                               </mat-card>
                                             </div>
                                           </div>
                                         </div>
                             
-                                          <div class="row" style="text-align:right;">
+                                          <!-- <div class="row" style="text-align:right;">
                                             <button mat-raised-button mat-icon-button mat-button color="primary" matTooltip="Add More Asset Details" matTooltipPosition="above"
                                               class="mr-1 mb-1 hover-icon" (click)="addAssetDetails($event,1); false"><mat-icon>add</mat-icon></button>
-                                          </div>
+                                          </div> -->
                           
                                     </mat-card-content>
 
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 712135efb..1a53c07fa 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html
@@ -84,7 +84,7 @@
     <mat-card-content>    
                     <div formArrayName="itemRows" autocomplete="off">
                         <mat-accordion 
-                                *ngFor="let itemrow of bankingForm.controls.itemRows['controls']; let i=index"
+                                *ngFor="let itemrow of bankingForm.controls.itemRows['controls']; let i=index;let last=last"
                                 [formGroupName]="i">
                                 <!-- {{bankingForm.controls.itemRows['controls']}} -->
                             <mat-expansion-panel class="banlFields" [expanded]="step == i">
@@ -186,14 +186,28 @@
                                             </mat-form-field>
                                         </div>
                                 </div>
-                                <button *ngIf="i > 0" mat-raised-button mat-icon-button matTooltip="Delete" matTooltipPosition="above"  (click)="deleteBankdetails(i)">
-                                        <mat-icon  >delete</mat-icon>
-                                </button>
+
+                            <mat-action-row>
+                                    <button type="button" mat-flat-button (click)="addBankdetails(i, $event)"
+                                    matTooltip="Add More" matTooltipPosition="left" color="primary" *ngIf="last">
+                                    <strong>Add More Banking Details</strong>
+                                    </button> 
+                                    <button type="button" mat-flat-button (click)="deleteBankdetails(i)"
+                                    matTooltip="Delete"matTooltipPosition="left" color="primary" *ngIf="!last">
+                                    <strong>Delete Banking Details</strong>
+                                    </button> 
+
+                                    <!-- <button mat-button color="warn" (click)="prevStep()">Previous</button>
+                                    <button mat-button color="primary" (click)="nextStep()">End</button> -->
+                                    <!-- <button *ngIf="i > 0" mat-raised-button mat-icon-button matTooltip="Delete" matTooltipPosition="above"  (click)="deleteBankdetails(i)">
+                                            <mat-icon>delete</mat-icon>
+                                    </button> -->
+                            </mat-action-row>
                             </mat-expansion-panel>
-                           <div style="text-align: right;" class="pt-1" *ngIf="bankingForm.controls.itemRows['controls'].length == (i+1)">
-                            <button  class="mr-1 mb-1 hover-icon" color="primary" mat-raised-button mat-icon-button matTooltip="Add More Banking Details" matTooltipPosition="above"  (click)="addBankdetails(i, $event)">
+                           <!-- <div style="text-align: right;" class="pt-1" *ngIf="bankingForm.controls.itemRows['controls'].length == (i+1)">
+                            <button  class="mr-1 mb-1 hover-icon" color="primary" mat-raised-button mat-icon-button matTooltip="Add More Banking Details" matTooltipPosition="above"  >
                                     <mat-icon >add</mat-icon>
-        </button></div>
+        </button></div> -->
                         </mat-accordion>
                     </div>
                     
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.html
index ecfd75fbf..15fb039c0 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.html
@@ -24,10 +24,10 @@
                                         <br>
                                         <div fxLayout="row" fxLayoutGap="2px" fxLayoutAlign="start none">
                                             <mat-form-field>
-                                                <input matInput type="number" placeholder="Year" formControlName="how_long_year" required min='0'>
+                                                <input matInput type="number" autocomplete="off" placeholder="Year" formControlName="how_long_year" required min='0'>
                                             </mat-form-field>
                                             <mat-form-field>
-                                                <input matInput type="number" placeholder="Month" formControlName="how_long_month" required min='0' max='12'>
+                                                <input matInput type="number" autocomplete="off" placeholder="Month" formControlName="how_long_month" required min='0' (change)="ConvertMonthintoYear($event.target.value)">
                                             </mat-form-field>
                                         </div>
                                     </div>
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.ts
index 672a7d1a4..494db14ec 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.ts
@@ -136,6 +136,19 @@ export class EmploymentInfoComponent implements OnInit {
             employment_remarks: ['', Validators.compose([Validators.required])],
         });
     }
+
+    ConvertMonthintoYear(e){
+    
+        let how_long_year = this.employmentForm.controls.how_long_year.value;
+
+        let converted_month : number = e%12;
+        let converted_year : number = e/12;
+
+        this.employmentForm.controls.how_long_year.setValue(+how_long_year + +Math.floor(converted_year));
+        this.employmentForm.controls.how_long_month.setValue(Math.floor(converted_month));
+        
+    }
+
     submitDetails() {
         if (!this.employmentForm.valid) {
             this.notifier.notify('warning', 'Please Fill All Mandatory Fields.!');
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 3399c0763..5f750755a 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.html
@@ -308,6 +308,13 @@
                                             <mat-form-field>
                                                 <input matInput placeholder="Place" formControlName="residence_place" required>
                                             </mat-form-field>
+                                            <mat-form-field>
+                                                    <mat-select matInput placeholder="Pin" formControlName="residence_pin" required>
+                                                        <mat-option *ngFor="let p of pincodeData[ix]" [value]="p.pincode_id">
+                                                            {{p.pincode}}
+                                                        </mat-option>
+                                                    </mat-select>
+                                            </mat-form-field>
                                             
                                             <!-- <mat-form-field>
                                                 <input matInput placeholder="City" formControlName="residence_city" 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 def128aab..07c0cacc7 100755
--- 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
@@ -328,7 +328,7 @@ export class FamilyDetailsComponent implements OnInit {
     stateData: any = [];
     // wholeCityData:any =[];
     cityData: any =[];
-    PincodeData:any=[];
+    pincodeData:any=[];
     // earnMemberArrCount :any ;
     // nonEarnMemberArrCount :any ;
     count: number;
@@ -375,9 +375,29 @@ export class FamilyDetailsComponent implements OnInit {
                 this.familyForm.controls.family_details_form_remark.setValue(data.records.family_details_form_remark);
                 // this.generateFamilyMembersDetailsGetData(data.records.family_members_details);
             } else {
-                // value.push(this.createMembers());
-                // control.push(this.createNonMembers());
-                this.initFamilyForm(null);
+
+                this.selectPerson.forEach((val,index) => {    
+                        let formData: FormGroup = this.fb.group({
+                            selected_person: [val.applicant_name],
+                            residence_place: [null],
+                            residence_city: [null],
+                            residence_state: [null],
+                            residence_pin: [null],
+                            residence_No_of_years: [null],
+                            residence_ownership: [null],
+                            ownershipOther: [null],
+                            rent: [null],
+                            total_number_of_family_members: [null],
+                            family_members_details: this.fb.array([]),
+                        });
+                        const control = <FormArray>this.familyForm.controls['family_details'];
+                        control.push(formData);
+                   });
+
+                // this.selectPerson.forEach((val,index) => {
+                //     this.initFamilyForm(val.pd_co_applicant_id);    
+                // });
+                // this.initFamilyForm(null);
             }
         });
     }
@@ -642,14 +662,15 @@ export class FamilyDetailsComponent implements OnInit {
     }
 
     getCity(e,i){
-        console.log(e);
+        // console.log(e);
         // this.cityData = this.wholeCityData.filter(city=>city.fk_state_id == e);    
         // this._pd.retriveForm(params).subscribe(data => {
             this._pd.getStateWiseCities(e).subscribe(data=>{
                 if (data.status == 200) {
-                    console.log(data.status);
+                    // console.log(data.status);
                     this.cityData[i] = data.records.cities;    
-                    console.log(this.cityData);
+                    this.pincodeData[i] = data.records.pincode;
+                    // console.log(this.cityData);
                 }
             });
     }
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html
index 8e5b9a6ad..93ddf1d8d 100644
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html
@@ -330,5 +330,6 @@
             <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Save" matTooltipPosition="above" (click)="submitGeneralForm(_generalForm.value)"><mat-icon>save</mat-icon></button>
         </div>
     </mat-dialog-actions>
+    </form>
     <notifier-container></notifier-container>
     
\ No newline at end of file
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html
index 57709ad99..6a3dd6da8 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html
@@ -12,8 +12,8 @@
           </div>
           <div fxFlex="30" align="end" style="padding: 10px !important;">
                   <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Close" matTooltipPosition="right" mat-dialog-close><mat-icon>close</mat-icon></button>
-         </div>
-  </h2>
+          </div>
+       </h2>
   
 <mat-dialog-content>
   <mat-card>
@@ -26,46 +26,55 @@
         </div>
     </mat-card-header>
   <mat-card-content formArrayName="neighbourhood_list" *ngIf="_neighbourhoodForm.controls.check_type.value==0">
-      <mat-card-content *ngFor="let neighbourhood of _neighbourhoodForm.controls.neighbourhood_list['controls']; let n = index;" [formGroupName]="n">
+      <mat-card *ngFor="let neighbourhood of _neighbourhoodForm.controls.neighbourhood_list['controls']; let n = index; let last = last" [formGroupName]="n">
+            <mat-card-content>
                     <mat-form-field style="width: 42%">
                         <input matInput autocomplete="off" placeholder="Neighbour Name" formControlName="neighbourhood_name" type="text">
-                </mat-form-field>
-                <mat-form-field style="width: 40%">
-                    <mat-select placeholder="Do You Know the Applicant" formControlName="do_know">
-                        <mat-option value="Yes">Yes</mat-option>
-                        <mat-option value="No">No</mat-option>
-                    </mat-select>
-                </mat-form-field>
-                
-              <!-- <mat-form-field style="width: 42%" *ngIf="neighbourhood.controls.do_know.value=='Yes'"> -->
-                  <!-- <input matInput autocomplete="off" placeholder="How Long to Know the Applicant " formControlName="how_long_do_know" type="text" (keypress)="keyPress($event)"> -->
-              <!-- </mat-form-field> -->
-              <div fxLayout="row wrap" *ngIf="neighbourhood.controls.do_know.value=='Yes'">
-                <div fxFlex="100">
-                    <label>How Long to Know the Applicant</label>
-                        <mat-form-field>
-                            <input matInput autocomplete="off"  placeholder="Year(s)" formControlName="how_long_do_know_in_year" (keypress)="keyPress($event)">
-                        </mat-form-field>
-                        <mat-form-field>
-                            <input matInput autocomplete="off" placeholder="Month(s)" formControlName="how_long_do_know_in_month" (keypress)="keyPress($event)" (change)="ConvertMonthintoYear(neighbourhood,$event.target.value,1)">
-                        </mat-form-field>
-                </div>
-              </div>
+                    </mat-form-field>
 
-                <mat-form-field style="width: 42%" *ngIf="neighbourhood.controls.do_know.value=='Yes'">
-                    <mat-select placeholder="Is the Applicant Owner" formControlName="is_applicant_owner">
-                        <mat-option value="Yes">Yes</mat-option>
-                        <mat-option value="No">No</mat-option>
-                    </mat-select>
-                </mat-form-field>
-              <button type="button" mat-raised-button mat-icon-button (click)="removeNeighbourhood(n)"
-                    matTooltip="Remove Neighbourhood" matTooltipPosition="above" class="mr-1 mb-1 hover-icon" *ngIf="n!=0">
-                        <mat-icon>delete</mat-icon></button>
+                    <mat-form-field style="width: 40%">
+                        <mat-select placeholder="Do You Know the Applicant" formControlName="do_know">
+                            <mat-option value="Yes">Yes</mat-option>
+                            <mat-option value="No">No</mat-option>
+                        </mat-select>
+                    </mat-form-field>
+                
+                    <!-- <mat-form-field style="width: 42%" *ngIf="neighbourhood.controls.do_know.value=='Yes'"> -->
+                        <!-- <input matInput autocomplete="off" placeholder="How Long to Know the Applicant " formControlName="how_long_do_know" type="text" (keypress)="keyPress($event)"> -->
+                    <!-- </mat-form-field> -->
+                    <div fxLayout="row wrap" *ngIf="neighbourhood.controls.do_know.value=='Yes'">
+                        <div fxFlex="100">
+                            <label>How Long to Know the Applicant</label>
+                                <mat-form-field>
+                                    <input matInput autocomplete="off"  placeholder="Year(s)" formControlName="how_long_do_know_in_year" (keypress)="keyPress($event)">
+                                </mat-form-field>
+                                <mat-form-field>
+                                    <input matInput autocomplete="off" placeholder="Month(s)" formControlName="how_long_do_know_in_month" (keypress)="keyPress($event)" (change)="ConvertMonthintoYear(neighbourhood,$event.target.value,1)">
+                                </mat-form-field>
+                        </div>
+                    </div>
+
+                    <mat-form-field style="width: 42%" *ngIf="neighbourhood.controls.do_know.value=='Yes'">
+                        <mat-select placeholder="Is the Applicant Owner" formControlName="is_applicant_owner">
+                            <mat-option value="Yes">Yes</mat-option>
+                            <mat-option value="No">No</mat-option>
+                        </mat-select>
+                    </mat-form-field>
+              
               </mat-card-content>
-           
+              <mat-card-actions align="center">
+                    <!-- <button type="button" mat-raised-button mat-icon-button 
+                    matTooltip="Remove Neighbourhood" matTooltipPosition="above" class="mr-1 mb-1 hover-icon" *ngIf="n!=0">
+                        <mat-icon>delete</mat-icon></button>       -->
+                    <button type="button" mat-flat-button (click)="removeNeighbourhood(n)"
+                    matTooltip="Delete"matTooltipPosition="left" color="primary" *ngIf="n!=0">
+                    <strong>Delete Neighbourhood </strong>
+                    </button> 
+                </mat-card-actions>
+        </mat-card>
     </mat-card-content>
     <mat-card-content formArrayName="referencecheck_list" *ngIf="_neighbourhoodForm.controls.check_type.value==1">
-            <mat-card *ngFor="let reference of _neighbourhoodForm.controls.referencecheck_list['controls']; let r = index;" [formGroupName]="r">
+            <mat-card *ngFor="let reference of _neighbourhoodForm.controls.referencecheck_list['controls']; let r = index;let last =last" [formGroupName]="r">
                 <mat-card-content>
                 <mat-form-field style="width: 25%">
                         <input matInput autocomplete="off" placeholder="Name" formControlName="reference_name" type="text">
@@ -134,10 +143,16 @@
                     </mat-form-field>
                     
                   </span>
-                    <button type="button" mat-raised-button mat-icon-button (click)="removeReferencecheck(r)"
+                    <!-- <button type="button" mat-raised-button mat-icon-button (click)="removeReferencecheck(r)"
                       matTooltip="Remove Reference Check" matTooltipPosition="above" class="mr-1 mb-1 hover-icon" *ngIf="r!=0">
-                          <mat-icon>delete</mat-icon></button>
+                          <mat-icon>delete</mat-icon></button> -->
                 </mat-card-content>
+                <mat-card-actions align="center">
+                        <button type="button" mat-flat-button (click)="removeReferencecheck(r)"
+                        matTooltip="Delete"matTooltipPosition="left" color="primary" *ngIf="r!=0">
+                        <strong>Delete Reference Check </strong>
+                        </button> 
+                    </mat-card-actions>
               </mat-card>
               
   </mat-card-content>
@@ -146,9 +161,7 @@
   </mat-card-actions>
 
 </mat-card>
-
-    
-    </mat-dialog-content>
+</mat-dialog-content>
   
   <mat-dialog-actions>
     <div fxFlex="60" class="pb-0 text-sm-left" align="left">
@@ -162,5 +175,6 @@
     </div>
        
   </mat-dialog-actions>
-    <notifier-container></notifier-container>
+</form>
+<notifier-container></notifier-container>
   
\ No newline at end of file
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/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 e5c6df008..68766265c 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.html
@@ -52,6 +52,15 @@
                                                 <input matInput autocomplete="off" placeholder="Specify Source"
                                                 formControlName="others_source">
                                             </mat-form-field>
+
+                                            <mat-form-field style="width:45%">
+                                                    <mat-select placeholder="Income earned by"
+                                                                formControlName="income_earned_by">
+                                                            <mat-option value="{{person.pd_co_applicant_id}}" *ngFor="let person of applicants">
+                                                                {{person.applicant_name}}
+                                                            </mat-option>
+                                                    </mat-select>
+                                                </mat-form-field>
         
                                             <mat-form-field style="width:45%">
                                                 <input matInput autocomplete="off" placeholder="Amount" formControlName="amount" (keypress)="keyPress($event)" (keyup)="inWords($event,i)">  
@@ -70,15 +79,25 @@
                                                         <input matInput autocomplete="off" placeholder="Specify Frequency"
                                                         formControlName="others_frequency">
                                             </mat-form-field>
-                                            <button type="button" matTooltip="Delete" class="mr-1 mb-1 hover-icon"  matTooltipPosition="above" mat-raised-button mat-icon-button (click)="deleteIncomeDetails(i)"
+                                            <!-- <button type="button" matTooltip="Delete" class="mr-1 mb-1 hover-icon"  matTooltipPosition="above" mat-raised-button mat-icon-button (click)="deleteIncomeDetails(i)"
                                                     *ngIf="i>0">
                                                 <mat-icon>delete</mat-icon>
                                             </button>
                                             <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="last">
                                                 <mat-icon>add</mat-icon>
-                                            </button>
+                                            </button> -->
                                         </mat-card-content>
+                                        <mat-card-actions align="center">
+                                                <button type="button" mat-flat-button (click)="addIncomeDetails()"
+                                                matTooltip="Add More" matTooltipPosition="left" color="primary" *ngIf="last">
+                                                <strong>Add More Income Details </strong>
+                                                </button> 
+                                                <button type="button" mat-flat-button (click)="deleteIncomeDetails(i)"
+                                                matTooltip="Delete"matTooltipPosition="left" color="primary" *ngIf="!last">
+                                                <strong>DeleteIncome Details </strong>
+                                                </button> 
+                                            </mat-card-actions>
                                     </div>
                                 </div>
                             </mat-card>
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 f1474c601..24288ded8 100755
--- 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
@@ -33,6 +33,7 @@ import {ActivatedRoute, Router} from '@angular/router';
 export class OtherIncomeComponent implements OnInit {
     pageTitle: string ="Other Income Details";
     loadDataStatus: boolean=true;
+    
 
     // @Input() pdid: number;
     // @Input() form_id: number;
@@ -44,6 +45,7 @@ export class OtherIncomeComponent implements OnInit {
     frequencyData: any = [];
     sourceData : any = [];
     amtInwords : any = [];
+    applicants : any = [];
 
     constructor(notifier: NotifierService, 
                 private fb: FormBuilder, 
@@ -54,6 +56,7 @@ export class OtherIncomeComponent implements OnInit {
                 @Inject(MAT_DIALOG_DATA) public pd_all_details: any) 
                 {
                     this.pdid = this.pd_all_details.pdmaster_details.pd_id;
+                    this.applicants = this.pd_all_details.pdapplicants_detials;
                     this.form_id = 9;
                     this.notifier = notifier;
     }
@@ -132,6 +135,7 @@ public viewerOptions: any = {
         return this.fb.group({
             source: [''],
             others_source : [''],
+            income_earned_by:[''],
             amount: [''],
             frequency: [''],
             others_frequency : ['']