From 56a98f5e9ca77bb892d74b9ebd6a7ba932efe335 Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Tue, 8 Jan 2019 19:24:05 +0530
Subject: [PATCH 1/2] general form change : kms

---
 .../other-applicant-details.component.ts      |  2 +-
 .../general-info/general-info.component.html  | 20 +++++++++----------
 .../general-info/general-info.component.ts    | 16 ++++++++++++++-
 .../entity-edit-tat.component.ts              |  1 +
 4 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/dialogue/other-applicant-details/other-applicant-details.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/dialogue/other-applicant-details/other-applicant-details.component.ts
index d99347ca1..e95734f04 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/dialogue/other-applicant-details/other-applicant-details.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/dialogue/other-applicant-details/other-applicant-details.component.ts
@@ -9,7 +9,7 @@ import { PdTrigerService } from './../../../../../../pd-service/pd-triger.servic
   styleUrls: ['./other-applicant-details.component.scss']
 })
 export class OtherApplicantDetailsComponent implements OnInit {
-  pageTitle: string ="Add Individual Details";
+  pageTitle: string ="Add Name of Person(s) Met and Individual Loan Applicant(s) ";
   public _OtherForm: FormGroup;
    applicantInfo:any={'pd_co_applicant_id':"0",'applicant_name':'','is_applicant':false,'is_person_met':false, applicant_title_name:''};
    titleList: any=[];
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 d57904af0..1f1139127 100644
--- 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
@@ -12,7 +12,7 @@
         <!-- individuals  details start-->
         <mat-card>
                 <mat-card-header>
-                    <mat-card-title>Individuals</mat-card-title>
+                    <mat-card-title>Name of Person(s) Met and Individual Loan Applicant(s) </mat-card-title>
                 </mat-card-header>
                 <mat-card-content>
                     <mat-table [dataSource]="individualsSource" *ngIf="_generalForm.controls.individuals['controls'].length>0" formArrayName="individuals">
@@ -48,7 +48,7 @@
                 </mat-card-content>
                 <mat-card-actions align="end">
                         <button type="button" class="mr-1 mb-1 hover-icon" mat-raised-button mat-icon-button (click)="addMoreIndividuals()"
-                        matTooltip="Add More Individual" matTooltipPosition="left" color="primary">
+                        matTooltip="Add More Person(s) Met/Applicant(s) " matTooltipPosition="left" color="primary">
                             <mat-icon>add</mat-icon>
                         </button> 
                 </mat-card-actions>
@@ -81,7 +81,7 @@
         <!-- Person Relationship Starts Here -->
         <mat-card>
                 <mat-card-header>
-                    <mat-card-title> Personal Relationships </mat-card-title>
+                    <mat-card-title> Personal Relationship </mat-card-title>
                 </mat-card-header>
                 <mat-card-content>
                     <mat-table [dataSource]="relationSource" *ngIf="_generalForm.controls.persons_with_relationships['controls'].length>0" formArrayName="persons_with_relationships">
@@ -96,8 +96,7 @@
                             <ng-container matColumnDef="relation">
                                     <mat-header-cell *matHeaderCellDef> Relation </mat-header-cell>
                                     <mat-cell *matCellDef="let details;let i = index;" [formGroupName]="i"> 
-                            
-                                            <mat-select placeholder="Relation" formControlName="relationship" style="width: 75%;">
+                                            <mat-select placeholder="Relation" formControlName="relationship" style="width: 75%;" (selectionChange)="updatePersonalRelation(i)">
                                             <mat-option>Select</mat-option>
                                             <mat-option [value]="member.relationship_id" *ngFor="let member of relationShipList">{{member.name + ' of' | titlecase}}</mat-option>
                                             <mat-option value="0" > Not Applicable </mat-option>
@@ -107,9 +106,8 @@
                             </ng-container>
                             <ng-container matColumnDef="relation_to">
                                     <mat-header-cell *matHeaderCellDef> Relationship To </mat-header-cell>
-                                    <mat-cell *matCellDef="let details;let i = index;" [formGroupName]="i"> 
-                            
-                                                    <mat-select placeholder="Applicant" formControlName="relation_to" style="width: 75%;">
+                                    <mat-cell *matCellDef="let details;let i = index;" [formGroupName]="i" [style.visibility]="_generalForm.controls.persons_with_relationships.value[i].relationship==0 ? 'hidden':'visible'"> 
+                                                    <mat-select placeholder="Applicant" formControlName="relation_to" style="width: 75%;" [disabled]="_generalForm.controls.persons_with_relationships.value[i].relationship==0">
                                                         <mat-option>Select</mat-option>
                                                         <mat-option *ngFor="let appc of individualsList" [value]="appc.pd_co_applicant_id">{{appc.applicant_name | titlecase}}</mat-option>
                                                         <mat-option value="0" > Not Applicable </mat-option>
@@ -143,7 +141,7 @@
                         <mat-cell *matCellDef="let details;let i = index;" [formGroupName]="i"> 
                             
                                         <mat-select placeholder="Applicant" formControlName="applicant_name" style="width: 75%;">
-                                            <mat-option *ngFor="let appc of individualsList" [value]="appc.pd_co_applicant_id">{{appc.applicant_name | titlecase}}</mat-option>
+                                            <mat-option *ngFor="let bothC of individualsListBothCase" [value]="bothC.pd_co_applicant_id">{{bothC.applicant_name | titlecase}}</mat-option>
                                         </mat-select>
                             
                         </mat-cell>
@@ -151,7 +149,7 @@
                     <ng-container matColumnDef="company_relationship">
                             <mat-header-cell *matHeaderCellDef> Relation </mat-header-cell>
                             <mat-cell *matCellDef="let details;let i = index;" [formGroupName]="i"> 
-                            <mat-select placeholder="Relation" formControlName="company_relationship" style="width: 75%;">
+                            <mat-select placeholder="Relation" formControlName="company_relationship" style="width: 75%;" (selectionChange)="updateCompanyRelation(i)">
                                 <mat-option>Select</mat-option>
                                 <mat-option *ngFor="let comrelShip of companyRelationShipList" [value]="comrelShip.company_relationship_id">
                                 {{comrelShip.name + ' of' | titlecase}}
@@ -165,7 +163,7 @@
                         <mat-header-cell *matHeaderCellDef> Company </mat-header-cell>
                             <mat-cell *matCellDef="let details;let i = index;" [formGroupName]="i"> 
                             
-                                <mat-select placeholder="Company / Firm" formControlName="relation_to_company" style="width: 75%;">
+                                <mat-select placeholder="Company / Firm" formControlName="relation_to_company" style="width: 75%;" [style.visibility]="_generalForm.controls.company_with_relationships.value[i].company_relationship==0 ? 'hidden':'visible'">
                                     <mat-option>Select</mat-option>  
                                             <mat-option *ngFor="let comp of companyList" [value]="comp.company_order_id">
                                                 {{comp.company_name}}
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 852fb5718..fd0dbb93e 100644
--- 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
@@ -30,6 +30,7 @@ export class GeneralInfoComponent implements OnInit {
   companyRelationShipList:any=[];
   errorMessage:any;
   individualsList: any=[];
+  individualsListBothCase: any=[];
   companyList: any=[];
 
 
@@ -51,6 +52,7 @@ export class GeneralInfoComponent implements OnInit {
       let control = <FormArray>this._generalForm.controls['individuals'];
       this.individualsSource.data =control.controls;
       this.individualsList = control.value.filter(element =>element.is_applicant===true);
+      this.individualsListBothCase = control.value.filter(element =>element.is_applicant===true || element.is_person_met===true);
   });
   // update company details
   this._generalForm.controls['companies'].valueChanges.subscribe(val=>{
@@ -426,6 +428,19 @@ export class GeneralInfoComponent implements OnInit {
       control.removeAt(findex);
   }
 
+  // update personal relation
+  updatePersonalRelation(indexVal) {
+    let control: any = <FormArray>this._generalForm.controls['persons_with_relationships'];
+    control.controls[indexVal].value.relationship==0 ? control.controls[indexVal].controls['relation_to'].setValue('') : control.controls[indexVal].controls['relation_to'].setValue(control.controls[indexVal].value.relation_to);
+
+  }
+  // update company relation
+  updateCompanyRelation(indexVal) {
+    let control:any = <FormArray>this._generalForm.controls['company_with_relationships'];
+    control.controls[indexVal].value.company_relationship==0 ? control.controls[indexVal].controls['relation_to_company'].setValue('') : control.controls[indexVal].controls['relation_to_company'].setValue(control.controls[indexVal].value.relation_to_company);
+
+  }
+
     // submit form details
     submitGeneralForm(formData:any) {
       if (this._generalForm.invalid) {
@@ -438,7 +453,6 @@ export class GeneralInfoComponent implements OnInit {
       //   this.notifier.notify('warning', 'Please Choose Name of Person Met.!');
       // }
       else{
-        console.log('else',this._generalForm.value);
         let saveRecords:any = {}
         saveRecords.pdid=formData.pdid;
         saveRecords.formid=formData.formid;
diff --git a/ng6-seed/src/app/settings/entity/entity-edit/entity-edit-tat/entity-edit-tat.component.ts b/ng6-seed/src/app/settings/entity/entity-edit/entity-edit-tat/entity-edit-tat.component.ts
index 63bf789fc..6b8ffa1ba 100755
--- a/ng6-seed/src/app/settings/entity/entity-edit/entity-edit-tat/entity-edit-tat.component.ts
+++ b/ng6-seed/src/app/settings/entity/entity-edit/entity-edit-tat/entity-edit-tat.component.ts
@@ -114,6 +114,7 @@ export class DialogEntityEditListTatComponent implements OnInit {
   tatListEditForm: FormGroup;
   tatEditAddForm: FormGroup;
   submitted: Boolean = false;
+  listShow: Boolean = false;
   /**
 	 * Notifier service
 	 */

From 0c1f27c62dff3d9fd372167a34b8452bf248dd95 Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Tue, 8 Jan 2019 19:24:37 +0530
Subject: [PATCH 2/2] merge : kms

---
 .../forms/client-info/client-info.component.html   | 14 +++++++-------
 .../forms/loan-details/loan-details.component.html |  4 ++++
 .../supplier-info/supplier-info.component.html     | 10 +++++-----
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.html
index 293bf0249..f7f4bb755 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.html
@@ -9,13 +9,13 @@
     <form [formGroup]="_supplierQuesFrom" (submit)="onSubmit()" novalidate>
         <mat-dialog-content>
             <mat-card *ngIf="manufacturingForm">
-                <h5 style="margin: 12px;">Manufacturing Product Details</h5>
+                <h5 style="margin: 12px;padding:10px !important;">Manufacturing Product Details</h5>
                 <div formArrayName="manufacturing_details">
                     <div *ngFor="let item of _supplierQuesFrom.controls.manufacturing_details['controls']; let i=index" [formGroupName]="i">
                         <div formArrayName="main_raw_materials">
                             <div *ngFor="let items of item.controls.main_raw_materials['controls']; let l=index" [formGroupName]="l">
                                 <mat-card style="margin: 12px;">
-                                    <h6 style="margin: 12px;">Raw Material #{{l+1}}</h6>
+                                    <h6 style="margin: 12px;padding:10px !important;">Raw Material #{{l+1}}</h6>
                                     <div fxLayout="row wrap" fxLayoutGap="2px" fxLayoutAlign="start none">
                                       <!--<pre>{{m_manufacturingProducts[0] | json}}</pre>-->
                                         <mat-form-field style="width:30%">
@@ -69,13 +69,13 @@
                 </div>
             </mat-card>
             <mat-card *ngIf="tradingForm">
-                <h5 style="margin: 12px;">Trading Product Details</h5>
+                <h5 style="margin: 12px;padding:10px !important;">Trading Product Details</h5>
                 <div formArrayName="trade_details">
                     <div *ngFor="let item of _supplierQuesFrom.controls.trade_details['controls']; let i=index" [formGroupName]="i">
                         <div formArrayName="trading_products">
                             <div *ngFor="let items of item.controls.trading_products['controls']; let l=index" [formGroupName]="l">
                                 <mat-card style="margin: 12px;">
-                                    <h6 style="margin: 12px;">Trading Product #{{l+1}}</h6>
+                                    <h6 style="margin: 12px;padding:10px !important;">Trading Product #{{l+1}}</h6>
                                     <div fxLayout="row wrap" fxLayoutGap="2px" fxLayoutAlign="start none">
                                         <mat-form-field style="width: 30%">
                                             <mat-select placeholder="Trading Product Name" formControlName="trade_product_name">
@@ -128,13 +128,13 @@
             </mat-card>
             <!--===========================: service provider details : START-->
             <mat-card *ngIf="serviceProviderForm">
-                <h5 style="margin: 12px;">Service Provider Product Details</h5>
+                <h5 style="margin: 12px;padding:10px !important;">Service Provider Product Details</h5>
                 <div formArrayName="service_provider_details">
                     <div *ngFor="let item of _supplierQuesFrom.controls.service_provider_details['controls']; let i=index" [formGroupName]="i">
                         <div formArrayName="service_products">
                             <div *ngFor="let items of item.controls.service_products['controls']; let l=index" [formGroupName]="l">
                                 <mat-card style="margin: 12px;">
-                                    <h6 style="margin: 12px;">Service Provider Product #{{l+1}}</h6>
+                                    <h6 style="margin: 12px;padding:10px !important;">Service Provider Product #{{l+1}}</h6>
                                     <div fxLayout="row wrap" fxLayoutGap="2px" fxLayoutAlign="start none">
                                         <mat-form-field style="width: 100%">
                                             <mat-select placeholder="Service Provider Product Name" formControlName="service_provider_product_name">
@@ -186,7 +186,7 @@
                 </div>
             </mat-card>
             <mat-card *ngIf="retaildTradingForm">
-                <h5 style="margin: 12px;">Retail Trading Product Details</h5>
+                <h5 style="margin: 12px;padding:10px !important;">Retail Trading Product Details</h5>
                 <div style="text-align: center; margin: 12px;">Retail Trading Details Not applicable here !!</div>
             </mat-card>
         </mat-dialog-content>
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html
index 02c4e8e7b..68f5444b7 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html
@@ -17,6 +17,8 @@
                         <div fxLayout="row wrap">
                                 <div fxFlex="100">
                                     <mat-card>
+                                        <mat-card>
+                                            <mat-card-content class="matcard">
                                      <div fxLayout="row wrap">
                                         <div fxFlex="33">
                                              <mat-form-field style="width: 80%">
@@ -137,6 +139,8 @@
                                         <input matInput placeholder="EMI Amount Comfortable Paying" formControlName="emi_level" (keypress)="keyPress($event)" (keyup)="inWords($event,6)"  autocomplete="off">
                                         <mat-hint align="start" style="font-size:70%" *ngIf="loanDetailsForm.controls['emi_level'].value != ''">{{"&#8377;"}} {{emiAmtInWords}} Only</mat-hint>
                                     </mat-form-field>
+                                            </mat-card-content>
+                                        </mat-card>
 <!-- <div *ngIf="productAbbr === 'HL' || productAbbr === 'LL' || productAbbr === 'LAP' "> -->
     <mat-card *ngIf="mortageCardAccess">
         <mat-card-header><p>Details of Property being Mortgaged</p></mat-card-header>
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.html
index 982ab5fdf..b79948469 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.html
@@ -9,13 +9,13 @@
     <form [formGroup]="_supplierQuesFrom" (submit)="onSubmit()" novalidate>
         <mat-dialog-content>
             <mat-card *ngIf="manufacturingForm">
-                <h5 style="margin: 12px;">Manufacturing Product Details</h5>
+                <h5 style="margin: 12px;padding:10px !important;">Manufacturing Product Details</h5>
                 <div formArrayName="manufacturing_details">
                     <div *ngFor="let item of _supplierQuesFrom.controls.manufacturing_details['controls']; let i=index" [formGroupName]="i">
                         <div formArrayName="main_raw_materials">
                             <div *ngFor="let items of item.controls.main_raw_materials['controls']; let l=index" [formGroupName]="l">
                                 <mat-card style="margin: 12px;">
-                                    <h6 style="margin: 12px;">Raw Material #{{l+1}}</h6>
+                                    <h6 style="margin: 12px;padding:10px !important;">Raw Material #{{l+1}}</h6>
                                     <div fxLayout="row wrap" fxLayoutGap="2px" fxLayoutAlign="start none">
                                         <mat-form-field style="width: 30%">
                                             <input matInput placeholder="Raw Material Name" formControlName="manufacturing_raw_material_name">
@@ -62,13 +62,13 @@
                 </div>
             </mat-card>
             <mat-card *ngIf="tradingForm">
-                <h5 style="margin: 12px;">Trading Product Details</h5>
+                <h5 style="margin: 12px;padding:10px !important;">Trading Product Details</h5>
                 <div formArrayName="trade_details">
                     <div *ngFor="let item of _supplierQuesFrom.controls.trade_details['controls']; let i=index" [formGroupName]="i">
                         <div formArrayName="trading_products">
                             <div *ngFor="let items of item.controls.trading_products['controls']; let l=index" [formGroupName]="l">
                                 <mat-card style="margin: 12px;">
-                                    <h6 style="margin: 12px;">Trading Product #{{l+1}}</h6>
+                                    <h6 style="margin: 12px;padding:10px !important;">Trading Product #{{l+1}}</h6>
                                     <div fxLayout="row wrap" fxLayoutGap="2px" fxLayoutAlign="start none">
                                         <mat-form-field style="width: 30%">
                                             <input matInput placeholder="Trade Product Name" formControlName="trade_product_name">
@@ -115,7 +115,7 @@
                 </div>
             </mat-card>
             <mat-card *ngIf="serviceProviderForm">
-                <h5 style="margin: 12px;">Service Provider Product Details</h5>
+                <h5 style="margin: 12px;padding:10px !important;">Service Provider Product Details</h5>
                 <div style="text-align: center; margin: 12px;">Service Provider Details Not applicable here !!</div>
             </mat-card>
         </mat-dialog-content>