From a16432e118eff454083453f2e107a765447dbd0e Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Fri, 22 Mar 2019 18:52:41 +0530
Subject: [PATCH] RI changes

---
 .../other-income/other-income.component.html  |  4 +++-
 .../rental-verification.component.html        | 22 ++++++++++++-------
 .../rental-verification.component.ts          | 14 ++++++++++++
 3 files changed, 31 insertions(+), 9 deletions(-)

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 638309939..cf77dff53 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
@@ -66,7 +66,9 @@
                                             <mat-form-field style="width:45%" *ngIf="details.get('source').value == 5">
                                                 <input matInput autocomplete="off" placeholder="Address"
                                                     formControlName="address">
-                                                <mat-hint align="end"><i (click)="Toview()">Rental Info Details</i></mat-hint>
+                                                <mat-hint align="end"> <button mat-flat-button color="primary" (click)="Toview()" type="button"><strong>Validate Rental Income</strong></button>
+                                                    <!-- <i (click)="Toview()">Rental Info Details</i> -->
+                                                </mat-hint>
                                             </mat-form-field>
 
                                             <mat-form-field style="width:45%">
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 2e1184ebe..4f8281d89 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
@@ -62,7 +62,7 @@
                                       </mat-select>
                         </mat-form-field>
                         <div align="left" style="margin-left: 2%;">
-                                <mat-checkbox color="primary" formControlName="validate_visited_address">Is Address Validated During Visit ? <strong>( {{_rentalForm.value.validate_visited_address===true ? 'Yes' : 'No'}} )</strong></mat-checkbox>
+                                <mat-checkbox color="primary" formControlName="validate_visited_address">Is This the Address Visited ? <strong>( {{_rentalForm.value.validate_visited_address===true ? 'Yes' : 'No'}} )</strong></mat-checkbox>
                         </div>
                         <mat-form-field style="width:90%;margin-top: 2%;" appearance="outline" *ngIf="_rentalForm.controls['other_visited_address']">
                           <mat-label>Actual Address Visited</mat-label>
@@ -274,7 +274,7 @@
                                            <!-- end -->
                                             <!-- start area covered by the property -->
                               <mat-form-field style="width:35%;" appearance="outline">
-                                  <mat-label>Area Covered by the Property</mat-label>
+                                  <mat-label>Area Covered by the Unit</mat-label>
                                   <input matInput OnlyNumber autocomplete="off" placeholder=""  formControlName="property_cover_area" required><!--maxlength="3"-->
                               </mat-form-field>
                               <!-- end area covered -->
@@ -386,7 +386,7 @@
                                 <input matInput autocomplete="off" placeholder="" formControlName="agreement_property_owner_other" required>
                             </mat-form-field>
                             <mat-form-field style="width:35%" appearance="outline" *ngIf="units.controls['agreement_property_owner_other_relationship']">
-                                <mat-label>Relation of Owner to Rent Agreement</mat-label>
+                                <mat-label>Relation of Owner to Loan Applicant</mat-label>
                                 <mat-select placeholder="" formControlName="agreement_property_owner_other_relationship" [compareWith]="compareObjects" required>
                                     <mat-optgroup *ngFor="let rGroup of relationShipList" [label]="rGroup.groupName">      
                                   <!-- <mat-option>Select</mat-option> -->
@@ -484,24 +484,24 @@
                                 <mat-label>Mode of Payment of Rent as Validated by PD Officer with Tenant / Lessee During Visit</mat-label>
                                 <mat-select placeholder=""
                                 formControlName="payment_mode_per_met" [compareWith]="compareSingleObjects" (selectionChange)="generatePaymentOptions(units.value,u,2)" required>
-                                  <mat-option *ngFor="let payment of paymentOptions" [value]="payment">
+                                  <mat-option *ngFor="let payment of paymentPaidOptions" [value]="payment">
                                     {{payment.name}}
                                   </mat-option>
                             </mat-select>
                             </mat-form-field> 
                             <mat-form-field style="width:29%;" appearance="outline" *ngIf="units.controls['amount_received_cash_per_met']">
-                                <mat-label>Amount Received in Cash</mat-label>
+                                <mat-label>Amount Paid in Cash</mat-label>
                                 <input matInput OnlyNumber autocomplete="off" placeholder="" formControlName="amount_received_cash_per_met" required>
                                 <mat-hint align="start" style="font-size:90%" *ngIf="units.value.amount_received_cash_per_met != ''">{{"&#8377;"}} {{units.value.amount_received_cash_per_met | numberToWords}} Only</mat-hint>
                             </mat-form-field>
     
                             <mat-form-field style="width:29%;" appearance="outline" *ngIf="units.controls['amount_received_bank_per_met']">
-                                    <mat-label>Amount Received in Bank</mat-label>
+                                    <mat-label>Amount Paid in Bank</mat-label>
                                     <input matInput OnlyNumber autocomplete="off" placeholder="" formControlName="amount_received_bank_per_met" required>
                                     <mat-hint align="start" style="font-size:90%" *ngIf="units.value.amount_received_bank_per_met != ''">{{"&#8377;"}} {{units.value.amount_received_bank_per_met | numberToWords}} Only</mat-hint>
                                 </mat-form-field>
                                 <mat-form-field style="width:30%;" appearance="outline" *ngIf="units.controls['payment_received_reason_per_met']">
-                                        <mat-label>Reason for Receiving Multiple Payment Mode</mat-label>
+                                        <mat-label>Reason for Paid Multiple Payment Mode</mat-label>
                                         <textarea matInput placeholder="" formControlName="payment_received_reason_per_met" required></textarea>
                                 </mat-form-field>
 
@@ -581,7 +581,13 @@
 </mat-dialog-content>
 
 <mat-dialog-actions>
-<div fxFlex="100" align="end">
+    <div fxFlex="60" class="pb-0 text-sm-left" align="left">
+        <mat-form-field appearance="outline" style="width: 100%">
+            <mat-label>Remarks</mat-label>
+            <textarea matInput placeholder="Remarks" formControlName="rental_remark"></textarea>
+        </mat-form-field>
+    </div>
+<div fxFlex="40" align="end">
         <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Save" matTooltipPosition="above" (click)="saveRental(_rentalForm.value)"><mat-icon>save</mat-icon></button>
 </div>
    
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-verification/rental-verification.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-verification/rental-verification.component.ts
index 5aa1cc626..27fef38fe 100644
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-verification/rental-verification.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-verification/rental-verification.component.ts
@@ -31,6 +31,7 @@ export class RentalVerificationComponent implements OnInit {
   relationToList: any=[];
   rentAmtInwords : String;
   paymentOptions: any=[{id:1,name:"Received in Cash"},{id:2,name:"Received through Banking Channel"},{id:3,name:"Combination of Cash & Bank"}];
+  paymentPaidOptions: any=[{id:1,name:"Paid in Cash"},{id:2,name:"Paid through Banking Channel"},{id:3,name:"Combination of Cash & Bank"}];
   propertyNature: any=[{id:2,name:"Residential Property"},{id:3,name:"Commercial Property"},{id:4,name:"Industrial Property"},{id:1,name:"Others (Please Specify)"}];
   unitTypeList: any=[];
   stateList:any=[];
@@ -207,6 +208,7 @@ export class RentalVerificationComponent implements OnInit {
         no_units:[''],
         property_unit_details : this._fb.array([]),
         done_third_party_check :['',Validators.required],
+        rental_remark: [''],
     });
 }
  // other_name_person_showing_property changes
@@ -506,6 +508,18 @@ generateRegisterDetails(value: any,index:number){
     control.controls[index].addControl('differences_loanapplicant_rentagreement', new FormControl(''));
 
   }
+  else if(value.rent_agreement_registered=="0"){
+    control.controls[index].addControl('agreement_date', new FormControl('', Validators.required));
+    control.controls[index].addControl('agreement_no_months', new FormControl('', Validators.required));
+    control.controls[index].addControl('agreement_expiring_date', new FormControl(''));
+    control.controls[index].addControl('rental_remaining_months', new FormControl(''));
+    control.controls[index].addControl('agreement_monthly_rent_amount', new FormControl('', Validators.required));
+    control.controls[index].addControl('agreement_security_deposit_amount', new FormControl('', Validators.required));
+    control.controls[index].addControl('agreement_security_deposit_amount', new FormControl('', Validators.required));
+    control.controls[index].addControl('agreement_property_owners_name', new FormControl('', Validators.required));
+    control.controls[index].addControl('agreement_tenant_lessees_name', new FormControl('', Validators.required));
+    control.controls[index].addControl('differences_loanapplicant_rentagreement', new FormControl(''));
+  }
   else{
    control.controls[index].removeControl('agreement_date');
    control.controls[index].removeControl('agreement_no_months');