From fe21a222851d61c00191106650009112a52ebcbd Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Thu, 3 Jan 2019 17:53:06 +0530
Subject: [PATCH 1/2] general fom company changes

---
 .../general-info/general-info.component.html  |  4 +--
 .../general-info/general-info.component.ts    | 31 ++++++++++++-------
 2 files changed, 21 insertions(+), 14 deletions(-)

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 a2237aab1..cbefddb1f 100755
--- 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
@@ -63,11 +63,11 @@
               <mat-card-content>
                 <div fxLayout="row wrap" formArrayName="companies">
                     <div fxFlex.xs="100"  fxFlex.sm="100" fxFlex.md="100" fxFlex.lg="100" fxFlex.xl="100" *ngFor="let com of _generalForm.controls.companies['controls']; let c = index;" [formGroupName]="c">
-                          <mat-form-field style="width: 60%">
+                        <mat-form-field style="width: 60%" *ngIf="com.value.is_active==true">
                                 <input matInput placeholder="Company/Firm" formControlName="company_name" type="text">
                             </mat-form-field>
                             <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Add More Company/Firm" matTooltipPosition="above" color="primary" (click)="addMoreCompanies()" *ngIf="c==0"><mat-icon>add</mat-icon></button>
-                            <button type="button" class="mr-1 mb-1 hover-icon" mat-raised-button mat-icon-button (click)="removeCompanies(c)" *ngIf="c>0"
+                            <button type="button" class="mr-1 mb-1 hover-icon" mat-raised-button mat-icon-button (click)="removeCompanies(c)" *ngIf="c>0 && com.value.is_active==true"
                                 matTooltip="Remove Company/Firm" matTooltipPosition="above">
                                     <mat-icon>delete</mat-icon>
                                 </button>
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts
index 5cd6e6e98..61e3034b7 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts
@@ -4,6 +4,8 @@ import { MatDialog, MatDialogRef, MAT_DIALOG_DATA , MatTableDataSource} from '@a
 import { NotifierService } from 'angular-notifier';
 import { PdTrigerService } from './../../../../../pd-service/pd-triger.service';
 import {OtherApplicantDetailsComponent} from './../dialogue/other-applicant-details/other-applicant-details.component';
+import { element } from '@angular/core/src/render3/instructions';
+import { ELEMENT_PROBE_PROVIDERS } from '@angular/platform-browser/src/dom/debug/ng_probe';
 @Component({
   selector: 'app-general-info',
   templateUrl: './general-info.component.html',
@@ -47,7 +49,7 @@ export class GeneralInfoComponent implements OnInit {
   // update company details
   this._generalForm.controls['companies'].valueChanges.subscribe(val=>{
     let control = <FormArray>this._generalForm.controls['companies'];
-    this.companyList = control.value.filter(element =>element.company_name);
+    this.companyList = control.value.filter(element =>element.company_name && element.is_active);
   });
   }
 
@@ -112,8 +114,14 @@ export class GeneralInfoComponent implements OnInit {
           return data.records.companies[key];
           });
           if(exist_companies.length>0){
-            exist_companies.forEach(element => {
-              companyControl.push(this.createCompanies(element))
+            exist_companies.forEach((element,cindex) => {
+              companyControl.push(this.createCompanies(element));
+              if(element.is_active==false){
+                let control: any = this._generalForm.get('companies') as FormArray;
+                control.controls[cindex].controls.company_name.clearValidators();
+                control.controls[cindex].controls.company_name.updateValueAndValidity();
+              }
+             
             });
           }
 
@@ -133,11 +141,6 @@ export class GeneralInfoComponent implements OnInit {
                   innercomrelControl.push(this.createMultipleCompanyRelation(innerecomElement));
                 });
               });
-
-              
-
-
-
             }
 
       } 
@@ -157,13 +160,13 @@ export class GeneralInfoComponent implements OnInit {
               
                // create companies
                if(element.company_name!='' && element.company_name!=null){
-                let setCompanyValues: any = {company_order_id :companyControl.controls.length+1,company_name:element.company_name}
+                let setCompanyValues: any = {company_order_id :companyControl.controls.length+1,company_name:element.company_name,is_active:true}
                 companyControl.push(this.createCompanies(setCompanyValues))
                } 
           });
             // check company if null update one row
             if(companyControl.controls.length ==0){
-                let setCompanyValues: any = {company_order_id :companyControl.controls.length+1,company_name:''}
+                let setCompanyValues: any = {company_order_id :companyControl.controls.length+1,company_name:'',is_active:true}
                 companyControl.push(this.createCompanies(setCompanyValues))
 
               }
@@ -186,20 +189,24 @@ export class GeneralInfoComponent implements OnInit {
       return this._fb.group({
         company_order_id: [elementValue.company_order_id],
         company_name: [elementValue.company_name,Validators.required],
+        is_active: [elementValue.is_active]
     });
     }
 
     // add more companies
     addMoreCompanies() {
       let control: any = this._generalForm.get('companies') as FormArray;
-      let setValues: any = {company_order_id :control.controls.length+1,company_name:''}
+      let setValues: any = {company_order_id :control.controls.length+1,company_name:'',is_active:true}
       control.push(this.createCompanies(setValues))
     }
 
     // remove companies
     removeCompanies(indexValues) {
       let control: any = this._generalForm.get('companies') as FormArray;
-      control.removeAt(indexValues);
+      control.controls[indexValues].controls.is_active.setValue(false);
+      control.controls[indexValues].controls.company_name.clearValidators();
+      control.controls[indexValues].controls.company_name.updateValueAndValidity();
+      //control.removeAt(indexValues);
     }
 
       // create applicant form array

From 3482a111150d9725021a9be8ee08723f88ea0e5a Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Thu, 3 Jan 2019 17:54:04 +0530
Subject: [PATCH 2/2] merge : kms

---
 .../list-pd/add-pd/add-pd.component.html          |  2 +-
 .../manage-pd/list-pd/add-pd/add-pd.component.ts  |  3 ++-
 .../edit-pd-master/edit-pd-master.component.html  |  6 ++----
 .../edit-pd-master/edit-pd-master.component.ts    |  3 ++-
 .../general-info/general-info.component.html      | 15 ++++++++++-----
 .../forms/general-info/general-info.component.ts  |  9 ++++++---
 6 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html
index 19ad95809..5936fdbb5 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html
@@ -109,7 +109,7 @@
             </mat-form-field>
             <mat-form-field style="width: 32%">
                             <input matInput autocomplete="off" placeholder="Loan Amount" formControlName="loan_amount" (keypress)="keyPress($event)" (keyup)="inWords($event,1)" required autocomplete="off">
-                            <mat-hint align="end" *ngIf="pdMain.loan_amount.value">{{"&#8377;"}} {{loanAmtInWords}} Only</mat-hint>
+                            <mat-hint align="start" style="font-size:70%" *ngIf="pdMain.loan_amount.value">{{"&#8377;"}} {{loanAmtInWords}} Only</mat-hint>
                             <!-- <mat-error *ngIf="pdMain.loan_amount.hasError('required')">Amount Required.</mat-error> -->
                             <mat-error *ngIf="pdMain.loan_amount.hasError('pattern')">Enter valid amount. </mat-error>  
     
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts
index 9c22e69e2..48b443dc7 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts
@@ -473,7 +473,8 @@ export class AddPdComponent implements OnInit, OnDestroy {
   }
   /** On Key Press Event For Mobile Number  */
   keyPress(event: any) {
-    const pattern = /[0-9/ /./-]/;
+    // const pattern = /[0-9/ /./-]/;
+    const pattern = /[0-9]/;
 
     let inputChar = String.fromCharCode(event.charCode);
     if (event.keyCode != 8 && !pattern.test(inputChar)) {
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.html
index 259d90574..1a5b61117 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.html
@@ -37,10 +37,8 @@
                                                     <input matInput placeholder="Lender Contact Person" formControlName="pd_contact_person" type="text" required>
                                             </mat-form-field>
                                             <mat-form-field style="width: 32%">
-                                                <input matInput placeholder="Lender Contact Number" formControlName="pd_contact_mobileno" type="text" required>
+                                                <input matInput placeholder="Lender Contact Number" formControlName="pd_contact_mobileno" type="text" required (keypress)="keyPress($event)">
                                                 <mat-error *ngIf="pdMain.pd_contact_mobileno.hasError('pattern') || pdMain.pd_contact_mobileno.hasError('maxlength') || pdMain.pd_contact_mobileno.hasError('minlength')">Enter Valid Mobile Number. </mat-error>  
-                  
-                
                                         </mat-form-field>
                                         <mat-form-field style="width: 32%">
                                                 <mat-select  placeholder="Product Name" formControlName="fk_product_id" (selectionChange)="getSubproductList(pdMain.fk_product_id.value)">
@@ -90,7 +88,7 @@
                                             <mat-form-field style="width: 24%">
                                                             <!-- <input matInput placeholder="Loan Amount" formControlName="loan_amount"> -->
                                                             <input matInput placeholder="Loan Amount" formControlName="loan_amount" (keypress)="keyPress($event)" (keyup)="inWords($event,1)" required autocomplete="off">
-                                                            <mat-hint align="end" *ngIf="pdMain.loan_amount.value != ''">{{"&#8377;"}} {{loanAmtInWords}} Only</mat-hint>
+                                                            <mat-hint align="start" style="font-size:70%" *ngIf="pdMain.loan_amount.value != ''">{{"&#8377;"}} {{loanAmtInWords}} Only</mat-hint>
                                                             <!-- <mat-error *ngIf="pdMain.loan_amount.hasError('required')">Amount Required.</mat-error> -->
                                                             <mat-error *ngIf="pdMain.loan_amount.hasError('pattern')">Enter valid amount. </mat-error>  
                 
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.ts
index 2c8e9b102..a94f9f4ee 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.ts
@@ -259,7 +259,8 @@ export class EditPdMasterComponent implements OnInit {
   }
    /** On Key Press Event For Mobile Number  */
    keyPress(event: any) {
-    const pattern = /[0-9/ /./-]/;
+    //const pattern = /[0-9/ /./-]/;
+    const pattern = /[0-9]/;
 
     let inputChar = String.fromCharCode(event.charCode);
     if (event.keyCode != 8 && !pattern.test(inputChar)) {
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 cbefddb1f..0c7ce91d7 100755
--- 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
@@ -92,13 +92,12 @@
                                           <mat-form-field style="width: 40%">
                                               <mat-select placeholder="Relation to" formControlName="applicant_relation_to">
                                                   <mat-option>Select</mat-option>  
-                                                <mat-option *ngFor="let rel of individualsList" [value]="rel.individuals_order_id">
-                                                    <!-- [disabled]="relation.controls.applicant_name.value == rel" -->
+                                                <mat-option *ngFor="let rel of individualsList" [value]="rel.individuals_order_id" [disabled]="relation.controls.applicant_name.value == rel.applicant_name">
                                                   {{rel.applicant_name | titlecase}}
                                                   </mat-option>
                                               </mat-select>
                                             </mat-form-field>  
-                                            <mat-form-field style="width: 30%">
+                                            <mat-form-field style="width: 20%">
                                                 <mat-select placeholder="Relation" formControlName="relationship">
                                                     <mat-option>Select</mat-option>
                                                     <mat-option *ngFor="let relShip of relationShipList" [value]="relShip.relationship_id">
@@ -106,6 +105,9 @@
                                                     </mat-option>
                                                 </mat-select>
                                               </mat-form-field>
+                                                <mat-form-field style="width:20%" *ngIf="mulRel.get('relationship').value == 0">
+                                                    <input matInput autocomplete="off" placeholder="Specify Relation" formControlName="other_relationship">
+                                                </mat-form-field>
                                               <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Add More Personal Relationship" matTooltipPosition="above" color="primary" (click)="addMoreRelation(r,m)" *ngIf="m==0"><mat-icon>add</mat-icon></button>
                                               <button type="button" class="mr-1 mb-1 hover-icon" mat-raised-button mat-icon-button (click)="removeRelation(r,m)" *ngIf="m>0"
                                                   matTooltip="Remove Personal Relationship" matTooltipPosition="above">
@@ -125,8 +127,8 @@
                                                                     {{comp.company_name | titlecase}}
                                                                     </mat-option>
                                                                 </mat-select>
-                                                </mat-form-field>
-                                                <mat-form-field style="width: 30%">
+                                                    </mat-form-field>
+                                                <mat-form-field style="width: 20%">
                                                     <mat-select placeholder="Relation" formControlName="company_relationship">
                                                         <mat-option>Select</mat-option>
                                                         <mat-option *ngFor="let comrelShip of companyRelationShipList" [value]="comrelShip.company_relationship_id">
@@ -134,6 +136,9 @@
                                                         </mat-option>
                                                     </mat-select>
                                                   </mat-form-field> 
+                                                  <mat-form-field style="width:20%" *ngIf="comRel.get('company_relationship').value == 6">
+                                                    <input matInput autocomplete="off" placeholder="Specify Relation" formControlName="company_other_relationship">
+                                                  </mat-form-field>
                                                   <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Add More Company Relationship" matTooltipPosition="above" color="primary" (click)="addMoreCompanyRelation(r,c)" *ngIf="c==0"><mat-icon>add</mat-icon></button>
                                                   <button type="button" class="mr-1 mb-1 hover-icon" mat-raised-button mat-icon-button (click)="removeCompanyRelation(r,c)" *ngIf="c>0"
                                                       matTooltip="Remove Company Relationship" matTooltipPosition="above">
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts
index 61e3034b7..40597ea7d 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts
@@ -72,6 +72,7 @@ export class GeneralInfoComponent implements OnInit {
         if (data.status == 200) {
           if(type==1){
             this.relationShipList=data.records.filter(item => item.isactive == 1);
+            this.relationShipList.push({'relationship_id':"0",'name':'Others'});
           }
           if(type==2){
             this.companyRelationShipList=data.records.filter(item => item.isactive == 1);
@@ -234,6 +235,7 @@ export class GeneralInfoComponent implements OnInit {
         return this._fb.group({
           applicant_relation_to: [elementValue.applicant_relation_to],
           relationship: [elementValue.relationship],
+          other_relationship:[elementValue.other_relationship]
         });
       }
 
@@ -241,7 +243,7 @@ export class GeneralInfoComponent implements OnInit {
       addMoreRelation(rindex,mindex) {
         let control: any = this._generalForm.get('applicant_relation') as FormArray;
         control = control.controls[rindex].get('multiple_relation') as FormArray;
-        let setValues: any = {applicant_relation_to :'',relationship:''}
+        let setValues: any = {applicant_relation_to :'',relationship:'',other_relationship:''}
         control.push(this.createMultipleRelation(setValues))
       }
 
@@ -257,13 +259,14 @@ export class GeneralInfoComponent implements OnInit {
         return this._fb.group({
           company_name: [elementValue.company_name,Validators.required],
           company_relationship: [elementValue.company_relationship],
+          company_other_relationship:[elementValue.company_other_relationship]
         });
       }
       // add more company relation
       addMoreCompanyRelation(rindex,cindex) {
         let control: any = this._generalForm.get('applicant_relation') as FormArray;
         control = control.controls[rindex].get('multiple_company_relation') as FormArray;
-        let setValues: any = {company_name :'',company_relationship:''}
+        let setValues: any = {company_name :'',company_relationship:'',company_other_relationship:''}
         control.push(this.createMultipleCompanyRelation(setValues))
       }
 
@@ -289,7 +292,7 @@ export class GeneralInfoComponent implements OnInit {
               element.individuals_order_id = individualsControl.controls.length+1;
               individualsControl.push(this.createIndividulas(element));
               let relationControl = <FormArray>this._generalForm.controls['applicant_relation'];
-              let applicant_details: any= {'pd_co_applicant_id':element.pd_co_applicant_id,'applicant_name':element.applicant_name,'applicant_relation_to':'','relation':'','company_name':'','company_relation':'','individuals_order_id':element.individuals_order_id};
+              let applicant_details: any= {'pd_co_applicant_id':element.pd_co_applicant_id,'applicant_name':element.applicant_name,'applicant_relation_to':'','relation':'','other_relation':'','company_name':'','company_relation':'','company_other_relation':'','individuals_order_id':element.individuals_order_id};
               relationControl.push(this.createApplicantRelation(applicant_details));
               let mulRelationControl = <FormArray> relationControl.controls[relationControl.controls.length-1].get('multiple_relation');
                mulRelationControl.push(this.createMultipleRelation(applicant_details))