From ef157b7e8216ce919bd0038cb9dd1c4e6d88ee00 Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Wed, 10 Apr 2019 17:27:37 +0530
Subject: [PATCH] issues fixes : ps

---
 .../edit-pd-applicant.component.html          |  2 +-
 .../loan-details/loan-details.component.ts    | 41 +++++++++++++------
 .../rental-verification.component.html        |  2 +
 3 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.html
index 600e8b43d..4dc179819 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.html
@@ -66,7 +66,7 @@
                       <input matInput placeholder="Name of Individual Applicant" formControlName="coapplicantName" type="text" required>
 
                   </mat-form-field>
-                  <mat-form-field style="width: 40%">
+                  <mat-form-field style="width: 40%" *ngIf="CSAbbr != 'SE-RI'">
                       <input matInput placeholder="Company / Firm Name" formControlName="company_name" type="text">
               </mat-form-field>  
               
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 504aba892..330fd1f2a 100755
--- 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
@@ -75,7 +75,7 @@ export class LoanDetailsComponent implements OnInit {
     existCompanyList: any = [];
     companies: any = [];
     typeofproperties:any = [];
-
+    generalFormApplicantList:any = [];
     /** Constructor Of the Class */
     constructor(notifier: NotifierService,
         private fb: FormBuilder,
@@ -84,7 +84,7 @@ export class LoanDetailsComponent implements OnInit {
         private _pd: PdTrigerService,
         private dialogRef: MatDialogRef<LoanDetailsComponent>,
         @Inject(MAT_DIALOG_DATA) public pd_all_details: any) {
-
+console.log('this.pd_all_details.pdapplicants_detials',this.pd_all_details.pdapplicants_detials);
         this.applicants = this.pd_all_details.pdapplicants_detials;
         // this.applicants.push({'pd_co_applicant_id':'0','applicant_name':'Others'});
         this.applicants = this.applicants.filter(appt => appt.applicant_type != 2)
@@ -118,6 +118,11 @@ export class LoanDetailsComponent implements OnInit {
         this.getM_BTLenderList();
         this.getM_EndUseofTopUpList();
 
+        // note : Details of Property being Mortgaged section, In Name of the owner drop down list currently show all names (Applicants & In Person Met) need to change show   Applicant names only.
+        let param: any = {};
+        param.pd_id = this.pdid;
+        param.pd_form_id = '18';
+        
         this._pd.getCompaniesListsForBusiness(this.pdid).subscribe(data => {
             if (data.dataStatus) {
                 this.existCompanyList = data.records.filter(val => val.is_active === true && val.is_company_applicant === true);
@@ -129,19 +134,29 @@ export class LoanDetailsComponent implements OnInit {
                 });
                 this.mergeCompanyApplicant.push({ groupName: 'COMPANIES', groupValues: modifyCompanyList })
             }
+            
+            this._pd.retriveForm(param).subscribe(data => {
+                this.generalFormApplicantList = data.records.individuals.filter(app => app.is_applicant == true && app.is_active == true);
+                if (data.dataStatus) {
+                    let modifyApplicantList: any = [];
+                if (this.applicants.length > 0) {
+                    modifyApplicantList = this.generalFormApplicantList.map(element => {
+                        return { id: element.pd_co_applicant_id, name: element.applicant_name, group_id: 2 };
+                    });
+                    this.mergeCompanyApplicant.push({ groupName: 'APPLICANTS', groupValues: modifyApplicantList })
 
-            let modifyApplicantList: any = [];
-            if (this.applicants.length > 0) {
-                modifyApplicantList = this.applicants.map(element => {
-                    return { id: element.pd_co_applicant_id, name: element.applicant_name, group_id: 2 };
-                });
-                this.mergeCompanyApplicant.push({ groupName: 'APPLICANTS', groupValues: modifyApplicantList })
+                    // this.listOfLanguagues.splice(this.listOfLanguagues.indexOf(languague), 1);
+                }
+                if (this.productAbbr != 'LAP') {
+                    this.mergeCompanyApplicant.push({ groupName: 'OTHERS', groupValues: [{ id: 0, name: 'Not Yet Finalised', group_id: 2 }] })
+                }
+                    
+                }
+            });
 
-                // this.listOfLanguagues.splice(this.listOfLanguagues.indexOf(languague), 1);
-            }
-            if (this.productAbbr != 'LAP') {
-                this.mergeCompanyApplicant.push({ groupName: 'OTHERS', groupValues: [{ id: 0, name: 'Not Yet Finalised', group_id: 2 }] })
-            }
+            
+
+            
         })
 
 
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-verification/rental-verification.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-verification/rental-verification.component.html
index 59a3bd044..14f46964a 100644
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-verification/rental-verification.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-verification/rental-verification.component.html
@@ -615,10 +615,12 @@
                                 </mat-form-field>
 
                                  <!-- start validate appplicant/agreement payment options -->
+                            <div *ngIf="units.controls['paid_monthly_rent_per_met'] && units.controls['payment_mode'] && units.controls['monthly_rent_amount'] && units.controls['payment_mode_per_met']">
                               <mat-form-field style="width:100%" appearance="outline" *ngIf="(units.value.monthly_rent_amount>0 && units.value.paid_monthly_rent_per_met>0 && units.value.payment_mode!='' &&  units.value.payment_mode_per_met!='') && (units.value.monthly_rent_amount!=units.value.paid_monthly_rent_per_met) || units.value.payment_mode_per_met.id != 2 "><!-- || units.value.payment_mode.id!=units.value.payment_mode_per_met.id -->
                                 <mat-label>What is the Reason for Difference in Rent Amount</mat-label><!-- or Mode of Payment -->
                                 <input matInput autocomplete="off" placeholder="" formControlName="payment_difference_per_met">
                               </mat-form-field>
+                            </div>
                               <!-- end -->
                               
                               <!-- end met payment -->