Changes : ps

ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.html

@@ -101,7 +101,7 @@
                                             </mat-form-field>
 
                                             <mat-form-field *ngIf="sup.get('residence_ownership').value == 3" style="width:43%;">
-                                                <input matInput placeholder="Rent Amount" formControlName="rent"
+                                                <input matInput placeholder=" Monthly Rent Amount" formControlName="rent"
                                                 OnlyNumber type="text">
                                                 <mat-hint align="start" style="font-size:90%" *ngIf="sup.get('rent').value != ''">{{"&#8377;"}} {{sup.get('rent').value | numberToWords}} Only</mat-hint>                                                
                                             </mat-form-field>
@@ -120,6 +120,16 @@
                                                     <mat-card>
                                                         <h5>Family Details of {{FamilyMemberAsLabel[ix]}}</h5>
                                                         <div>
+                                                            <!-- <mat-form-field>
+                                                                <input matInput >
+                                                            </mat-form-field> -->
+                                                            <mat-form-field style="width: 12%">
+                                                                    <mat-select  placeholder="Title" formControlName="family_member_salutation">
+                                                                        <mat-option *ngFor="let tl of titleData" [value]="tl.title_id">
+                                                                            {{tl.name}}
+                                                                        </mat-option>                    
+                                                                    </mat-select>
+                                                            </mat-form-field>
                                                             <mat-form-field>
                                                                 <input matInput placeholder="Name" formControlName="family_member_name"
                                                                     required>

ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.ts

@@ -52,6 +52,7 @@ export class FamilyDetailsComponent implements OnInit {
     stateData: any = [];
     cityData: any = [];
     pincodeData: any = [];
+    titleData: any = [];
     earningStatus = [{ id: 1, type: 'Earning' },
     { id: 2, type: 'Non Earning' }]
     documentsAndFilesList : any = [];
@@ -81,6 +82,8 @@ export class FamilyDetailsComponent implements OnInit {
         this.getMasterDetails('RESIDENCEOWNERSHIP', 4);
         this.getMasterDetails('EARNINGMEMBERSSTATUS', 5);
         this.getMasterDetails('STATE', 6);
+        this.getMasterDetails('TITLES', 7);
+        
 
         this._pd.getFamilyDetails(this.pdid).subscribe(data => {
             if (data.dataStatus == true) {
@@ -183,6 +186,7 @@ export class FamilyDetailsComponent implements OnInit {
     }
     initgenerateFamilyMembersDetailsGet(val): FormGroup {
         return this.fb.group({
+            family_member_salutation:[val.family_member_salutation || ''],
             family_member_name: [val.family_member_name, Validators.compose([])],
             family_member_relationship: [val.family_member_relationship, Validators.compose([])],
             family_member_age: [val.family_member_age, Validators.compose([])],
@@ -355,6 +359,7 @@ export class FamilyDetailsComponent implements OnInit {
             //     this.IncomePerMonth[index] = this._pd.convertNumberToWords(vals.earning_gross_income_per_month);
             // }
             let datas = this.fb.group({
+                family_member_salutation: [vals.family_member_salutation || null ],
                 family_member_name: [vals.family_member_name || null, Validators.compose([])],
                 family_member_relationship: [vals.family_member_relationship || null, Validators.compose([])],
                 family_member_age: [vals.family_member_age || null, Validators.compose([])],
@@ -421,6 +426,7 @@ export class FamilyDetailsComponent implements OnInit {
                     //     // this.isReadOnly[inx] = false;
                     // }
                     arraydata = {
+                        'family_member_salutation':'',
                         'family_member_name': val.name,
                         'family_member_relationship': val.relationship,
                         'family_member_age': val.age,
@@ -489,6 +495,7 @@ export class FamilyDetailsComponent implements OnInit {
 
     generateFamilyMembersDetailsGet(): FormGroup {
         return this.fb.group({
+            family_member_salutation:[''],
             family_member_name: ['', Validators.compose([])],
             family_member_relationship: ['', Validators.compose([])],
             family_member_age: ['', Validators.compose([])],
@@ -525,6 +532,9 @@ export class FamilyDetailsComponent implements OnInit {
                     else if (type == 6) {
                         this.stateData = data.records.filter(item => item.isactive == 1);
                     }
+                    else if (type == 7) {
+                        this.titleData = data.records.filter(item => item.isactive == 1);
+                    }
                 }
             });
     }

ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.html

@@ -136,7 +136,7 @@
                                             <div align="right">
                                                 <button type="button" matTooltip="Delete" class="mr-1 mb-1 hover-icon"
                                                     matTooltipPosition="above" mat-raised-button mat-icon-button
-                                                    (click)="deleteIncomeDetails(i)" *ngIf="!last">
+                                                    (click)="deleteIncomeDetails(i)" *ngIf="otherIncomeForm.controls.income_details.length > 1">
                                                     <mat-icon>delete</mat-icon>
                                                 </button>
                                             </div>

ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.ts

@@ -37,7 +37,7 @@ export class OtherIncomeComponent implements OnInit {
     subproduct_abbr: any;
     lender_applicant_id: any;
     main_applicant: any;
-    pageTitle: string = "Other Income Details";
+    pageTitle: string = "Other Income of Loan Applicants";
     loadDataStatus: boolean = true;
 
 
@@ -77,7 +77,7 @@ export class OtherIncomeComponent implements OnInit {
         this.customer_segment_abbr = this.pd_all_details.pdmaster_details.customer_segment_abbr;
         this.applicants = this.pd_all_details.pdapplicants_detials;
         this.applicants = this.applicants.filter(val => val.applicant_type == 0 || val.applicant_type == 1);
-        this.applicants.push({ 'pd_co_applicant_id': '0', 'applicant_name': 'Others' });
+        // this.applicants.push({ 'pd_co_applicant_id': '0', 'applicant_name': 'Others' });
     }
     pdf(fileURL){
         window.open(fileURL);