From f80a6e0e0e72300d5ee3a225453ed0b5f21c05ec Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Mon, 8 Mar 2021 19:58:38 +0530
Subject: [PATCH] Fairoj : Family details issue fixes

---
 .../family-details.component.html             |  4 +--
 .../family-details.component.ts               | 29 ++++++++++++-------
 .../pd-pipes/number-to-words.pipe.ts          |  4 ++-
 3 files changed, 24 insertions(+), 13 deletions(-)

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 f18a8b3c5..84ea4e583 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
@@ -126,7 +126,7 @@
                                                 <input matInput placeholder="Specify Ownership" formControlName="ownershipOther">
                                             </mat-form-field>
                                           
-                                            <mat-form-field *ngIf="sup.get('residence_ownership').value == 1" style="width:43%;">
+                                            <mat-form-field *ngIf="sup.get('residence_ownership').value == 3" style="width:43%;margin-bottom: 1%;">
                                                 <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>                                                
@@ -283,7 +283,7 @@
                                             </mat-card-actions>
                                         </div>
 
-                                        <div *ngIf="lender_short_name === 'CLIX' || lender_short_name === 'MWISE' || lender_short_name === 'UDAAN' || lender_short_name !== 'CFPL' && prod_catagory != 'LFMP'">
+                                        <div *ngIf="lender_short_name === 'CLIX' || lender_short_name === 'MWISE' || lender_short_name === 'UDAAN' || lender_short_name === 'CFPL' && prod_catagory != 'LFMP'">
                                             <mat-card>
                                                 <mat-card-header>
                                                     <mat-card-title>
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 fc1eb0877..b78b4019d 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
@@ -587,19 +587,28 @@ export class FamilyDetailsComponent implements OnInit {
           let familyDetailsFormGrp : FormGroup = familyFormArray.controls[cnt1] as FormGroup;
           let familyMembersFormArr : FormArray = familyDetailsFormGrp.controls.family_members_details as FormArray;
 
-          familyDetailsFormGrp.controls.residence_ownership.value == 1
-             ? familyDetailsFormGrp.controls.ownershipOther.setValidators([Validators.required])
-             : familyDetailsFormGrp.controls.ownershipOther.setValue('');
-             familyDetailsFormGrp.controls.ownershipOther.updateValueAndValidity();
+              if (familyDetailsFormGrp.controls.residence_ownership.value == 1) {
+                  familyDetailsFormGrp.controls.ownershipOther.setValidators([Validators.required])
+              }
+              else {
+                  familyDetailsFormGrp.controls.ownershipOther.setValue(''); familyDetailsFormGrp.controls.ownershipOther.clearValidators()
+              }
+              familyDetailsFormGrp.controls.ownershipOther.updateValueAndValidity();
 
-          familyDetailsFormGrp.controls.residence_ownership.value == 3
-              ? familyDetailsFormGrp.controls.rent.setValidators([Validators.required])
-              : familyDetailsFormGrp.controls.rent.setValue('');
+              if (familyDetailsFormGrp.controls.residence_ownership.value == 3) {
+                  familyDetailsFormGrp.controls.rent.setValidators([Validators.required])
+              }
+              else {
+                  familyDetailsFormGrp.controls.rent.setValue(''); familyDetailsFormGrp.controls.rent.clearValidators()
+              }
               familyDetailsFormGrp.controls.rent.updateValueAndValidity();
 
-          familyDetailsFormGrp.controls.residence_pin.value == 1
-              ? familyDetailsFormGrp.controls.residence_other_pincode.setValidators([Validators.required])
-              : familyDetailsFormGrp.controls.residence_other_pincode.setValue('');
+              if (familyDetailsFormGrp.controls.residence_pin.value == 1) {
+                  familyDetailsFormGrp.controls.residence_other_pincode.setValidators([Validators.required])
+              }
+              else {
+                  familyDetailsFormGrp.controls.residence_other_pincode.setValue(''); familyDetailsFormGrp.controls.residence_other_pincode.clearValidators()
+              }
               familyDetailsFormGrp.controls.residence_other_pincode.updateValueAndValidity();
 
           let FMArrayLength: any = familyMembersFormArr.controls.length;          
diff --git a/ng6-seed/src/app/personal-discussion/pd-pipes/number-to-words.pipe.ts b/ng6-seed/src/app/personal-discussion/pd-pipes/number-to-words.pipe.ts
index 87f8dca11..f9bf8a844 100755
--- a/ng6-seed/src/app/personal-discussion/pd-pipes/number-to-words.pipe.ts
+++ b/ng6-seed/src/app/personal-discussion/pd-pipes/number-to-words.pipe.ts
@@ -5,7 +5,9 @@ import { Pipe, PipeTransform } from '@angular/core';
 })
 export class NumberToWordsPipe implements PipeTransform {
     transform(price: any): any{
-
+        if(price == null || price == undefined || price == '') {
+            return;
+        }
         price = price.toString();
         let atemp = price.split(".");
         let amount = atemp[0];