sheet issues fixes :ps

This commit is contained in:
venbatechnologies@gmail.com 2019-02-20 11:15:33 +05:30
parent 5600fa463e
commit 2f655a8b3b
17 changed files with 2957 additions and 2627 deletions

View File

@ -6,7 +6,10 @@
{{pageTitle}} {{pageTitle}}
</div> </div>
<div fxFlex="30" align="end" style="padding: 10px !important;"> <div fxFlex="30" align="end" style="padding: 10px !important;">
<button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Close" matTooltipPosition="right" mat-dialog-close><mat-icon>close</mat-icon></button> <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Close"
matTooltipPosition="right" mat-dialog-close>
<mat-icon>close</mat-icon>
</button>
</div> </div>
</h2> </h2>
@ -19,7 +22,9 @@
<div fxFlex="100"> <div fxFlex="100">
<mat-card> <mat-card>
<mat-card-header> <mat-card-header>
<mat-card-title><p>Address Details {{addressLabel | titlecase}}</p></mat-card-title> <mat-card-title>
<p>Address Details {{addressLabel | titlecase}}</p>
</mat-card-title>
</mat-card-header> </mat-card-header>
@ -37,31 +42,36 @@
<div style="width:95%"> <div style="width:95%">
<label>How long has business been operated from this premise?</label> <label>How long has business been operated from this premise?</label>
<mat-form-field> <mat-form-field>
<input matInput autocomplete="off" placeholder="Year(s)" formControlName="business_years" (change)="checkWithExistBusinessYear($event.target.value)" (keypress)="keyPress($event)"> <input matInput autocomplete="off" placeholder="Year(s)" formControlName="business_years"
(change)="checkWithExistBusinessYear($event.target.value)" (keypress)="keyPress($event)">
<mat-hint style="color: red;">{{yearErrorMessage}}</mat-hint> <mat-hint style="color: red;">{{yearErrorMessage}}</mat-hint>
<mat-error *ngIf="!_businessAssetsQuesFrom.controls['business_years'].value.valid">Year's Required</mat-error> <mat-error *ngIf="!_businessAssetsQuesFrom.controls['business_years'].value.valid">Year's
Required</mat-error>
</mat-form-field> </mat-form-field>
<mat-form-field> <mat-form-field>
<input matInput autocomplete="off" placeholder="Month(s)" formControlName="business_month" (keypress)="keyPress($event)" (change)="ConvertMonthintoYear($event.target.value)"> <input matInput autocomplete="off" placeholder="Month(s)" formControlName="business_month"
(keypress)="keyPress($event)" (change)="ConvertMonthintoYear($event.target.value)">
<mat-hint style="color: red;">{{monthErrorMessage}}</mat-hint> <mat-hint style="color: red;">{{monthErrorMessage}}</mat-hint>
<mat-error *ngIf="!_businessAssetsQuesFrom.controls['business_month'].value.valid">Month's Required</mat-error> <!-- <mat-error *ngIf="!_businessAssetsQuesFrom.controls['business_month'].value.valid">Month's
Required</mat-error> -->
</mat-form-field> </mat-form-field>
</div> </div>
<mat-form-field style="width: 95%;"> <mat-form-field style="width: 95%;">
<mat-select [placeholder]="placeholderName" <mat-select [placeholder]="placeholderName" formControlName="business_is_pd_visited">
formControlName="business_is_pd_visited">
<mat-option value="yes">Yes</mat-option> <mat-option value="yes">Yes</mat-option>
<mat-option value="no">No</mat-option> <mat-option value="no">No</mat-option>
</mat-select> </mat-select>
<mat-error *ngIf="!_businessAssetsQuesFrom.controls['business_is_pd_visited'].value.valid">Field Required</mat-error> <mat-error *ngIf="!_businessAssetsQuesFrom.controls['business_is_pd_visited'].value.valid">Field
Required</mat-error>
</mat-form-field> </mat-form-field>
<mat-form-field *ngIf=" _businessAssetsQuesFrom.controls['business_is_pd_visited'].value != ''" style="width: 95%;"> <mat-form-field *ngIf=" _businessAssetsQuesFrom.controls['business_is_pd_visited'].value != ''" style="width: 95%;">
<input matInput autocomplete="off" placeholder="Remarks" formControlName="business_pd_visited_remark"> <input matInput autocomplete="off" placeholder="Remarks" formControlName="business_pd_visited_remark">
<mat-error *ngIf="!_businessAssetsQuesFrom.controls['business_pd_visited_remark'].value.valid">Remarks Required</mat-error> <mat-error *ngIf="!_businessAssetsQuesFrom.controls['business_pd_visited_remark'].value.valid">Remarks
Required</mat-error>
</mat-form-field> </mat-form-field>
</div> </div>
@ -71,7 +81,8 @@
<div *ngFor="let itemrow of _businessAssetsQuesFrom.controls.business_assets_for_address['controls']; let i=index; let last=last;"> <div *ngFor="let itemrow of _businessAssetsQuesFrom.controls.business_assets_for_address['controls']; let i=index; let last=last;">
<div [formGroupName]="i"> <div [formGroupName]="i">
<mat-form-field style="width:45%"> <mat-form-field style="width:45%">
<mat-select placeholder="Ownership Type" formControlName="business_ownership_type" (selectionChange)="setRequiredValidation($event.value,itemrow,7)"> <mat-select placeholder="Ownership Type" formControlName="business_ownership_type"
(selectionChange)="setRequiredValidation($event.value,itemrow,7)">
<!-- (selectionChange)="selectedPropertyOwnedType($event.value,s,i)" --> <!-- (selectionChange)="selectedPropertyOwnedType($event.value,s,i)" -->
<mat-option value="owned">Owned</mat-option> <mat-option value="owned">Owned</mat-option>
<mat-option value="rented">Rented</mat-option> <mat-option value="rented">Rented</mat-option>
@ -79,8 +90,10 @@
</mat-form-field> </mat-form-field>
<mat-form-field style="width:45%" *ngIf="(itemrow.get('business_ownership_type').value == 'rented')"> <mat-form-field style="width:45%" *ngIf="(itemrow.get('business_ownership_type').value == 'rented')">
<input matInput autocomplete="off" placeholder="Monthly Rent Amount" formControlName="business_monthly_rented_amt" (keypress)="keyPress($event)" (keyup)="inWords($event,i,9)"> <input matInput autocomplete="off" placeholder="Monthly Rent Amount" formControlName="business_monthly_rented_amt"
<mat-hint align="start" style="font-size:90%" *ngIf="itemrow.get('business_monthly_rented_amt').value != ''">{{"&#8377;"}} {{RentAmtInwords2[i]}} Only</mat-hint> (keypress)="keyPress($event)" (keyup)="inWords($event,i,9)">
<mat-hint align="start" style="font-size:90%" *ngIf="itemrow.get('business_monthly_rented_amt').value != ''">{{"&#8377;"}}
{{RentAmtInwordsForAddress[i]}} Only</mat-hint>
<mat-error>Monthly Rent Amount Required</mat-error> <mat-error>Monthly Rent Amount Required</mat-error>
</mat-form-field> </mat-form-field>
@ -90,12 +103,15 @@
<!-- <mat-form-field *ngIf="sup.get('business_assets_mode').value == 2 || sup.get('business_assets_mode').value == 5" style="width:45%"> --> <!-- <mat-form-field *ngIf="sup.get('business_assets_mode').value == 2 || sup.get('business_assets_mode').value == 5" style="width:45%"> -->
<mat-form-field style="width:45%"> <mat-form-field style="width:45%">
<input matInput placeholder="Approximate Market Value" formControlName="business_approximate_market_value" (keypress)="keyPress($event)" autocomplete="off" (keyup)="inWords($event,i,10)"> <input matInput placeholder="Approximate Market Value" formControlName="business_approximate_market_value"
<mat-hint align="start" style="font-size:90%" *ngIf="itemrow.get('business_approximate_market_value').value != ''">{{"&#8377;"}} {{appxMarketAmtInwords2[i]}} Only</mat-hint> (keypress)="keyPress($event)" autocomplete="off" (keyup)="inWords($event,i,10)">
<mat-hint align="start" style="font-size:90%" *ngIf="itemrow.get('business_approximate_market_value').value != ''">{{"&#8377;"}}
{{appxMarketAmtInwordsForAddress[i]}} Only</mat-hint>
</mat-form-field> </mat-form-field>
<mat-form-field style="width:45%"> <mat-form-field style="width:45%">
<mat-select placeholder="Asset Owned by" formControlName="business_name_of_the_owner" [compareWith]="compareObjects" (selectionChange)="setRequiredValidation($event.value,itemrow,8)"> <mat-select multiple placeholder="Asset Owned by" formControlName="business_name_of_the_owner"
[compareWith]="compareObjects" (selectionChange)="setRequiredValidation($event.value,itemrow,8)">
<mat-optgroup *ngFor="let group of mergeCompanyApplicant" [label]="group.groupName"> <mat-optgroup *ngFor="let group of mergeCompanyApplicant" [label]="group.groupName">
<mat-option *ngFor="let val of group.groupValues" [value]="val"> <mat-option *ngFor="let val of group.groupValues" [value]="val">
{{val.name}} {{val.name}}
@ -109,8 +125,9 @@
<input matInput placeholder="business_name_of_the_owner" formControlName="business_name_of_the_owner" autocomplete="off"> <input matInput placeholder="business_name_of_the_owner" formControlName="business_name_of_the_owner" autocomplete="off">
</mat-form-field> --> </mat-form-field> -->
<!-- --> <!-- -->
<mat-form-field style="width:45%" *ngIf="checkOthers2(itemrow.get('business_name_of_the_owner').value)===true"> <mat-form-field style="width:45%" *ngIf="isOtherOwnerForAddress">
<input matInput placeholder="Specify Asset Owned Name" formControlName="business_name_of_the_other_owner" autocomplete="off"> <input matInput placeholder="Specify Asset Owned Name" formControlName="business_name_of_the_other_owner"
autocomplete="off">
</mat-form-field> </mat-form-field>
@ -118,13 +135,15 @@
<!-- <span *ngIf="(sup.get('business_assets_mode').value == 1 || sup.get('business_assets_mode').value == 2 || sup.get('business_assets_mode').value == 3) && sup.get('business_ownership_type').value == 'owned'"> --> <!-- <span *ngIf="(sup.get('business_assets_mode').value == 1 || sup.get('business_assets_mode').value == 2 || sup.get('business_assets_mode').value == 3) && sup.get('business_ownership_type').value == 'owned'"> -->
<mat-form-field style="width:45%"> <mat-form-field style="width:45%">
<mat-label>Approx Vintage</mat-label> <mat-label>Approx Vintage</mat-label>
<input matInput autocomplete="off" placeholder="eg.999" formControlName="business_vintage" minlength="1" maxlength="3" (keypress)="keyPress($event)" (keyup)="calculateVintagePurchase($event.target.value,i,3)"> <input matInput autocomplete="off" placeholder="eg.999" formControlName="business_vintage"
minlength="1" maxlength="3" (keypress)="keyPress($event)" (keyup)="calculateVintagePurchase($event.target.value,i,3)">
<!-- <mat-error> Invalid format</mat-error> --> <!-- <mat-error> Invalid format</mat-error> -->
</mat-form-field> </mat-form-field>
<mat-form-field style="width:45%"> <mat-form-field style="width:45%">
<mat-label>Purchase Year</mat-label> <mat-label>Purchase Year</mat-label>
<input matInput autocomplete="off" placeholder="YYYY eg.2018" formControlName="business_purchase_year" minlength="4" maxlength="4" (keypress)="keyPress($event)" (keyup)="calculateVintagePurchase($event.target.value,i,4)"> <input matInput autocomplete="off" placeholder="YYYY eg.2018" formControlName="business_purchase_year"
minlength="4" maxlength="4" (keypress)="keyPress($event)" (keyup)="calculateVintagePurchase($event.target.value,i,4)">
<!-- <mat-error> Invalid year format</mat-error> --> <!-- <mat-error> Invalid year format</mat-error> -->
</mat-form-field> </mat-form-field>
</div> </div>
@ -216,7 +235,9 @@
<div fxFlex="100"> <div fxFlex="100">
<mat-card style="min-height: 550px;"> <mat-card style="min-height: 550px;">
<mat-card-header> <mat-card-header>
<mat-card-title><p>Other Assets Used in Business</p></mat-card-title> <mat-card-title>
<p>Other Assets Used in Business</p>
</mat-card-title>
</mat-card-header> </mat-card-header>
<mat-card-content> <mat-card-content>
<div fxLayout="row" fxLayoutAlign="start none"> <div fxLayout="row" fxLayoutAlign="start none">
@ -227,8 +248,10 @@
<div [formGroupName]="i"> <div [formGroupName]="i">
<div fxLayout="row wrap" fxLayoutGap="5px" fxLayoutAlign="start none"> <div fxLayout="row wrap" fxLayoutGap="5px" fxLayoutAlign="start none">
<mat-form-field style="width:100%"> <mat-form-field style="width:100%">
<mat-select (selectionChange)="selectedAssetsType($event,i)" placeholder="Asset Type" formControlName="business_assets_mode" requried> <mat-select (selectionChange)="selectedAssetsType($event,i)" placeholder="Asset Type"
<mat-option *ngFor="let asset of m_assets_type" [value]="asset.id" [disabled]="asset.flag!=1">{{ asset.name | titlecase }}</mat-option> formControlName="business_assets_mode" requried>
<mat-option *ngFor="let asset of m_assets_type" [value]="asset.id" [disabled]="asset.flag!=1">{{
asset.name | titlecase }}</mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
</div> </div>
@ -242,16 +265,20 @@
<div fxLayout="row" fxLayoutGap="2px" fxLayoutAlign="start none"> <div fxLayout="row" fxLayoutGap="2px" fxLayoutAlign="start none">
<mat-form-field style="width:45%"> <mat-form-field style="width:45%">
<mat-select placeholder="Property Type" formControlName="property_type" (selectionChange)="setRequiredValidation($event.value,detail,6)"> <mat-select placeholder="Property Type" formControlName="property_type"
<mat-option *ngFor="let m_address_type of m_address_type" [value]="m_address_type.address_type_id"> {{m_address_type.address_type}} </mat-option> (selectionChange)="setRequiredValidation($event.value,detail,6)">
<mat-option *ngFor="let m_address_type of m_address_type" [value]="m_address_type.address_type_id">
{{m_address_type.address_type}} </mat-option>
<!-- <mat-option *ngFor="let prop of m_propertyType" [value]="prop.id">{{ prop.name | titlecase }}</mat-option> --> <!-- <mat-option *ngFor="let prop of m_propertyType" [value]="prop.id">{{ prop.name | titlecase }}</mat-option> -->
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<mat-form-field style="width:45%" *ngIf="detail.get('property_type').value == 1"> <mat-form-field style="width:45%" *ngIf="detail.get('property_type').value == 1">
<input matInput placeholder="Specify Other Property Type" formControlName="other_property_type" autocomplete="off"> <input matInput placeholder="Specify Other Property Type" formControlName="other_property_type"
autocomplete="off">
</mat-form-field> </mat-form-field>
<mat-form-field style="width:45%"> <mat-form-field style="width:45%" *ngIf="detail.get('property_type').value != ''">
<input matInput placeholder="Address of the Property" formControlName="address_of_the_property" autocomplete="off" requried> <input matInput placeholder="Address of the Property" formControlName="address_of_the_property"
autocomplete="off">
</mat-form-field> </mat-form-field>
</div> </div>
</div> </div>
@ -265,17 +292,21 @@
<div fxLayout="row" fxLayoutGap="2px" fxLayoutAlign="start none"> <div fxLayout="row" fxLayoutGap="2px" fxLayoutAlign="start none">
<mat-form-field style="width:45%"> <mat-form-field style="width:45%">
<mat-select placeholder="Type of Vehicle" formControlName="vehicle_type" (selectionChange)="setRequiredValidation($event.value,detail,5)"> <mat-select placeholder="Type of Vehicle" formControlName="vehicle_type"
<mat-option *ngFor="let vehicle of m_vehicle_type" [value]="vehicle.vehicle_type_id">{{ vehicle.vehicle_type_name }}</mat-option> (selectionChange)="setRequiredValidation($event.value,detail,5)">
<mat-option *ngFor="let vehicle of m_vehicle_type" [value]="vehicle.vehicle_type_id">{{
vehicle.vehicle_type_name }}</mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<mat-form-field style="width:45%" *ngIf="detail.get('vehicle_type').value == 1"> <mat-form-field style="width:45%" *ngIf="detail.get('vehicle_type').value == 1">
<input matInput placeholder=" Specify Vehicle" formControlName="other_vehicle_type" autocomplete="off"> <input matInput placeholder=" Specify Vehicle" formControlName="other_vehicle_type"
autocomplete="off">
</mat-form-field> </mat-form-field>
<mat-form-field style="width:45%"> <mat-form-field style="width:45%">
<input matInput placeholder="Description of Vehicle (example -Toyota Altis)" formControlName="manufacturer_model_vehicle" autocomplete="off"> <input matInput placeholder="Description of Vehicle (example -Toyota Altis)"
formControlName="manufacturer_model_vehicle" autocomplete="off">
</mat-form-field> </mat-form-field>
</div> </div>
</div> </div>
@ -379,20 +410,24 @@
<div [formGroupName]="s"> <div [formGroupName]="s">
<div fxLayout="row" fxLayoutGap="2px" fxLayoutAlign="start none"> <div fxLayout="row" fxLayoutGap="2px" fxLayoutAlign="start none">
<mat-form-field style="width:95%"> <mat-form-field style="width:95%">
<input matInput placeholder="Description of the Assets" formControlName="any_other_assets" autocomplete="off"> <input matInput placeholder="Description of the Assets" formControlName="any_other_assets"
autocomplete="off">
</mat-form-field> </mat-form-field>
</div> </div>
<div fxLayout="row" fxLayoutGap="2px" fxLayoutAlign="start none"> <div fxLayout="row" fxLayoutGap="2px" fxLayoutAlign="start none">
<mat-form-field style="width:45%"> <!-- <mat-form-field style="width:45%">
<input matInput placeholder="Value of the Assets" formControlName="any_other_asset_value" autocomplete="off" (keyup)="inWords($event,s,6)" (keypress)="keyPress($event)"> <input matInput placeholder="Value of the Assets" formControlName="any_other_asset_value"
<mat-hint align="start" style="font-size:90%" *ngIf="detail.get('any_other_asset_value').value != ''">{{"&#8377;"}} {{AssetValueInwords[s]}} Only</mat-hint> autocomplete="off" (keyup)="inWords($event,s,6)" (keypress)="keyPress($event)">
</mat-form-field> <mat-hint align="start" style="font-size:90%" *ngIf="detail.get('any_other_asset_value').value != ''">{{"&#8377;"}}
{{AssetValueInwords[s]}} Only</mat-hint>
</mat-form-field> -->
<mat-form-field style="width:45%"> <mat-form-field style="width:45%">
<mat-select placeholder="Is there any asset loan?" formControlName="any_other_asset_loan"> <mat-select placeholder="Is there any asset loan?" formControlName="any_other_asset_loan">
<mat-option value="{{data.value}}" *ngFor="let data of m_any_asset_loan_type">{{data.viewValue | titlecase}}</mat-option> <mat-option value="{{data.value}}" *ngFor="let data of m_any_asset_loan_type">{{data.viewValue
| titlecase}}</mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
@ -413,7 +448,8 @@
<div fxLayout="row wrap" fxLayoutGap="2px" fxLayoutAlign="start none"> <div fxLayout="row wrap" fxLayoutGap="2px" fxLayoutAlign="start none">
<mat-form-field style="width:45%" *ngIf="sup.get('business_assets_mode').value != ''"> <mat-form-field style="width:45%" *ngIf="sup.get('business_assets_mode').value != ''">
<mat-select placeholder="Ownership Type" formControlName="business_ownership_type" (selectionChange)="setRequiredValidation($event.value,sup,7)"> <mat-select placeholder="Ownership Type" formControlName="business_ownership_type"
(selectionChange)="setRequiredValidation($event.value,sup,7)">
<!-- (selectionChange)="selectedPropertyOwnedType($event.value,s,i)" --> <!-- (selectionChange)="selectedPropertyOwnedType($event.value,s,i)" -->
<mat-option value="owned">Owned</mat-option> <mat-option value="owned">Owned</mat-option>
<mat-option value="rented">Rented</mat-option> <mat-option value="rented">Rented</mat-option>
@ -422,8 +458,10 @@
<mat-form-field style="width:45%" *ngIf="(sup.get('business_assets_mode').value != '' && sup.get('business_ownership_type').value == 'rented')"> <mat-form-field style="width:45%" *ngIf="(sup.get('business_assets_mode').value != '' && sup.get('business_ownership_type').value == 'rented')">
<input matInput autocomplete="off" placeholder="Monthly Rent Amount" formControlName="business_monthly_rented_amt" (keypress)="keyPress($event)" (keyup)="inWords($event,i,8)"> <input matInput autocomplete="off" placeholder="Monthly Rent Amount" formControlName="business_monthly_rented_amt"
<mat-hint align="start" style="font-size:90%" *ngIf="sup.get('business_monthly_rented_amt').value != ''">{{"&#8377;"}} {{RentAmtInwords[i]}} Only</mat-hint> (keypress)="keyPress($event)" (keyup)="inWords($event,i,8)">
<mat-hint align="start" style="font-size:90%" *ngIf="sup.get('business_monthly_rented_amt').value != ''">{{"&#8377;"}}
{{RentAmtInwords[i]}} Only</mat-hint>
<mat-error>Monthly Rent Amount Required</mat-error> <mat-error>Monthly Rent Amount Required</mat-error>
</mat-form-field> </mat-form-field>
</div> </div>
@ -432,12 +470,15 @@
<!-- <mat-form-field *ngIf="sup.get('business_assets_mode').value == 2 || sup.get('business_assets_mode').value == 5" style="width:45%"> --> <!-- <mat-form-field *ngIf="sup.get('business_assets_mode').value == 2 || sup.get('business_assets_mode').value == 5" style="width:45%"> -->
<mat-form-field style="width:45%"> <mat-form-field style="width:45%">
<input matInput placeholder="Approximate Market Value" formControlName="business_approximate_market_value" (keypress)="keyPress($event)" autocomplete="off" (keyup)="inWords($event,i,1)"> <input matInput placeholder="Approximate Market Value" formControlName="business_approximate_market_value"
<mat-hint align="start" style="font-size:90%" *ngIf="sup.get('business_approximate_market_value').value != ''">{{"&#8377;"}} {{appxMarketAmtInwords[i]}} Only</mat-hint> (keypress)="keyPress($event)" autocomplete="off" (keyup)="inWords($event,i,1)">
<mat-hint align="start" style="font-size:90%" *ngIf="sup.get('business_approximate_market_value').value != ''">{{"&#8377;"}}
{{appxMarketAmtInwords[i]}} Only</mat-hint>
</mat-form-field> </mat-form-field>
<mat-form-field style="width:45%"> <mat-form-field style="width:45%">
<mat-select placeholder="Asset Owned by" formControlName="business_name_of_the_owner" [compareWith]="compareObjects" (selectionChange)="setRequiredValidation($event.value,sup,4)"> <mat-select multiple placeholder="Asset Owned by" formControlName="business_name_of_the_owner"
[compareWith]="compareObjects" (selectionChange)="setRequiredValidation($event.value,sup,4)">
<mat-optgroup *ngFor="let group of mergeCompanyApplicant" [label]="group.groupName"> <mat-optgroup *ngFor="let group of mergeCompanyApplicant" [label]="group.groupName">
<mat-option *ngFor="let val of group.groupValues" [value]="val"> <mat-option *ngFor="let val of group.groupValues" [value]="val">
{{val.name}} {{val.name}}
@ -447,8 +488,9 @@
<mat-error>Asset Owned by Required</mat-error> <mat-error>Asset Owned by Required</mat-error>
</mat-form-field> </mat-form-field>
<mat-form-field *ngIf="checkOthers(sup.get('business_name_of_the_owner').value)===true" style="width:45%"> <mat-form-field *ngIf="isOtherOwner" style="width:45%">
<input matInput placeholder="Specify Asset Owned Name" formControlName="business_name_of_the_other_owner" autocomplete="off"> <input matInput placeholder="Specify Asset Owned Name" formControlName="business_name_of_the_other_owner"
autocomplete="off">
</mat-form-field> </mat-form-field>
@ -456,13 +498,15 @@
<!-- <span *ngIf="(sup.get('business_assets_mode').value == 1 || sup.get('business_assets_mode').value == 2 || sup.get('business_assets_mode').value == 3) && sup.get('business_ownership_type').value == 'owned'"> --> <!-- <span *ngIf="(sup.get('business_assets_mode').value == 1 || sup.get('business_assets_mode').value == 2 || sup.get('business_assets_mode').value == 3) && sup.get('business_ownership_type').value == 'owned'"> -->
<mat-form-field style="width:45%"> <mat-form-field style="width:45%">
<mat-label>Approx Vintage</mat-label> <mat-label>Approx Vintage</mat-label>
<input matInput autocomplete="off" placeholder="eg.999" formControlName="business_vintage" minlength="1" maxlength="3" (keypress)="keyPress($event)" (keyup)="calculateVintagePurchase($event.target.value,i,1)"> <input matInput autocomplete="off" placeholder="eg.999" formControlName="business_vintage"
minlength="1" maxlength="3" (keypress)="keyPress($event)" (keyup)="calculateVintagePurchase($event.target.value,i,1)">
<!-- <mat-error> Invalid format</mat-error> --> <!-- <mat-error> Invalid format</mat-error> -->
</mat-form-field> </mat-form-field>
<mat-form-field style="width:45%"> <mat-form-field style="width:45%">
<mat-label>Purchase Year</mat-label> <mat-label>Purchase Year</mat-label>
<input matInput autocomplete="off" placeholder="YYYY eg.2018" formControlName="business_purchase_year" minlength="4" maxlength="4" (keypress)="keyPress($event)" (keyup)="calculateVintagePurchase($event.target.value,i,2)"> <input matInput autocomplete="off" placeholder="YYYY eg.2018" formControlName="business_purchase_year"
minlength="4" maxlength="4" (keypress)="keyPress($event)" (keyup)="calculateVintagePurchase($event.target.value,i,2)">
<!-- <mat-error> Invalid year format</mat-error> --> <!-- <mat-error> Invalid year format</mat-error> -->
</mat-form-field> </mat-form-field>
</div> </div>
@ -470,7 +514,8 @@
<span *ngIf="(sup.get('business_assets_mode').value != '') && sup.get('business_ownership_type').value == 'owned'"> <span *ngIf="(sup.get('business_assets_mode').value != '') && sup.get('business_ownership_type').value == 'owned'">
<div fxLayout="row wrap" fxLayoutGap="2px" fxLayoutAlign="start none"> <div fxLayout="row wrap" fxLayoutGap="2px" fxLayoutAlign="start none">
<mat-form-field style="width:95%"> <mat-form-field style="width:95%">
<mat-select placeholder="Is There a Loan Existing Against This Asset?" formControlName="business_emi"> <mat-select placeholder="Is There a Loan Existing Against This Asset?"
formControlName="business_emi">
<mat-option value="yes">Yes</mat-option> <mat-option value="yes">Yes</mat-option>
<mat-option value="no">No</mat-option> <mat-option value="no">No</mat-option>
</mat-select> </mat-select>
@ -481,14 +526,15 @@
</mat-card-content> </mat-card-content>
<mat-card-actions> <mat-card-actions>
<div align="right"> <div align="right">
<button type="button" mat-raised-button mat-icon-button *ngIf="_businessAssetsQuesFrom.controls.business_assets_details.controls.length > 1" (click)="removeAssetsDetails(i)" <button type="button" mat-raised-button mat-icon-button *ngIf="_businessAssetsQuesFrom.controls.business_assets_details.controls.length > 1"
matTooltip="Delete Business Assets" matTooltipPosition="above" class="mr-1 mb-1 hover-icon"> (click)="removeAssetsDetails(i)" matTooltip="Delete Business Assets"
matTooltipPosition="above" class="mr-1 mb-1 hover-icon">
<mat-icon>delete</mat-icon> <mat-icon>delete</mat-icon>
</button> </button>
</div> </div>
<div align="center"> <div align="center">
<button type="button" mat-flat-button (click)="addAssetDetails($event); false" <button type="button" mat-flat-button (click)="addAssetDetails($event); false" matTooltip="Add More"
matTooltip="Add More" matTooltipPosition="left" color="primary" *ngIf="last"> matTooltipPosition="left" color="primary" *ngIf="last">
<strong>Add More Business Asset </strong> <strong>Add More Business Asset </strong>
</button> </button>
</div> </div>
@ -559,43 +605,91 @@
<div fxFlex="row"> <div fxFlex="row">
<div fxFlex="100" class="m-gap p-gap"> <div fxFlex="100" class="m-gap p-gap">
<div fxLayout="row" fxLayoutWrap="wrap"> <div fxLayout="row" fxLayoutWrap="wrap">
<div class="text-center mb-2 hover-icon" fxFlex.xs="50" fxFlex.sm="50" fxFlex.md="20" fxFlex.lg="20" fxFlex.xl="20"> <div class="text-center mb-2 hover-icon" fxFlex.xs="50" fxFlex.sm="50" fxFlex.md="20" fxFlex.lg="20"
<a href="http://www.google.com"><mat-icon style="color: #e00201;font-size: 60px !important;width:inherit !important;">picture_as_pdf</mat-icon> <span class="d-block">version_111</span></a> fxFlex.xl="20">
<a href="http://www.google.com">
<mat-icon style="color: #e00201;font-size: 60px !important;width:inherit !important;">picture_as_pdf</mat-icon>
<span class="d-block">version_111</span>
</a>
</div> </div>
<div class="text-center mb-2 hover-icon" fxFlex.xs="50" fxFlex.sm="50" fxFlex.md="20" fxFlex.lg="20" fxFlex.xl="20"> <div class="text-center mb-2 hover-icon" fxFlex.xs="50" fxFlex.sm="50" fxFlex.md="20" fxFlex.lg="20"
<a href="http://www.google.com"><mat-icon style="color: #e00201;font-size: 60px !important;width:inherit !important;">picture_as_pdf</mat-icon> <span class="d-block">version_111</span></a> fxFlex.xl="20">
<a href="http://www.google.com">
<mat-icon style="color: #e00201;font-size: 60px !important;width:inherit !important;">picture_as_pdf</mat-icon>
<span class="d-block">version_111</span>
</a>
</div> </div>
<div class="text-center mb-2 hover-icon" fxFlex.xs="50" fxFlex.sm="50" fxFlex.md="20" fxFlex.lg="20" fxFlex.xl="20"> <div class="text-center mb-2 hover-icon" fxFlex.xs="50" fxFlex.sm="50" fxFlex.md="20" fxFlex.lg="20"
<a href="http://www.google.com"><mat-icon style="color: #e00201;font-size: 60px !important;width:inherit !important;">picture_as_pdf</mat-icon> <span class="d-block">version_111</span></a> fxFlex.xl="20">
<a href="http://www.google.com">
<mat-icon style="color: #e00201;font-size: 60px !important;width:inherit !important;">picture_as_pdf</mat-icon>
<span class="d-block">version_111</span>
</a>
</div> </div>
<div class="text-center mb-2 hover-icon" fxFlex.xs="50" fxFlex.sm="50" fxFlex.md="20" fxFlex.lg="20" fxFlex.xl="20"> <div class="text-center mb-2 hover-icon" fxFlex.xs="50" fxFlex.sm="50" fxFlex.md="20" fxFlex.lg="20"
<a href="http://www.google.com"><mat-icon style="color: #e00201;font-size: 60px !important;width:inherit !important;">picture_as_pdf</mat-icon> <span class="d-block">version_111</span></a> fxFlex.xl="20">
<a href="http://www.google.com">
<mat-icon style="color: #e00201;font-size: 60px !important;width:inherit !important;">picture_as_pdf</mat-icon>
<span class="d-block">version_111</span>
</a>
</div> </div>
<div class="text-center mb-2 hover-icon" fxFlex.xs="50" fxFlex.sm="50" fxFlex.md="20" fxFlex.lg="20" fxFlex.xl="20"> <div class="text-center mb-2 hover-icon" fxFlex.xs="50" fxFlex.sm="50" fxFlex.md="20" fxFlex.lg="20"
<a href="http://www.google.com"><mat-icon style="color: #e00201;font-size: 60px !important;width:inherit !important;">picture_as_pdf</mat-icon> <span class="d-block">version_111</span></a> fxFlex.xl="20">
<a href="http://www.google.com">
<mat-icon style="color: #e00201;font-size: 60px !important;width:inherit !important;">picture_as_pdf</mat-icon>
<span class="d-block">version_111</span>
</a>
</div> </div>
<div class="text-center mb-2 hover-icon" fxFlex.xs="50" fxFlex.sm="50" fxFlex.md="20" fxFlex.lg="20" fxFlex.xl="20"> <div class="text-center mb-2 hover-icon" fxFlex.xs="50" fxFlex.sm="50" fxFlex.md="20" fxFlex.lg="20"
<a href="http://www.google.com"><mat-icon style="color: #e00201;font-size: 60px !important;width:inherit !important;">picture_as_pdf</mat-icon> <span class="d-block">version_111</span></a> fxFlex.xl="20">
<a href="http://www.google.com">
<mat-icon style="color: #e00201;font-size: 60px !important;width:inherit !important;">picture_as_pdf</mat-icon>
<span class="d-block">version_111</span>
</a>
</div> </div>
</div> </div>
<div fxLayout="row" fxLayoutWrap="wrap"> <div fxLayout="row" fxLayoutWrap="wrap">
<div class="text-center mb-2 hover-icon" fxFlex.xs="50" fxFlex.sm="50" fxFlex.md="25" fxFlex.lg="25" fxFlex.xl="25"> <div class="text-center mb-2 hover-icon" fxFlex.xs="50" fxFlex.sm="50" fxFlex.md="25" fxFlex.lg="25"
<a href="http://www.google.com"><mat-icon style="color: #e00201;font-size: 60px !important;width:inherit !important;">picture_as_pdf</mat-icon> <span class="d-block">version_111</span></a> fxFlex.xl="25">
<a href="http://www.google.com">
<mat-icon style="color: #e00201;font-size: 60px !important;width:inherit !important;">picture_as_pdf</mat-icon>
<span class="d-block">version_111</span>
</a>
</div> </div>
<div class="text-center mb-2 hover-icon" fxFlex.xs="50" fxFlex.sm="50" fxFlex.md="25" fxFlex.lg="25" fxFlex.xl="25"> <div class="text-center mb-2 hover-icon" fxFlex.xs="50" fxFlex.sm="50" fxFlex.md="25" fxFlex.lg="25"
<a href="http://www.google.com"><mat-icon style="color: #e00201;font-size: 60px !important;width:inherit !important;">picture_as_pdf</mat-icon> <span class="d-block">version_111</span></a> fxFlex.xl="25">
<a href="http://www.google.com">
<mat-icon style="color: #e00201;font-size: 60px !important;width:inherit !important;">picture_as_pdf</mat-icon>
<span class="d-block">version_111</span>
</a>
</div> </div>
<div class="text-center mb-2 hover-icon" fxFlex.xs="50" fxFlex.sm="50" fxFlex.md="25" fxFlex.lg="25" fxFlex.xl="25"> <div class="text-center mb-2 hover-icon" fxFlex.xs="50" fxFlex.sm="50" fxFlex.md="25" fxFlex.lg="25"
<a href="http://www.google.com"><mat-icon style="color: #e00201;font-size: 60px !important;width:inherit !important;">picture_as_pdf</mat-icon> <span class="d-block">version_111</span></a> fxFlex.xl="25">
<a href="http://www.google.com">
<mat-icon style="color: #e00201;font-size: 60px !important;width:inherit !important;">picture_as_pdf</mat-icon>
<span class="d-block">version_111</span>
</a>
</div> </div>
<div class="text-center mb-2 hover-icon" fxFlex.xs="50" fxFlex.sm="50" fxFlex.md="25" fxFlex.lg="25" fxFlex.xl="25"> <div class="text-center mb-2 hover-icon" fxFlex.xs="50" fxFlex.sm="50" fxFlex.md="25" fxFlex.lg="25"
<a href="http://www.google.com"><mat-icon style="color: #e00201;font-size: 60px !important;width:inherit !important;">picture_as_pdf</mat-icon> <span class="d-block">version_111</span></a> fxFlex.xl="25">
<a href="http://www.google.com">
<mat-icon style="color: #e00201;font-size: 60px !important;width:inherit !important;">picture_as_pdf</mat-icon>
<span class="d-block">version_111</span>
</a>
</div> </div>
<div class="text-center mb-2 hover-icon" fxFlex.xs="50" fxFlex.sm="50" fxFlex.md="20" fxFlex.lg="20" fxFlex.xl="20"> <div class="text-center mb-2 hover-icon" fxFlex.xs="50" fxFlex.sm="50" fxFlex.md="20" fxFlex.lg="20"
<a href="http://www.google.com"><mat-icon style="color: #e00201;font-size: 60px !important;width:inherit !important;">picture_as_pdf</mat-icon> <span class="d-block">version_111</span></a> fxFlex.xl="20">
<a href="http://www.google.com">
<mat-icon style="color: #e00201;font-size: 60px !important;width:inherit !important;">picture_as_pdf</mat-icon>
<span class="d-block">version_111</span>
</a>
</div> </div>
<div class="text-center mb-2 hover-icon" fxFlex.xs="50" fxFlex.sm="50" fxFlex.md="20" fxFlex.lg="20" fxFlex.xl="20"> <div class="text-center mb-2 hover-icon" fxFlex.xs="50" fxFlex.sm="50" fxFlex.md="20" fxFlex.lg="20"
<a href="http://www.google.com"><mat-icon style="color: #e00201;font-size: 60px !important;width:inherit !important;">picture_as_pdf</mat-icon> <span class="d-block">version_111</span></a> fxFlex.xl="20">
<a href="http://www.google.com">
<mat-icon style="color: #e00201;font-size: 60px !important;width:inherit !important;">picture_as_pdf</mat-icon>
<span class="d-block">version_111</span>
</a>
</div> </div>
</div> </div>
</div> </div>
@ -616,7 +710,10 @@
</div> </div>
<div fxFlex="40" align="end"> <div fxFlex="40" align="end">
<!-- <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Reset" matTooltipPosition="above" (click)="onReset(); false"><mat-icon>settings_backup_restore</mat-icon></button> --> <!-- <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Reset" matTooltipPosition="above" (click)="onReset(); false"><mat-icon>settings_backup_restore</mat-icon></button> -->
<button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Save" matTooltipPosition="above" type="submit"><mat-icon>save</mat-icon></button> <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Save" matTooltipPosition="above"
type="submit">
<mat-icon>save</mat-icon>
</button>
</div> </div>
</mat-dialog-actions> </mat-dialog-actions>
</form> </form>

View File

@ -31,23 +31,14 @@ export class BusinessAssetsInfoComponent implements OnInit {
// businessEmiAmtFlag : boolean = false; // businessEmiAmtFlag : boolean = false;
public m_any_asset_loan_type = [{ 'value': "yes", 'viewValue': "Yes" }, public m_any_asset_loan_type = [{ 'value': "yes", 'viewValue': "Yes" },
{'value': "no",'viewValue': "No"}, { 'value': "no", 'viewValue': "No" }]
]
appxMarketAmtInwords: any = []; appxMarketAmtInwords: any = [];
appxMarketAmtInwords2:any=[]; appxMarketAmtInwordsForAddress: any = [];
// emiAmtInwords : any = []; // AssetValueInwords: any = [];
// PremiumPaidInwords : any = [];
// SumAssuredInwords: any = [];
// AmtInvestInwords: any = [];
AssetValueInwords: any = [];
// B_emiAmtInwords: any = [];
RentAmtInwords: any = []; RentAmtInwords: any = [];
RentAmtInwords2:any=[]; RentAmtInwordsForAddress: any = [];
public m_propertyType = []; public m_propertyType = [];
PropertyOwnedType: any = []; PropertyOwnedType: any = [];
// public m_investmentType = [];
// public m_freqOfPurchase = [];
private notifier: NotifierService; private notifier: NotifierService;
existCompanyList: any = []; existCompanyList: any = [];
mergeCompanyApplicant: any = []; mergeCompanyApplicant: any = [];
@ -55,11 +46,14 @@ export class BusinessAssetsInfoComponent implements OnInit {
addressLabel: any; addressLabel: any;
public m_address_type = []; public m_address_type = [];
public m_vehicle_type = []; public m_vehicle_type = [];
endUserList = [];
CustSegAbbr: any; CustSegAbbr: any;
generalExistBusinessYear: Number; generalExistBusinessYear: Number;
generalExistBusinessMonth: Number; generalExistBusinessMonth: Number;
yearErrorMessage: any; yearErrorMessage: any;
monthErrorMessage: any; monthErrorMessage: any;
isOtherOwnerForAddress : boolean = false;
isOtherOwner: boolean = false;
public viewerOptions: any = { public viewerOptions: any = {
navbar: false, navbar: false,
@ -135,8 +129,6 @@ export class BusinessAssetsInfoComponent implements OnInit {
this.getPdSupplierFormDetails(); this.getPdSupplierFormDetails();
this.getM_Assets_Type(); this.getM_Assets_Type();
this.getM_PropertyType(); this.getM_PropertyType();
// this.getM_InvestmentType();
// this.getM_FreqOfPurchase();
this.getM_Address_Type(); this.getM_Address_Type();
this.getM_Vehicle_Type(); this.getM_Vehicle_Type();
@ -218,7 +210,6 @@ export class BusinessAssetsInfoComponent implements OnInit {
// if(this.CustSegAbbr == 'SENP' || this.CustSegAbbr == 'SEP'){ // if(this.CustSegAbbr == 'SENP' || this.CustSegAbbr == 'SEP'){
// let index1 = this.m_address_type.map(data => data.address_type).indexOf("Residence"); // let index1 = this.m_address_type.map(data => data.address_type).indexOf("Residence");
// this.m_address_type.splice(index1, 1); // this.m_address_type.splice(index1, 1);
@ -457,7 +448,7 @@ export class BusinessAssetsInfoComponent implements OnInit {
otherBusinessAssetsDescription() { otherBusinessAssetsDescription() {
return this._formBuilder.group({ return this._formBuilder.group({
any_other_assets: [''], any_other_assets: [''],
any_other_asset_value : [''], // any_other_asset_value: [''],
any_other_asset_loan: [''], any_other_asset_loan: [''],
}); });
} }
@ -527,7 +518,7 @@ export class BusinessAssetsInfoComponent implements OnInit {
otherBusinessAssetsDescriptionWithData(data) { otherBusinessAssetsDescriptionWithData(data) {
return this._formBuilder.group({ return this._formBuilder.group({
any_other_assets: [data.any_other_assets], any_other_assets: [data.any_other_assets],
any_other_asset_value : [data.any_other_asset_value], // any_other_asset_value: [data.any_other_asset_value],
any_other_asset_loan: [data.any_other_asset_loan], any_other_asset_loan: [data.any_other_asset_loan],
}); });
} }
@ -617,8 +608,18 @@ export class BusinessAssetsInfoComponent implements OnInit {
}); });
if (result.length > 0) { if (result.length > 0) {
result.forEach((datas, index) => { result.forEach((datas, index) => {
this.RentAmtInwords2[index] = this.pdTrigerService.convertNumberToWords(datas.business_monthly_rented_amt); this.RentAmtInwordsForAddress[index] = this.pdTrigerService.convertNumberToWords(datas.business_monthly_rented_amt);
this.appxMarketAmtInwords2[index] = this.pdTrigerService.convertNumberToWords(datas.business_approximate_market_value); this.appxMarketAmtInwordsForAddress[index] = this.pdTrigerService.convertNumberToWords(datas.business_approximate_market_value);
let Avaliablity = 1;
// console.log(datas.business_name_of_the_owner);
if(datas.business_name_of_the_owner.length > 0){
datas.business_name_of_the_owner.forEach(option => {
if(option.id == 0 && option.group_id == 2){
Avaliablity = option.id;
}
});
}
this.isOtherOwnerForAddress = Avaliablity == 0 ? true : false;
}); });
for (let val of result) { for (let val of result) {
@ -675,6 +676,16 @@ export class BusinessAssetsInfoComponent implements OnInit {
result.forEach((datas, index) => { result.forEach((datas, index) => {
this.appxMarketAmtInwords[index] = this.pdTrigerService.convertNumberToWords(+datas.business_approximate_market_value); this.appxMarketAmtInwords[index] = this.pdTrigerService.convertNumberToWords(+datas.business_approximate_market_value);
this.RentAmtInwords[index] = this.pdTrigerService.convertNumberToWords(+datas.business_monthly_rented_amt); this.RentAmtInwords[index] = this.pdTrigerService.convertNumberToWords(+datas.business_monthly_rented_amt);
let Avaliablity = 1;
// console.log(datas.business_name_of_the_owner);
// datas.business_name_of_the_owner.forEach(option => {
// if(option.id == 0 && option.group_id == 2){
// Avaliablity = option.id;
// }
// });
this.isOtherOwner = Avaliablity == 0 ? true : false;
// .business_assets_details['controls']
// this.setRequiredValidation(datas.business_name_of_the_owner, item, 4);
}); });
for (let val of result) { for (let val of result) {
@ -780,10 +791,10 @@ export class BusinessAssetsInfoComponent implements OnInit {
case '1': { case '1': {
let array_datas: any; let array_datas: any;
data.forEach((datas, i) => { data.forEach((datas, i) => {
this.AssetValueInwords[i] = this.pdTrigerService.convertNumberToWords(+data.any_other_asset_value); // this.AssetValueInwords[i] = this.pdTrigerService.convertNumberToWords(+data.any_other_asset_value);
array_datas = { array_datas = {
'any_other_assets': datas.any_other_assets, 'any_other_assets': datas.any_other_assets,
'any_other_asset_value' : datas.any_other_asset_value, // 'any_other_asset_value': datas.any_other_asset_value,
'any_other_asset_loan': datas.any_other_asset_loan, 'any_other_asset_loan': datas.any_other_asset_loan,
}; };
}); });
@ -831,25 +842,25 @@ export class BusinessAssetsInfoComponent implements OnInit {
} }
// // check others // // check others
checkOthers(values){ // checkOthers(values) {
if(values!=null) { // if (values != null) {
return values.id==0 ? true : false; // return values.id == 0 ? true : false;
} // }
else { // else {
return false; // return false;
} // }
} // }
checkOthers2(values){ // checkOthers2(values) {
if(values!=null) { // if (values != null) {
return values.id==0 ? true : false; // return values.id == 0 ? true : false;
} // }
else { // else {
return false; // return false;
} // }
} // }
// calculate vintage and purchase {} // calculate vintage and purchase {}
calculateVintagePurchase(value: any, controlKey: any, type: number) { calculateVintagePurchase(value: any, controlKey: any, type: number) {
@ -883,6 +894,14 @@ export class BusinessAssetsInfoComponent implements OnInit {
return; return;
} else { } else {
var answerFormValues = this._businessAssetsQuesFrom.value; var answerFormValues = this._businessAssetsQuesFrom.value;
let dataOwner_name = [];
// console.log('answerFormValues',answerFormValues);
// this.loanDetailsForm.controls['owner_name'].value.forEach(element => {
// dataOwner_name.push({ owner_name: element })
// });
// records.owner_name_group = dataOwner_name;
//To Remove The "Null" With Key also //To Remove The "Null" With Key also
Object.keys(answerFormValues).forEach((key) => (answerFormValues[key] == null) && delete answerFormValues[key]); Object.keys(answerFormValues).forEach((key) => (answerFormValues[key] == null) && delete answerFormValues[key]);
// Save the data with help of Service // Save the data with help of Service
@ -949,8 +968,7 @@ export class BusinessAssetsInfoComponent implements OnInit {
} }
else { else {
if(Year == this.generalExistBusinessYear && +converted_month > this.generalExistBusinessMonth) if (Year == this.generalExistBusinessYear && +converted_month > this.generalExistBusinessMonth) {
{
this.monthErrorMessage = "Higher than Business Vintage"; this.monthErrorMessage = "Higher than Business Vintage";
this._businessAssetsQuesFrom.controls.business_years.setValue(''); this._businessAssetsQuesFrom.controls.business_years.setValue('');
this._businessAssetsQuesFrom.controls.business_month.setValue(''); this._businessAssetsQuesFrom.controls.business_month.setValue('');
@ -979,9 +997,9 @@ export class BusinessAssetsInfoComponent implements OnInit {
setRequiredValidation(value, item, flag) { setRequiredValidation(value, item, flag) {
if (flag == 1) { if (flag == 1) {
if(value == 'yes') if (value == 'yes') {
{ this._businessAssetsQuesFrom.controls.business_years.setValidators([Validators.required]) ; this._businessAssetsQuesFrom.controls.business_years.setValidators([Validators.required]);
this._businessAssetsQuesFrom.controls.business_month.setValidators([Validators.required]) ;
this._businessAssetsQuesFrom.controls.business_address_availability.setValidators([Validators.required]); this._businessAssetsQuesFrom.controls.business_address_availability.setValidators([Validators.required]);
// this._businessAssetsQuesFrom.controls.business_activity.setValidators([Validators.required]) ; // this._businessAssetsQuesFrom.controls.business_activity.setValidators([Validators.required]) ;
this._businessAssetsQuesFrom.controls.business_is_pd_visited.setValidators([Validators.required]); this._businessAssetsQuesFrom.controls.business_is_pd_visited.setValidators([Validators.required]);
@ -990,7 +1008,7 @@ export class BusinessAssetsInfoComponent implements OnInit {
} }
else { else {
this._businessAssetsQuesFrom.controls.business_years.clearValidators(); this._businessAssetsQuesFrom.controls.business_years.clearValidators();
this._businessAssetsQuesFrom.controls.business_month.clearValidators();
this._businessAssetsQuesFrom.controls.business_address_availability.clearValidators(); this._businessAssetsQuesFrom.controls.business_address_availability.clearValidators();
// this._businessAssetsQuesFrom.controls.business_activity.clearValidators(); // this._businessAssetsQuesFrom.controls.business_activity.clearValidators();
this._businessAssetsQuesFrom.controls.business_is_pd_visited.clearValidators(); this._businessAssetsQuesFrom.controls.business_is_pd_visited.clearValidators();
@ -998,7 +1016,7 @@ export class BusinessAssetsInfoComponent implements OnInit {
// this._businessAssetsQuesFrom.controls.business_activity.clearValidators(); // this._businessAssetsQuesFrom.controls.business_activity.clearValidators();
} }
this._businessAssetsQuesFrom.controls.business_years.updateValueAndValidity(); this._businessAssetsQuesFrom.controls.business_years.updateValueAndValidity();
this._businessAssetsQuesFrom.controls.business_month.updateValueAndValidity();
this._businessAssetsQuesFrom.controls.business_address_availability.updateValueAndValidity(); this._businessAssetsQuesFrom.controls.business_address_availability.updateValueAndValidity();
// this._businessAssetsQuesFrom.controls.business_activity.updateValueAndValidity(); // this._businessAssetsQuesFrom.controls.business_activity.updateValueAndValidity();
this._businessAssetsQuesFrom.controls.business_is_pd_visited.updateValueAndValidity(); this._businessAssetsQuesFrom.controls.business_is_pd_visited.updateValueAndValidity();
@ -1026,10 +1044,29 @@ export class BusinessAssetsInfoComponent implements OnInit {
item.controls.business_name_of_the_owner.updateValueAndValidity(); item.controls.business_name_of_the_owner.updateValueAndValidity();
} }
if (flag == 4) { if (flag == 4) {
value==0 let Avaliablity = 1;
? item.controls.business_name_of_the_other_owner.setValidators([Validators.required]) value.forEach(option => {
: item.controls.business_name_of_the_other_owner.clearValidators(); if(option.id == 0 && option.group_id == 2){
Avaliablity = option.id;
}
});
if(Avaliablity == 0){
item.controls.business_name_of_the_other_owner.setValidators([Validators.required]);
this.isOtherOwner = true;
}else{
item.controls.business_name_of_the_other_owner.setValue('');
item.controls.business_name_of_the_other_owner.clearValidators();
this.isOtherOwner = false;
}
item.controls.business_name_of_the_other_owner.updateValueAndValidity(); item.controls.business_name_of_the_other_owner.updateValueAndValidity();
// value == 0
// ? item.controls.business_name_of_the_other_owner.setValidators([Validators.required])
// : item.controls.business_name_of_the_other_owner.clearValidators();
// item.controls.business_name_of_the_other_owner.updateValueAndValidity();
} }
if (flag == 5) { if (flag == 5) {
value == 1 value == 1
@ -1042,6 +1079,11 @@ export class BusinessAssetsInfoComponent implements OnInit {
? item.controls.other_property_type.setValidators([Validators.required]) ? item.controls.other_property_type.setValidators([Validators.required])
: item.controls.other_property_type.clearValidators(); : item.controls.other_property_type.clearValidators();
item.controls.other_property_type.updateValueAndValidity(); item.controls.other_property_type.updateValueAndValidity();
value != ''
? item.controls.address_of_the_property.setValidators([Validators.required])
: item.controls.address_of_the_property.clearValidators();
item.controls.address_of_the_property.updateValueAndValidity();
} }
if (flag == 7) { if (flag == 7) {
if (value == 'owned') { if (value == 'owned') {
@ -1056,14 +1098,57 @@ export class BusinessAssetsInfoComponent implements OnInit {
item.controls.business_name_of_the_owner.updateValueAndValidity(); item.controls.business_name_of_the_owner.updateValueAndValidity();
} }
if(flag == 8){ if(flag == 8){
value==0 let Avaliablity = 1;
? item.controls.business_name_of_the_other_owner.setValidators([Validators.required]) value.forEach(option => {
: item.controls.business_name_of_the_other_owner.clearValidators(); if(option.id == 0 && option.group_id == 2){
// console.log('true');
Avaliablity = option.id;
}
});
// isOtherOwner: boolean = false;
if(Avaliablity == 0){
// console.log(Avaliablity);
item.controls.business_name_of_the_other_owner.setValidators([Validators.required]);
this.isOtherOwnerForAddress = true;
}else{
// console.log(Avaliablity);
item.controls.business_name_of_the_other_owner.setValue('');
item.controls.business_name_of_the_other_owner.clearValidators();
this.isOtherOwnerForAddress = false;
}
item.controls.business_name_of_the_other_owner.updateValueAndValidity(); item.controls.business_name_of_the_other_owner.updateValueAndValidity();
} }
} }
// endUserChange(event) {
// this.endUserList = [];
//
// event.forEach(option => {
// // let othersData = this.m_endUseofLoad.filter(sub=>sub.subproduct_id==option)[0];
// let othersData = this.m_endUseForLoan.filter(sub => sub.enduse_of_loan_id == option)[0];
// OthersAvaliable = othersData.enduse_of_loan.substr(0, 6).toLowerCase();
// this.endUserList.push({ end_use: option });
// });
// if (OthersAvaliable == 'others') {
// this.isOtherPurpose = true;
// this.loanDetailsForm.controls['end_use_other'].setValidators([Validators.required]);
// } else {
// this.loanDetailsForm.controls['end_use_other'].clearValidators();
// this.isOtherPurpose = false;
// }
// this.loanDetailsForm.controls['end_use_other'].updateValueAndValidity();
// //this.isOtherPurpose = event.some(e => e == 'others') // this return true or false Only;
// }
// addUnits() { // addUnits() {
// const control = <FormArray>this._businessAssetsQuesFrom.controls['business_premises_additional_units']; // const control = <FormArray>this._businessAssetsQuesFrom.controls['business_premises_additional_units'];
// control.push(this.createUnits()); // control.push(this.createUnits());
@ -1096,9 +1181,9 @@ if(flag == 8){
// case 5 : // case 5 :
// this.AmtInvestInwords[i] = this.pdTrigerService.convertNumberToWords(e.target.value); // this.AmtInvestInwords[i] = this.pdTrigerService.convertNumberToWords(e.target.value);
// break; // break;
case 6 : // case 6:
this.AssetValueInwords[i] = this.pdTrigerService.convertNumberToWords(e.target.value); // this.AssetValueInwords[i] = this.pdTrigerService.convertNumberToWords(e.target.value);
break; // break;
// case 7 : // case 7 :
// this.B_emiAmtInwords[i] = this.pdTrigerService.convertNumberToWords(e.target.value); // this.B_emiAmtInwords[i] = this.pdTrigerService.convertNumberToWords(e.target.value);
// break; // break;
@ -1106,10 +1191,10 @@ if(flag == 8){
this.RentAmtInwords[i] = this.pdTrigerService.convertNumberToWords(e.target.value); this.RentAmtInwords[i] = this.pdTrigerService.convertNumberToWords(e.target.value);
break; break;
case 9: case 9:
this.RentAmtInwords2[i] = this.pdTrigerService.convertNumberToWords(e.target.value); this.RentAmtInwordsForAddress[i] = this.pdTrigerService.convertNumberToWords(e.target.value);
break; break;
case 10: case 10:
this.appxMarketAmtInwords2[i] = this.pdTrigerService.convertNumberToWords(e.target.value); this.appxMarketAmtInwordsForAddress[i] = this.pdTrigerService.convertNumberToWords(e.target.value);
break; break;
default: default:
break; break;
@ -1118,3 +1203,21 @@ if(flag == 8){
} }
} }
// let ownername: any = [];
// if (value.records.owner_name_group != null) {
// let owner = Object.keys(value.records.owner_name_group).map(function (key) {
// return value.records.owner_name_group[key];
// });
// owner.forEach(val => {
// ownername.push(val.business_name_of_the_owner);
// if (val.business_name_of_the_owner == 'Others') {
// this.OtherOwnerFlag = true;
// }
// else {
// this.OtherOwnerFlag = false;
// }
// });
// }
// this.loanDetailsForm.controls['business_name_of_the_owner'].setValue(owner);

View File

@ -97,7 +97,7 @@ export class BusinessBankingDetailsComponent implements OnInit {
this.initBankingForm(); this.initBankingForm();
this._pd.getCompaniesListsForBusiness(this.pdid).subscribe(data=>{ this._pd.getCompaniesListsForBusiness(this.pdid).subscribe(data=>{
if(data.dataStatus){ if(data.dataStatus){
this.existCompanyList = data.records.filter(val =>val.is_active===true && val.is_company_applicant===true && val.company_order_id==this.company_id); this.existCompanyList = data.records.filter(val =>val.is_active===true);/* && val.is_company_applicant===true && val.company_order_id==this.company_id */
} }
let modifyCompanyList : any=[]; let modifyCompanyList : any=[];

View File

@ -647,17 +647,17 @@ export class BusinessInfoComponent implements OnInit {
// businees activity type change event // businees activity type change event
changeBusinessActivity(event: any){ changeBusinessActivity(event: any){
// console.log('changeBusinessActivity');
if(event.value.exist_status==true && event.value.type_of_activity_id==2){ if(event.value.exist_status==true && event.value.type_of_activity_id==2){
// console.log('changeBusinessActivity 1');
this.ManufacturingChecked = event.value.exist_status; this.ManufacturingChecked = event.value.exist_status;
let manufacturingControl = <FormArray>this.businessForm.controls['manufacturing_activity_details']; let manufacturingControl = <FormArray>this.businessForm.controls['manufacturing_activity_details'];
manufacturingControl.controls = []; manufacturingControl.controls = [];
manufacturingControl.setValue([]); manufacturingControl.setValue([]);
} }
else if(event.value.exist_status==false && event.value.type_of_activity_id==2){ else if(event.value.exist_status==false && event.value.type_of_activity_id==2){
// console.log('changeBusinessActivity 2');
this.ManufacturingChecked = event.value.exist_status; this.ManufacturingChecked = event.value.exist_status;
let manufacturingControl = <FormArray>this.businessForm.controls['manufacturing_activity_details']; let manufacturingControl = <FormArray>this.businessForm.controls['manufacturing_activity_details'];
manufacturingControl.push(this.createActivity()); manufacturingControl.push(this.createActivity());
@ -665,40 +665,40 @@ export class BusinessInfoComponent implements OnInit {
} }
if(event.value.exist_status==true && event.value.type_of_activity_id==3){ if(event.value.exist_status==true && event.value.type_of_activity_id==3){
// console.log('changeBusinessActivity 3');
this.RetailedChecked = event.value.exist_status; this.RetailedChecked = event.value.exist_status;
let retailControl = <FormArray>this.businessForm.controls['retail_trading_activity_details']; let retailControl = <FormArray>this.businessForm.controls['retail_trading_activity_details'];
retailControl.controls = []; retailControl.controls = [];
retailControl.setValue([]); retailControl.setValue([]);
} }
else if(event.value.exist_status==false && event.value.type_of_activity_id==3){ else if(event.value.exist_status==false && event.value.type_of_activity_id==3){
// console.log('changeBusinessActivity 4');
this.RetailedChecked = event.value.exist_status; this.RetailedChecked = event.value.exist_status;
let retailControl = <FormArray>this.businessForm.controls['retail_trading_activity_details']; let retailControl = <FormArray>this.businessForm.controls['retail_trading_activity_details'];
retailControl.push(this.createActivity()); retailControl.push(this.createActivity());
} }
if(event.value.exist_status==true && event.value.type_of_activity_id==4){ if(event.value.exist_status==true && event.value.type_of_activity_id==4){
// console.log('changeBusinessActivity 5');
this.WholeSalesChecked = event.value.exist_status; this.WholeSalesChecked = event.value.exist_status;
let wholesaleControl = <FormArray>this.businessForm.controls['wholesale_trading_activity_details']; let wholesaleControl = <FormArray>this.businessForm.controls['wholesale_trading_activity_details'];
wholesaleControl.controls = []; wholesaleControl.controls = [];
wholesaleControl.setValue([]); wholesaleControl.setValue([]);
} }
else if(event.value.exist_status==false && event.value.type_of_activity_id==4){ else if(event.value.exist_status==false && event.value.type_of_activity_id==4){
// console.log('changeBusinessActivity 6');
this.WholeSalesChecked = event.value.exist_status; this.WholeSalesChecked = event.value.exist_status;
let wholesaleControl = <FormArray>this.businessForm.controls['wholesale_trading_activity_details']; let wholesaleControl = <FormArray>this.businessForm.controls['wholesale_trading_activity_details'];
wholesaleControl.push(this.createActivity()); wholesaleControl.push(this.createActivity());
} }
if(event.value.exist_status==true && event.value.type_of_activity_id==5){ if(event.value.exist_status==true && event.value.type_of_activity_id==5){
// console.log('changeBusinessActivity 7');
this.ServiceChecked = event.value.exist_status; this.ServiceChecked = event.value.exist_status;
let serviceControl = <FormArray>this.businessForm.controls['service_provider_activity_details']; let serviceControl = <FormArray>this.businessForm.controls['service_provider_activity_details'];
serviceControl.controls = []; serviceControl.controls = [];
serviceControl.setValue([]); serviceControl.setValue([]);
} }
else if(event.value.exist_status==false && event.value.type_of_activity_id==5){ else if(event.value.exist_status==false && event.value.type_of_activity_id==5){
// console.log('changeBusinessActivity 8');
this.ServiceChecked = event.value.exist_status; this.ServiceChecked = event.value.exist_status;
let serviceControl = <FormArray>this.businessForm.controls['service_provider_activity_details']; let serviceControl = <FormArray>this.businessForm.controls['service_provider_activity_details'];
serviceControl.push(this.createServiceActivity()); serviceControl.push(this.createServiceActivity());
@ -1157,9 +1157,7 @@ export class BusinessInfoComponent implements OnInit {
this.businessEntityTypeList.business_entity_type_name = filterList[0].business_entity_type_id!=1 ? filterList[0].business_entity_type_name : this.generalExistEntityType_other; this.businessEntityTypeList.business_entity_type_name = filterList[0].business_entity_type_id!=1 ? filterList[0].business_entity_type_name : this.generalExistEntityType_other;
this.businessEntityTypeList.section_label = filterList[0].business_entity_type_id!=1 ? filterList[0].section_label : this.generalExistEntityType_other; this.businessEntityTypeList.section_label = filterList[0].business_entity_type_id!=1 ? filterList[0].section_label : this.generalExistEntityType_other;
// console.log(this.businessEntityTypeList.business_entity_type_id+' , '+this.businessEntityTypeList.business_entity_type_name+' , '+this.businessEntityTypeList.section_label);
// console.log(this.businessForm.controls.partners['controls']);
// console.log(this.businessForm.controls.partners['controls'].length);
// if(this.businessForm.controls.partners['controls'].length > 1) // if(this.businessForm.controls.partners['controls'].length > 1)
// { // {
// console.log('asd'); // console.log('asd');
@ -1317,9 +1315,7 @@ export class BusinessInfoComponent implements OnInit {
// Out of Total Export Sales what % of Sales is done in Albania? // Out of Total Export Sales what % of Sales is done in Albania?
getPlaceHolderName(id){ getPlaceHolderName(id){
let name = this.countryDataList.filter(value=>value.country_id == id); let name = this.countryDataList.filter(value=>value.country_id == id);
// console.log(name);
// console.log(name[0].country_name);
// console.log(id);
return 'Out of Total Export Sales what % of Sales is done in '+ name[0].country_name +' ?'; return 'Out of Total Export Sales what % of Sales is done in '+ name[0].country_name +' ?';
// return name[0].country_name +'?'; // return name[0].country_name +'?';
} }
@ -1386,20 +1382,11 @@ export class BusinessInfoComponent implements OnInit {
/** /**
* This Function For validate For Appx. sale based on Type OF Activities * This Function For validate For Appx. sale based on Type OF Activities
*/ */
// validateAppxSales(records){ // validateAppxSales(records){}
// //console.log(records.manufacturing_activity_details.length);
// //this Variable For Validation
// }
submitDetails() { submitDetails() {
// let family: any = []; // let family: any = [];
// console.log(this.businessForm.value);
if(this.EntityTypeFlag == true){ if(this.EntityTypeFlag == true){
let control: any = <FormArray>this.businessForm.controls['partners']; let control: any = <FormArray>this.businessForm.controls['partners'];
@ -1441,7 +1428,7 @@ export class BusinessInfoComponent implements OnInit {
} }
// let design: any; // let design: any;
let records = this.businessForm.value; let records = this.businessForm.value;
// console.log(records);
//to check the Appx. sale validation. //to check the Appx. sale validation.
// this.validateAppxSales(records); // this.validateAppxSales(records);
@ -1459,8 +1446,8 @@ export class BusinessInfoComponent implements OnInit {
let validationFlag : number = 0; let validationFlag : number = 0;
// let shareHoldValidationFlag : number = 0; // let shareHoldValidationFlag : number = 0;
// console.log(records.partners.length);
// console.log(records.partners);
if(records.partners.length > 0){ if(records.partners.length > 0){
let total = records.partners.map(shares => shares.shareholding).reduce((a, b) => a + +b, 0); let total = records.partners.map(shares => shares.shareholding).reduce((a, b) => a + +b, 0);
@ -1624,7 +1611,7 @@ export class BusinessInfoComponent implements OnInit {
}); });
let merged = [].concat.apply([], setCityFilter); let merged = [].concat.apply([], setCityFilter);
// console.log(merged)
if(merged.length>0){ if(merged.length>0){
let check: any = merged.filter(function(fVal){ let check: any = merged.filter(function(fVal){
return existCities.some(function(sVal){ return existCities.some(function(sVal){
@ -1698,9 +1685,7 @@ export class BusinessInfoComponent implements OnInit {
} }
// flag: number = 0; // flag: number = 0;
// CheckExport(e,val){ // CheckExport(e,val){
// console.log(e);
// console.log(val);
// console.log(this.)
// if(val == 1){ // if(val == 1){
// e != "Within India" ? // e != "Within India" ?
// this.flag++ :this.flag--; // this.flag++ :this.flag--;
@ -1746,13 +1731,13 @@ export class BusinessInfoComponent implements OnInit {
// // this.counterForExportCart--; // // this.counterForExportCart--;
// } // }
// // this.ExportFlag = this.counterForExportCart == 1 ? true : false ; // // this.ExportFlag = this.counterForExportCart == 1 ? true : false ;
// console.log('this.domesticCounter : ',this.domesticCounter,', this.foreignCounter : ',this.foreignCounter);
// if(this.domesticCounter == 0 && this.foreignCounter == 0){ // if(this.domesticCounter == 0 && this.foreignCounter == 0){
// this.ExportFlag = false; // this.ExportFlag = false;
// }else if(this.foreignCounter >= 0) { // }else if(this.foreignCounter >= 0) {
// this.ExportFlag = true; // this.ExportFlag = true;
// } // }
// console.log('Cuurent Flag Status : ',this.ExportFlag );
// } // }
ManufacturingCounterArray: any = []; ManufacturingCounterArray: any = [];
@ -1763,23 +1748,20 @@ ServiceCounterArray: any = [];
CheckExport(value,stringFlag,index){ CheckExport(value,stringFlag,index){
const parentControl = <FormArray>this.businessForm.controls['select_business_activity_type']; const parentControl = <FormArray>this.businessForm.controls['select_business_activity_type'];
const childControl = <FormArray>parentControl.controls[0]; const childControl = <FormArray>parentControl.controls[0];
// console.log('parentControl',parentControl);
// console.log('parentControl.controls',parentControl.controls);
// console.log('childControl',childControl.value);
// console.log('childControl',childControl.value.exist_status);
// childControl.forEach((datas,index) => { // childControl.forEach((datas,index) => {
// console.log(datas);
// // exist_status==true && event.value.type_of_activity_id // // exist_status==true && event.value.type_of_activity_id
// console.log(datas[index].);
// console.log(datas[index].controls.exist_status.value);
// }); // });
// console.log('CheckExport');
// console.log(value,stringFlag,index);
// console.log(this.ManufacturingChecked , this.RetailedChecked , this.WholeSalesChecked , this.ServiceChecked);
if(!this.ManufacturingChecked){ if(!this.ManufacturingChecked){
if(stringFlag == 'MActivity' && value != "Within India"){ if(stringFlag == 'MActivity' && value != "Within India"){
@ -1831,20 +1813,19 @@ CheckExport(value,stringFlag,index){
} }
let SumOfManufacturingCounter = this.ManufacturingCounterArray.reduce((sum, val) => sum + +val, 0); let SumOfManufacturingCounter = this.ManufacturingCounterArray.reduce((sum, val) => sum + +val, 0);
// console.log(SumOfManufacturingCounter,this.ManufacturingCounterArray);
let SumOfRetailCounter = this.RetailCounterArray.reduce((sum, val) => sum + +val, 0); let SumOfRetailCounter = this.RetailCounterArray.reduce((sum, val) => sum + +val, 0);
// console.log(SumOfRetailCounter , this.RetailCounterArray);
let SumOfWholeSaleCounter = this.WholeSaleCounterArray.reduce((sum, val) => sum + +val, 0); let SumOfWholeSaleCounter = this.WholeSaleCounterArray.reduce((sum, val) => sum + +val, 0);
// console.log(SumOfWholeSaleCounter,this.WholeSaleCounterArray);
let SumOfServiceCounter = this.ServiceCounterArray.reduce((sum, val) => sum + +val, 0); let SumOfServiceCounter = this.ServiceCounterArray.reduce((sum, val) => sum + +val, 0);
// console.log(SumOfServiceCounter,this.ServiceCounterArray);
let overallCounter = SumOfManufacturingCounter + SumOfRetailCounter + SumOfWholeSaleCounter + SumOfServiceCounter ; let overallCounter = SumOfManufacturingCounter + SumOfRetailCounter + SumOfWholeSaleCounter + SumOfServiceCounter ;
this.ExportFlag = overallCounter > 0 ? true : false ; this.ExportFlag = overallCounter > 0 ? true : false ;
// console.log('overallCounter , SumOfManufacturingCounter , SumOfRetailCounter , SumOfWholeSaleCounter , SumOfServiceCounter ' , overallCounter , SumOfManufacturingCounter , SumOfRetailCounter , SumOfWholeSaleCounter , SumOfServiceCounter);
// console.log('Current Flag Status : ',this.ExportFlag );
} }
inWords(e,flag){ inWords(e,flag){

View File

@ -5,11 +5,15 @@
{{pageTitle}} {{pageTitle}}
</div> </div>
<div fxFlex="30" align="end" style="padding: 10px !important;"> <div fxFlex="30" align="end" style="padding: 10px !important;">
<button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Close" matTooltipPosition="right" (click)="closeDialogue()"><mat-icon>close</mat-icon></button> <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Close"
matTooltipPosition="right" (click)="closeDialogue()">
<mat-icon>close</mat-icon>
</button>
</div> </div>
</h2> </h2>
<mat-dialog-content formArrayName="applicant_list"> <mat-dialog-content formArrayName="applicant_list">
<mat-card *ngFor="let applicant of _OtherForm.controls.applicant_list['controls']; let r = index;" [formGroupName]="r"> <mat-card *ngFor="let applicant of _OtherForm.controls.applicant_list['controls']; let r = index;"
[formGroupName]="r">
<mat-card-content> <mat-card-content>
<mat-form-field style="width: 30%"> <mat-form-field style="width: 30%">
<mat-select placeholder="Title" formControlName="applicant_title_name" required> <mat-select placeholder="Title" formControlName="applicant_title_name" required>
@ -22,30 +26,33 @@
<input matInput placeholder="Name" formControlName="applicant_name" type="text" required> <input matInput placeholder="Name" formControlName="applicant_name" type="text" required>
</mat-form-field> </mat-form-field>
<mat-form-field style="width: 30%"> <mat-form-field style="width: 30%">
<input matInput placeholder="Age" formControlName="age" minlength="1" maxlength="3" (keypress)="keyPress($event)" autocomplete="off"> <input matInput placeholder="Age" formControlName="age" minlength="1" maxlength="3" (keypress)="keyPress($event)"
autocomplete="off">
</mat-form-field> </mat-form-field>
<mat-form-field style="width: 60%"> <mat-form-field style="width: 60%">
<mat-select placeholder="Qualification" formControlName="qualification" style="width: 75%;"> <mat-select placeholder="Qualification" formControlName="qualification" style="width: 75%;">
<mat-option *ngFor="let qual of qualificationList" [value]="qual.qualification_id">{{qual.qualification_name}}</mat-option> <mat-option *ngFor="let qual of qualificationList" [value]="qual.qualification_id">{{qual.qualification_name}}</mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<mat-form-field style="width: 60%" [style.visibility]="applicant.get('qualification').value == '' ? 'hidden':'visible'"> <mat-form-field style="width: 60%" [style.visibility]="applicant.get('qualification').value == '' || applicant.get('qualification').value == '4' || applicant.get('qualification').value == '6' ? 'hidden':'visible'">
<input matInput placeholder="Qualification Details" formControlName="course_name" autocomplete="off"> <input matInput placeholder="Qualification Details" formControlName="course_name" autocomplete="off">
</mat-form-field> </mat-form-field>
<div fxLayout="row wrap"> <div fxLayout="row wrap">
<div fxFlex.xs="100%" fxFlex.sm="100%" fxFlex="45%"> <div fxFlex.xs="100%" fxFlex.sm="100%" fxFlex="45%">
<mat-checkbox class="example-margin" color="primary" formControlName="is_person_met">Is Person Met</mat-checkbox> <mat-checkbox class="example-margin" color="primary" formControlName="is_person_met">Is Person
Met</mat-checkbox>
</div> </div>
<div fxFlex.xs="100%" fxFlex.sm="100%" fxFlex="45%"> <div fxFlex.xs="100%" fxFlex.sm="100%" fxFlex="45%">
<mat-checkbox class="example-margin" color="primary" formControlName="is_applicant">Is Applicant</mat-checkbox> <mat-checkbox class="example-margin" color="primary" formControlName="is_applicant">Is
Applicant</mat-checkbox>
</div> </div>
</div> </div>
</mat-card-content> </mat-card-content>
<mat-card-actions align="end"> <mat-card-actions align="end">
<button type="button" class="mr-1 mb-1 hover-icon" mat-raised-button mat-icon-button (click)="removeApplicant(r)" *ngIf="r>0" <button type="button" class="mr-1 mb-1 hover-icon" mat-raised-button mat-icon-button (click)="removeApplicant(r)"
matTooltip="Remove Individuals" matTooltipPosition="right"> *ngIf="r>0" matTooltip="Remove Individuals" matTooltipPosition="right">
<mat-icon>delete</mat-icon> <mat-icon>delete</mat-icon>
</button> </button>
</mat-card-actions> </mat-card-actions>
@ -53,7 +60,12 @@
</mat-dialog-content> </mat-dialog-content>
<mat-dialog-actions align="end"> <mat-dialog-actions align="end">
<button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Add More" matTooltipPosition="above" (click)="addMoreApplicant()"><mat-icon>add</mat-icon></button> <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Add More"
<button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Save" matTooltipPosition="above" (click)="saveApplicant(_OtherForm.value)"><mat-icon>save</mat-icon></button> matTooltipPosition="above" (click)="addMoreApplicant()">
<mat-icon>add</mat-icon>
</button>
<button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Save"
matTooltipPosition="above" (click)="saveApplicant(_OtherForm.value)">
<mat-icon>save</mat-icon>
</button>
</mat-dialog-actions> </mat-dialog-actions>

View File

@ -125,7 +125,7 @@ export class EmploymentInfoComponent implements OnInit {
this.employmentForm = this.fb.group({ this.employmentForm = this.fb.group({
employer_name: ['', Validators.compose([Validators.required])], employer_name: ['', Validators.compose([Validators.required])],
how_long_year: ['', Validators.compose([Validators.required])], how_long_year: ['', Validators.compose([Validators.required])],
how_long_month: ['', Validators.compose([Validators.required])], how_long_month: [''],
was_met: [this.pd_cus_segment=='SAL-CHQ' ? 'No' : '', Validators.compose([Validators.required])], was_met: [this.pd_cus_segment=='SAL-CHQ' ? 'No' : '', Validators.compose([Validators.required])],
name_person_met: [''], name_person_met: [''],
designation_person_met: [''], designation_person_met: [''],

View File

@ -369,13 +369,13 @@ export class FamilyDetailsComponent implements OnInit {
this._pd.getFamilyDetails(this.pdid).subscribe(data=>{ this._pd.getFamilyDetails(this.pdid).subscribe(data=>{
console.clear(); console.clear();
console.log('getFamilyDetails data',data); // console.log('getFamilyDetails data',data);
if(data.dataStatus == true){ if(data.dataStatus == true){
let Temparr : any = []; let Temparr : any = [];
console.log('from_business_form',data.record.from_business_form); // console.log('from_business_form',data.record.from_business_form);
console.log('from_general_form',data.record.from_general_form); // console.log('from_general_form',data.record.from_general_form);
if(data.record.from_general_form.length > 0){ if(data.record.from_general_form.length > 0){
let familyMembersGeneralForm = Object.keys(data.record.from_general_form).map(function (key) { let familyMembersGeneralForm = Object.keys(data.record.from_general_form).map(function (key) {
@ -840,7 +840,7 @@ removeFamilyMembers(inx,i) {
records.pdid = this.pdid; records.pdid = this.pdid;
records.formid = '6'; records.formid = '6';
// records.fk_createdby = '251'; // records.fk_createdby = '251';
console.log(JSON.stringify(records)); // console.log(JSON.stringify(records));
this._pd.saveForm(records).subscribe(data => { this._pd.saveForm(records).subscribe(data => {
// this.notifier.notify('success', 'Saved Successfully.'); // this.notifier.notify('success', 'Saved Successfully.');
if(data.status == 200) { if(data.status == 200) {

View File

@ -30,7 +30,7 @@
<div style="width:100%"> <div style="width:100%">
<mat-form-field style="width:31%"> <mat-form-field style="width:31%">
<mat-select placeholder="Financial Statements Available ?" formControlName="is_financial_statements" (selectionChange)="selectedStatement($event)"> <mat-select placeholder="Financial Statements Available ?" formControlName="is_financial_statements" (selectionChange)="selectedStatement($event.value)">
<mat-option value="yes">Yes</mat-option> <mat-option value="yes">Yes</mat-option>
<mat-option value="no">No</mat-option> <mat-option value="no">No</mat-option>
</mat-select> </mat-select>
@ -175,9 +175,9 @@
<mat-card-header> <mat-card-header>
<mat-card-title><p> Financial as per Customer</p></mat-card-title> <mat-card-title><p> Financial as per Customer</p></mat-card-title>
</mat-card-header> </mat-card-header>
<!-- *ngIf="isDisplay" -->
<mat-form-field *ngIf="isDisplay" style="width:35%"> <mat-form-field style="width:35%">
<mat-select placeholder="Same as Financial Statements ?" formControlName="is_financial_customer" (selectionChange)="selectedFinancialCustomer($event)"> <mat-select placeholder="Same as Financial Statements ?" formControlName="is_financial_customer" (selectionChange)="selectedFinancialCustomer($event.value)">
<mat-option value="yes">Yes</mat-option> <mat-option value="yes">Yes</mat-option>
<mat-option value="no">No</mat-option> <mat-option value="no">No</mat-option>
</mat-select> </mat-select>
@ -248,7 +248,7 @@
<input matInput autocomplete="off" placeholder="Net Profit % To" formControlName="estimate_profit_range_to" type="number" min='0' max='100' (change)="calculateMarginProfit( i, details);"> <input matInput autocomplete="off" placeholder="Net Profit % To" formControlName="estimate_profit_range_to" type="number" min='0' max='100' (change)="calculateMarginProfit( i, details);">
</mat-form-field> </mat-form-field>
<mat-form-field style="width:25%"> <mat-form-field style="width:25%">
<input matInput autocomplete="off" placeholder="Considered Margin Profit %" formControlName="estimate_profit_margin_percent" type="number" readonly> <input matInput autocomplete="off" placeholder="Net Profit % Considered" formControlName="estimate_profit_margin_percent" type="number" readonly>
<!-- <mat-hint align="start" style="font-size:70%" *ngIf="details.get('estimate_profit_margin').value != ''"> {{"&#8377;"}} {{AV_marginProfitAmtInwords[i]}} Only ( {{"&#8377;"}} {{details.get('estimate_profit_margin').value}} ) </mat-hint> --> <!-- <mat-hint align="start" style="font-size:70%" *ngIf="details.get('estimate_profit_margin').value != ''"> {{"&#8377;"}} {{AV_marginProfitAmtInwords[i]}} Only ( {{"&#8377;"}} {{details.get('estimate_profit_margin').value}} ) </mat-hint> -->
</mat-form-field> </mat-form-field>
<mat-form-field style="width:25%"> <mat-form-field style="width:25%">
@ -286,7 +286,7 @@
<input matInput autocomplete="off" placeholder="Net Loss % To" formControlName="estimate_loss_range_to" min='0' max='100' type="number" (change)="calculateMarginLoss( i, details);"> <input matInput autocomplete="off" placeholder="Net Loss % To" formControlName="estimate_loss_range_to" min='0' max='100' type="number" (change)="calculateMarginLoss( i, details);">
</mat-form-field> </mat-form-field>
<mat-form-field style="width:25%"> <mat-form-field style="width:25%">
<input matInput autocomplete="off" placeholder="Considered Margin Loss %" formControlName="estimate_loss_margin_percent" type="number" readonly> <input matInput autocomplete="off" placeholder="Net Profit % Considered" formControlName="estimate_loss_margin_percent" type="number" readonly>
<!-- <mat-hint align="start" style="font-size:70%" *ngIf="details.get('estimate_loss_margin').value != ''">{{"&#8377;"}} {{AV_marginLossAmtInwords[i]}} Only ( {{"&#8377;"}} {{details.get('estimate_loss_margin').value}} ) </mat-hint> --> <!-- <mat-hint align="start" style="font-size:70%" *ngIf="details.get('estimate_loss_margin').value != ''">{{"&#8377;"}} {{AV_marginLossAmtInwords[i]}} Only ( {{"&#8377;"}} {{details.get('estimate_loss_margin').value}} ) </mat-hint> -->
<!-- // --> <!-- // -->
</mat-form-field> </mat-form-field>

View File

@ -58,6 +58,7 @@ export class FinancialInfoComponent implements OnInit {
//isreadonly for edit(no of year Fields and Starting Years ) //isreadonly for edit(no of year Fields and Starting Years )
isReadOnly : boolean = false; isReadOnly : boolean = false;
EditAble: boolean = true;
isDisplay : boolean ; isDisplay : boolean ;
AV_netProfitAmtFrmInwords: any = []; AV_netProfitAmtFrmInwords: any = [];
AV_netProfitAmtToInwords: any = []; AV_netProfitAmtToInwords: any = [];
@ -309,7 +310,7 @@ export class FinancialInfoComponent implements OnInit {
} }
selectedProfitOrLossType(e,detail){ selectedProfitOrLossType(e,detail){
// console.log(e);
if(e.value == 1){ if(e.value == 1){
detail.controls.financial_net_loss.setValue(''); detail.controls.financial_net_loss.setValue('');
detail.controls.financial_margin_of_loss.setValue(''); detail.controls.financial_margin_of_loss.setValue('');
@ -349,26 +350,17 @@ export class FinancialInfoComponent implements OnInit {
selectedStatement(e :any):void{ selectedStatement(e :any):void{
if(e.value == 'yes'){ if(e == 'yes'){
this.isDisplay = true; this.isDisplay = true;
this.financialForm.controls['is_financial_customer'].setValue(''); this.financialForm.controls['is_financial_customer'].setValue('');
const control = <FormArray>this.financialForm.controls['estimated_value'];
while (control.length !== 0) {
control.removeAt(0);
}
} }
else if (e.value == 'no'){ else if(e == 'no'){
this.isDisplay = false; this.isDisplay = false;
this.financialForm.controls['is_financial_customer'].setValue('no');
const control = <FormArray>this.financialForm.controls['estimated_value']; this.selectedFinancialCustomer('no');
while (control.length !== 0) {
control.removeAt(0);
}
const statementControl = <FormArray>this.financialForm.controls['date_per_financial']; const statementControl = <FormArray>this.financialForm.controls['date_per_financial'];
@ -379,40 +371,26 @@ export class FinancialInfoComponent implements OnInit {
this.financialForm.controls['financial_starting_year'].setValue(''); this.financialForm.controls['financial_starting_year'].setValue('');
this.financialForm.controls['financial_no_of_year'].setValue(''); this.financialForm.controls['financial_no_of_year'].setValue('');
// alert((new Date()).getFullYear()); // alert((new Date()).getFullYear());
let year1 = (new Date()).getFullYear(); // let year1 = (new Date()).getFullYear();
let year2 = ((new Date()).getFullYear() + 1); // let year2 = ((new Date()).getFullYear() + 1);
// let Year = year1 +'-'+ year2;
let Year = year1 +'-'+ year2;
control.push(this.createValue(''));
} }
} }
/** fin customer data from Fin statement*/ /** fin customer data from Fin statement*/
selectedFinancialCustomer(e: any): void { selectedFinancialCustomer(e: any): void {
if(e.value == 'yes'){ if(e == 'yes'){
const control = <FormArray>this.financialForm.controls['estimated_value']; const control = <FormArray>this.financialForm.controls['estimated_value'];
while (control.length !== 0) { while (control.length !== 0) {
control.removeAt(0); control.removeAt(0);
} }
} }
else if (e.value == 'no'){ else if (e == 'no'){
const control = <FormArray>this.financialForm.controls['estimated_value']; const control = <FormArray>this.financialForm.controls['estimated_value'];
control.push(this.createValue(''));
while (control.length !== 0) {
control.removeAt(0);
}
let year1 = (new Date()).getFullYear();
let year2 = ((new Date()).getFullYear() - 1);
let Year = year2 +'-'+ year1;
control.push(this.createValue(Year));
} }
} }
@ -441,16 +419,12 @@ export class FinancialInfoComponent implements OnInit {
// parentArray.value.forEach((val,index) => { // parentArray.value.forEach((val,index) => {
// let annual_sale = val.financial_annual_sale; // let annual_sale = val.financial_annual_sale;
// // console.log('Current Anual Sales',array.value[index].financial_annual_sale);
// // console.log('Current Index',index);
// // console.log('prev_annual_sale',prev_annual_sale);
// if (index != 0) { // if (index != 0) {
// let childArray : any = <FormArray>parentArray.controls[index]; // let childArray : any = <FormArray>parentArray.controls[index];
// // console.log('INX',index);
// // console.log('SALE',annual_sale);
// let annual_sale_variation = (( annual_sale - prev_annual_sale)/prev_annual_sale) * 100 ; // let annual_sale_variation = (( annual_sale - prev_annual_sale)/prev_annual_sale) * 100 ;
// // console.log('annual_sale_variation',annual_sale_variation);
// childArray.controls.financial_annualsales_variation.setValue( // childArray.controls.financial_annualsales_variation.setValue(
// annual_sale_variation!= Infinity ? !(Number.isNaN(annual_sale_variation)) ? annual_sale_variation.toFixed(2) // annual_sale_variation!= Infinity ? !(Number.isNaN(annual_sale_variation)) ? annual_sale_variation.toFixed(2)
// : 0 // : 0
@ -481,8 +455,7 @@ export class FinancialInfoComponent implements OnInit {
// let profit = detail.value.financial_net_profit; // let profit = detail.value.financial_net_profit;
// let loss = detail.value.financial_net_loss; // let loss = detail.value.financial_net_loss;
// let salary = detail.value.financial_annual_sale; // let salary = detail.value.financial_annual_sale;
// // console.log('current profit',profit);
// // console.log('current loss',loss);
// if ( (profit != '' || loss != '') && index != 0) { // if ( (profit != '' || loss != '') && index != 0) {
// if(+profit > +salary){ // if(+profit > +salary){
@ -495,13 +468,10 @@ export class FinancialInfoComponent implements OnInit {
// let prev_profit = array.value[index - 1].financial_net_profit != '' ? array.value[index - 1].financial_net_profit : 0; // let prev_profit = array.value[index - 1].financial_net_profit != '' ? array.value[index - 1].financial_net_profit : 0;
// let prev_loss = array.value[index - 1].financial_net_loss !='' ? array.value[index - 1].financial_net_loss : 0 ; // let prev_loss = array.value[index - 1].financial_net_loss !='' ? array.value[index - 1].financial_net_loss : 0 ;
// // console.log('prev_profit',prev_profit);
// // console.log('prev_loss',prev_loss);
// loss = loss != 0 ? loss * (-1) : loss; // loss = loss != 0 ? loss * (-1) : loss;
// // console.log('-1',loss);
// prev_loss = prev_loss != 0 ? prev_loss * (-1) : prev_loss ; // prev_loss = prev_loss != 0 ? prev_loss * (-1) : prev_loss ;
// // console.log('prev_loss',prev_loss);
// let variation = (((profit != '' ? profit : loss ) - (prev_profit != '' ? prev_profit : prev_loss ))/ (prev_profit != '' ? Math.abs(prev_profit) : Math.abs(prev_loss))) * 100; // let variation = (((profit != '' ? profit : loss ) - (prev_profit != '' ? prev_profit : prev_loss ))/ (prev_profit != '' ? Math.abs(prev_profit) : Math.abs(prev_loss))) * 100;
@ -552,8 +522,8 @@ export class FinancialInfoComponent implements OnInit {
/** old code - calculating Sale PERCENTAGE for financial statement */ /** old code - calculating Sale PERCENTAGE for financial statement */
// calMargin(index, detail) {
// console.log('detail', detail);
// let salary = detail.value.financial_annual_sale; // let salary = detail.value.financial_annual_sale;
// let profit = detail.value.financial_net_profit; // let profit = detail.value.financial_net_profit;
// if (salary != '' && profit != '') { // if (salary != '' && profit != '') {
@ -634,10 +604,6 @@ export class FinancialInfoComponent implements OnInit {
// variation_percent = (((profit_margin != '' ? profit_margin : loss_margin ) - (prev_profit_margin != '' ? prev_profit_margin : prev_loss_margin ))/ (prev_profit_margin != '' ? Math.abs(prev_profit_margin) : Math.abs(prev_loss_margin))) * 100; // variation_percent = (((profit_margin != '' ? profit_margin : loss_margin ) - (prev_profit_margin != '' ? prev_profit_margin : prev_loss_margin ))/ (prev_profit_margin != '' ? Math.abs(prev_profit_margin) : Math.abs(prev_loss_margin))) * 100;
// // console.log((profit_margin != '' ? profit_margin : loss_margin ) - (prev_profit_margin != '' ? prev_profit_margin : prev_loss_margin ));
// // console.log((((profit_margin != '' ? profit_margin : loss_margin ) - (prev_profit_margin != '' ? prev_profit_margin : prev_loss_margin ))/ (prev_profit_margin != '' ? Math.abs(prev_profit_margin) : Math.abs(prev_loss_margin))));
// // console.log((((profit_margin != '' ? profit_margin : loss_margin ) - (prev_profit_margin != '' ? prev_profit_margin : prev_loss_margin ))/ (prev_profit_margin != '' ? Math.abs(prev_profit_margin) : Math.abs(prev_loss_margin))) * 100);
// detail.controls.financial_profit_to_sale_variation.setValue(variation_percent != Infinity ? variation_percent.toFixed(2) : 0); // detail.controls.financial_profit_to_sale_variation.setValue(variation_percent != Infinity ? variation_percent.toFixed(2) : 0);
// } // }
@ -919,15 +885,10 @@ export class FinancialInfoComponent implements OnInit {
childArray.controls.financial_variation.setValue(''); childArray.controls.financial_variation.setValue('');
} }
else{ else{
// console.log('loss_amt = val.financial_net_loss;',val.financial_net_loss);
// console.log('loss_amt',loss_amt);
// console.log('loss_amt/annual_sale',loss_amt/annual_sale);
// console.log('(loss_amt/annual_sale) * 100',(loss_amt/annual_sale) * 100);
// console.log('(loss_amt/annual_sale) * 100 * (-1)',(loss_amt/annual_sale) * 100 * (-1));
loss_margin = (val.financial_net_loss/val.financial_annual_sale) * 100 * (-1); loss_margin = (val.financial_net_loss/val.financial_annual_sale) * 100 * (-1);
// console.log('loss_margin',loss_margin);
childArray.controls.financial_margin_of_loss.setValue(loss_margin != Infinity ? !(Number.isNaN(loss_margin)) ? loss_margin.toFixed(2) : 0 : 0); childArray.controls.financial_margin_of_loss.setValue(loss_margin != Infinity ? !(Number.isNaN(loss_margin)) ? loss_margin.toFixed(2) : 0 : 0);
@ -965,10 +926,12 @@ export class FinancialInfoComponent implements OnInit {
if(annual_sale != ''){ if(annual_sale != ''){
let variation_percent : any ;
variation_percent = (((profit_margin != '' ? profit_margin : loss_margin ) - (temp_prev_profit_margin != 0 ? temp_prev_profit_margin : temp_prev_loss_margin) / (temp_prev_profit_margin != 0 ? Math.abs(temp_prev_profit_margin) : Math.abs(temp_prev_loss_margin))) * 100); let a = (profit_margin != '' ? profit_margin : loss_margin ) - (temp_prev_profit_margin != 0 ? temp_prev_profit_margin : temp_prev_loss_margin);
let final_percent = variation_percent != Infinity ? !(Number.isNaN(variation_percent)) ? variation_percent != -Infinity ? variation_percent.toFixed(2) : 0 : 0 : 0 ; let b = a / (temp_prev_profit_margin != 0 ? Math.abs(temp_prev_profit_margin) : Math.abs(temp_prev_loss_margin));
let c = b * 100;
let final_percent = c != Infinity ? !(Number.isNaN(c)) ? c != -Infinity ? c.toFixed(2) : 0 : 0 : 0 ;
childArray.controls.financial_profit_to_sale_variation.setValue(final_percent); childArray.controls.financial_profit_to_sale_variation.setValue(final_percent);
} }

View File

@ -6,7 +6,10 @@
{{pageTitle}} {{pageTitle}}
</div> </div>
<div fxFlex="30" align="end" style="padding: 10px !important;"> <div fxFlex="30" align="end" style="padding: 10px !important;">
<button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Close" matTooltipPosition="right" mat-dialog-close><mat-icon>close</mat-icon></button> <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Close"
matTooltipPosition="right" mat-dialog-close>
<mat-icon>close</mat-icon>
</button>
</div> </div>
</h2> </h2>
<mat-dialog-content> <mat-dialog-content>
@ -16,11 +19,13 @@
<mat-card-title>Name of Person(s) Met and Individual Loan Applicant(s) </mat-card-title> <mat-card-title>Name of Person(s) Met and Individual Loan Applicant(s) </mat-card-title>
</mat-card-header> </mat-card-header>
<mat-card-content> <mat-card-content>
<mat-table [dataSource]="individualsSource" *ngIf="_generalForm.controls.individuals['controls'].length>0" formArrayName="individuals"> <mat-table [dataSource]="individualsSource" *ngIf="_generalForm.controls.individuals['controls'].length>0"
formArrayName="individuals">
<ng-container matColumnDef="applicant_name"> <ng-container matColumnDef="applicant_name">
<mat-header-cell *matHeaderCellDef> Name </mat-header-cell> <mat-header-cell *matHeaderCellDef> Name </mat-header-cell>
<mat-cell *matCellDef="let details;let i = index;" [formGroupName]="i"> <mat-cell *matCellDef="let details;let i = index;" [formGroupName]="i">
<input class="capitalize" matInput placeholder="ApplicantName" formControlName="applicant_name" autocomplete="off"> <input class="capitalize" matInput placeholder="ApplicantName" formControlName="applicant_name"
autocomplete="off" (change)="ApplicantName($event,details.value.pd_co_applicant_id)">
<!-- {{details.value.applicant_name | titlecase}} --> <!-- {{details.value.applicant_name | titlecase}} -->
</mat-cell> </mat-cell>
</ng-container> </ng-container>
@ -43,7 +48,8 @@
<ng-container matColumnDef="age"> <ng-container matColumnDef="age">
<mat-header-cell *matHeaderCellDef> Age </mat-header-cell> <mat-header-cell *matHeaderCellDef> Age </mat-header-cell>
<mat-cell *matCellDef="let details;let i = index;" [formGroupName]="i"> <mat-cell *matCellDef="let details;let i = index;" [formGroupName]="i">
<input matInput placeholder="Age" formControlName="age" minlength="1" maxlength="3" (keypress)="keyPress($event)" autocomplete="off"> <input matInput placeholder="Age" formControlName="age" minlength="1" maxlength="3"
(keypress)="keyPress($event)" autocomplete="off">
</mat-cell> </mat-cell>
</ng-container> </ng-container>
<ng-container matColumnDef="qualification"> <ng-container matColumnDef="qualification">
@ -56,19 +62,21 @@
</ng-container> </ng-container>
<ng-container matColumnDef="course_name"> <ng-container matColumnDef="course_name">
<mat-header-cell *matHeaderCellDef> </mat-header-cell> <mat-header-cell *matHeaderCellDef> </mat-header-cell>
<mat-cell *matCellDef="let details;let i = index;" [formGroupName]="i" [style.visibility]="_generalForm.controls.individuals.value[i].qualification == '' ? 'hidden':'visible'"> <mat-cell *matCellDef="let details;let i = index;" [formGroupName]="i" [style.visibility]="_generalForm.controls.individuals.value[i].qualification == '' || _generalForm.controls.individuals.value[i].qualification == '4' || _generalForm.controls.individuals.value[i].qualification == '6' ? 'hidden':'visible'">
<input matInput placeholder="Qualification Details" formControlName="course_name" autocomplete="off"> <input matInput placeholder="Qualification Details" formControlName="course_name"
autocomplete="off">
</mat-cell> </mat-cell>
</ng-container> </ng-container>
<ng-container matColumnDef="actions"> <ng-container matColumnDef="actions">
<mat-header-cell *matHeaderCellDef> </mat-header-cell> <mat-header-cell *matHeaderCellDef> </mat-header-cell>
<mat-cell *matCellDef="let details;let i =index;"> <mat-cell *matCellDef="let details;let i =index;" [style.visibility]="_generalForm.controls.individuals.value[i].is_main_applicant == true ? 'hidden':'visible'">
<!-- <button type="button" class="mr-1 mb-1 hover-icon" mat-raised-button mat-icon-button (click)="editIndividuals(details)" <!-- <button type="button" class="mr-1 mb-1 hover-icon" mat-raised-button mat-icon-button (click)="editIndividuals(details)"
matTooltip="Edit " matTooltipPosition="below"> matTooltip="Edit " matTooltipPosition="below">
<mat-icon>edit</mat-icon> <mat-icon>edit</mat-icon>
</button> --> </button> -->
<button type="button" class="mr-1 mb-1 hover-icon" mat-raised-button mat-icon-button (click)="removeIndividuals(i,details)" <button type="button" class="mr-1 mb-1 hover-icon" mat-raised-button mat-icon-button
matTooltip="Remove Individuals" matTooltipPosition="below"> (click)="removeIndividuals(i,details)" matTooltip="Remove Individuals"
matTooltipPosition="below">
<mat-icon>delete</mat-icon> <mat-icon>delete</mat-icon>
</button> </button>
</mat-cell> </mat-cell>
@ -80,8 +88,8 @@
</mat-card-content> </mat-card-content>
<mat-card-actions align="center"> <mat-card-actions align="center">
<button type="button"mat-flat-button (click)="addMoreIndividuals()" <button type="button" mat-flat-button (click)="addMoreIndividuals()" matTooltip="Add More"
matTooltip="Add More" matTooltipPosition="left" color="primary"> matTooltipPosition="left" color="primary">
<strong>Add More Person(s) </strong> <strong>Add More Person(s) </strong>
</button> </button>
</mat-card-actions> </mat-card-actions>
@ -100,36 +108,42 @@
<mat-form-field style="width: 50%"> <mat-form-field style="width: 50%">
<input matInput placeholder="Company/Firm" formControlName="company_name" type="text"> <input matInput placeholder="Company/Firm" formControlName="company_name" type="text">
</mat-form-field> </mat-form-field>
<mat-checkbox class="table-checkbox-com" color="primary" formControlName="is_company_applicant"> Is Applicant</mat-checkbox> <mat-checkbox class="table-checkbox-com" color="primary" formControlName="is_company_applicant">
Is Applicant</mat-checkbox>
<mat-form-field style="width: 45%;"> <mat-form-field style="width: 45%;">
<mat-select placeholder="Business Entity Type" <mat-select placeholder="Business Entity Type" formControlName="business_entity_type"
formControlName="business_entity_type" (selectionChange)="checkEntityType(com.value.business_entity_type,c)" required> (selectionChange)="checkEntityType(com.value.business_entity_type,c)" required>
<mat-option [value]="entity.business_entity_type_id" *ngFor="let entity of businessEntityTypeList">{{entity.business_entity_type_name}}</mat-option> <mat-option [value]="entity.business_entity_type_id" *ngFor="let entity of businessEntityTypeList">{{entity.business_entity_type_name}}</mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<mat-form-field style="width: 45%;" *ngIf="com.controls.business_entity_type_other"> <mat-form-field style="width: 45%;" *ngIf="com.controls.business_entity_type_other">
<input matInput placeholder="Please Specify Others" formControlName="business_entity_type_other" required> <input matInput placeholder="Please Specify Others" formControlName="business_entity_type_other"
required>
</mat-form-field> </mat-form-field>
<p>Number of Years For Which The Business Has Been Running</p> <p>Number of Years For Which The Business Has Been Running</p>
<mat-form-field style="width: 20%;"> <mat-form-field style="width: 20%;">
<input matInput placeholder="Year" formControlName="business_years" required autocomplete="off" (keypress)="keyPress($event)"> <input matInput placeholder="Year" formControlName="business_years" required
autocomplete="off" (keypress)="keyPress($event)">
<mat-error>Please Enter Correct Year</mat-error> <mat-error>Please Enter Correct Year</mat-error>
</mat-form-field> </mat-form-field>
<mat-form-field style="width: 20%;"> <mat-form-field style="width: 20%;">
<input matInput type="text" placeholder="Month" formControlName="business_month" autocomplete="off" (keypress)="keyPress($event)" (change)="ConvertMonthintoYearforBusiness($event.target.value,c)"> <input matInput type="text" placeholder="Month" formControlName="business_month"
autocomplete="off" (keypress)="keyPress($event)" (change)="ConvertMonthintoYearforBusiness($event.target.value,c)">
</mat-form-field> </mat-form-field>
<mat-form-field style="width: 40%;"> <mat-form-field style="width: 40%;">
<input matInput [max]="maxDate" [matDatepicker]="picker" formControlName="business_date_object" (dateChange)="getDateObjects($event.target.value,c)" placeholder="Enter Date of Formation, If Available"> <input matInput [max]="maxDate" [matDatepicker]="picker" formControlName="business_date_object"
(dateChange)="getDateObjects($event.target.value,c)" placeholder="Enter Date of Formation, If Available">
<mat-datepicker-toggle matSuffix [for]="picker"></mat-datepicker-toggle> <mat-datepicker-toggle matSuffix [for]="picker"></mat-datepicker-toggle>
<mat-datepicker #picker></mat-datepicker> <mat-datepicker #picker></mat-datepicker>
</mat-form-field> </mat-form-field>
<div fxLayout="row nowrap" [style.display]="'block'"> <div fxLayout="row nowrap" [style.display]="'block'">
<div align="right"> <div align="right">
<button type="button" class="mr-1 mb-1 hover-icon" mat-raised-button mat-icon-button (click)="removeCompanies(c)" *ngIf="com.value.is_active==true" <button type="button" class="mr-1 mb-1 hover-icon" mat-raised-button
mat-icon-button (click)="removeCompanies(c)" *ngIf="com.value.is_active==true"
matTooltip="Remove Company/Firm" matTooltipPosition="above"> matTooltip="Remove Company/Firm" matTooltipPosition="above">
<mat-icon>delete</mat-icon> <mat-icon>delete</mat-icon>
</button> </button>
@ -141,7 +155,8 @@
</mat-card-content> </mat-card-content>
<mat-card-actions align="center"> <mat-card-actions align="center">
<button mat-flat-button type="button" matTooltip="Add More" matTooltipPosition="above" color="primary" (click)="addMoreCompanies()"><strong>Add More Company/Firm</strong></button> <button mat-flat-button type="button" matTooltip="Add More" matTooltipPosition="above" color="primary"
(click)="addMoreCompanies()"><strong>Add More Company/Firm</strong></button>
</mat-card-actions> </mat-card-actions>
</mat-card> </mat-card>
@ -154,7 +169,8 @@
<mat-card-title> Relationship Between Individuals </mat-card-title> <mat-card-title> Relationship Between Individuals </mat-card-title>
</mat-card-header> </mat-card-header>
<mat-card-content> <mat-card-content>
<mat-table [dataSource]="relationSource" *ngIf="_generalForm.controls.persons_with_relationships['controls'].length>0" formArrayName="persons_with_relationships"> <mat-table [dataSource]="relationSource" *ngIf="_generalForm.controls.persons_with_relationships['controls'].length>0"
formArrayName="persons_with_relationships">
<ng-container matColumnDef="applicant_name"> <ng-container matColumnDef="applicant_name">
<mat-header-cell *matHeaderCellDef> Name </mat-header-cell> <mat-header-cell *matHeaderCellDef> Name </mat-header-cell>
<mat-cell *matCellDef="let details;let i = index;" [formGroupName]="i"> <mat-cell *matCellDef="let details;let i = index;" [formGroupName]="i">
@ -166,9 +182,11 @@
<ng-container matColumnDef="relation"> <ng-container matColumnDef="relation">
<mat-header-cell *matHeaderCellDef> Relation </mat-header-cell> <mat-header-cell *matHeaderCellDef> Relation </mat-header-cell>
<mat-cell *matCellDef="let details;let i = index;" [formGroupName]="i"> <mat-cell *matCellDef="let details;let i = index;" [formGroupName]="i">
<mat-select placeholder="Relation" formControlName="relationship" style="width: 75%;" (selectionChange)="updatePersonalRelation(i)"> <mat-select placeholder="Relation" formControlName="relationship" style="width: 75%;"
(selectionChange)="updatePersonalRelation(i)">
<mat-option>Select</mat-option> <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]="member.relationship_id" *ngFor="let member of relationShipList">{{member.name
+ ' of' | titlecase}}</mat-option>
<mat-option value="0"> Not Applicable </mat-option> <mat-option value="0"> Not Applicable </mat-option>
</mat-select> </mat-select>
@ -177,10 +195,12 @@
<ng-container matColumnDef="relation_to"> <ng-container matColumnDef="relation_to">
<mat-header-cell *matHeaderCellDef> Relationship To </mat-header-cell> <mat-header-cell *matHeaderCellDef> Relationship To </mat-header-cell>
<mat-cell *matCellDef="let details;let i = index;" [formGroupName]="i" [style.visibility]="_generalForm.controls.persons_with_relationships.value[i].relationship==0 ? 'hidden':'visible'"> <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-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>Select</mat-option>
<!-- getRelationRestrict(_generalForm.controls.persons_with_relationships.value[i].pd_co_applicant_id,_generalForm.controls.persons_with_relationships.value,individualsList)" --> <!-- getRelationRestrict(_generalForm.controls.persons_with_relationships.value[i].pd_co_applicant_id,_generalForm.controls.persons_with_relationships.value,individualsList)" -->
<mat-option *ngFor="let appc of individualsList | searchRelation : { currentApplicantID:_generalForm.controls.persons_with_relationships.value[i].pd_co_applicant_id, existRelationList:_generalForm.controls.persons_with_relationships.value}" [value]="appc.pd_co_applicant_id">{{appc.applicant_name | titlecase}}</mat-option> <mat-option *ngFor="let appc of individualsList | searchRelation : { currentApplicantID:_generalForm.controls.persons_with_relationships.value[i].pd_co_applicant_id, existRelationList:_generalForm.controls.persons_with_relationships.value}"
[value]="appc.pd_co_applicant_id">{{appc.applicant_name | titlecase}}</mat-option>
<mat-option value="0"> Not Applicable </mat-option> <mat-option value="0"> Not Applicable </mat-option>
</mat-select> </mat-select>
@ -205,14 +225,16 @@
<mat-card-content> <mat-card-content>
<mat-table [dataSource]="CompanySource" *ngIf="_generalForm.controls.company_with_relationships['controls'].length>0" formArrayName="company_with_relationships"> <mat-table [dataSource]="CompanySource" *ngIf="_generalForm.controls.company_with_relationships['controls'].length>0"
formArrayName="company_with_relationships">
<ng-container matColumnDef="applicant_name"> <ng-container matColumnDef="applicant_name">
<mat-header-cell *matHeaderCellDef> Applicant </mat-header-cell> <mat-header-cell *matHeaderCellDef> Applicant </mat-header-cell>
<mat-cell *matCellDef="let details;let i = index;" [formGroupName]="i"> <mat-cell *matCellDef="let details;let i = index;" [formGroupName]="i">
<mat-select placeholder="Applicant" formControlName="applicant_name" style="width: 75%;"> <mat-select placeholder="Applicant" formControlName="applicant_name" style="width: 75%;">
<mat-option *ngFor="let bothC of individualsListBothCase" [value]="bothC.pd_co_applicant_id">{{bothC.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-select>
</mat-cell> </mat-cell>
@ -220,7 +242,8 @@
<ng-container matColumnDef="company_relationship"> <ng-container matColumnDef="company_relationship">
<mat-header-cell *matHeaderCellDef> Relation </mat-header-cell> <mat-header-cell *matHeaderCellDef> Relation </mat-header-cell>
<mat-cell *matCellDef="let details;let i = index;" [formGroupName]="i"> <mat-cell *matCellDef="let details;let i = index;" [formGroupName]="i">
<mat-select placeholder="Relation" formControlName="company_relationship" style="width: 75%;" (selectionChange)="updateCompanyRelation(i)"> <mat-select placeholder="Relation" formControlName="company_relationship" style="width: 75%;"
(selectionChange)="updateCompanyRelation(i)">
<mat-option>Select</mat-option> <mat-option>Select</mat-option>
<mat-option *ngFor="let comrelShip of companyRelationShipList" [value]="comrelShip.company_relationship_id"> <mat-option *ngFor="let comrelShip of companyRelationShipList" [value]="comrelShip.company_relationship_id">
{{comrelShip.name | titlecase}} {{comrelShip.name | titlecase}}
@ -234,7 +257,8 @@
<mat-header-cell *matHeaderCellDef> Company </mat-header-cell> <mat-header-cell *matHeaderCellDef> Company </mat-header-cell>
<mat-cell *matCellDef="let details;let i = index;" [formGroupName]="i"> <mat-cell *matCellDef="let details;let i = index;" [formGroupName]="i">
<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-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>Select</mat-option>
<mat-option *ngFor="let comp of companyList" [value]="comp.company_order_id"> <mat-option *ngFor="let comp of companyList" [value]="comp.company_order_id">
{{comp.company_name}} {{comp.company_name}}
@ -242,8 +266,9 @@
<mat-option value="0"> Not Applicable </mat-option> <mat-option value="0"> Not Applicable </mat-option>
</mat-select> </mat-select>
<button type="button" class="mr-1 mb-1 hover-icon" mat-raised-button mat-icon-button (click)="removeCompanyRelationship(i)" <button type="button" class="mr-1 mb-1 hover-icon" mat-raised-button mat-icon-button
matTooltip="Remove Company Relationship" matTooltipPosition="below"> (click)="removeCompanyRelationship(i)" matTooltip="Remove Company Relationship"
matTooltipPosition="below">
<mat-icon>delete</mat-icon> <mat-icon>delete</mat-icon>
</button> </button>
</mat-cell> </mat-cell>
@ -257,8 +282,8 @@
</mat-card-content> </mat-card-content>
<mat-card-actions align="center"> <mat-card-actions align="center">
<button type="button" mat-flat-button (click)="addCompanyRelationshipDialogue()" <button type="button" mat-flat-button (click)="addCompanyRelationshipDialogue()" matTooltip="Add More"
matTooltip="Add More" matTooltipPosition="left" color="primary"> matTooltipPosition="left" color="primary">
<span *ngIf="_generalForm.controls.company_with_relationships['controls'].length == 0;else another;"> <span *ngIf="_generalForm.controls.company_with_relationships['controls'].length == 0;else another;">
<strong>Add Company Relationship</strong> <strong>Add Company Relationship</strong>
</span> </span>
@ -351,9 +376,11 @@
</mat-form-field> </mat-form-field>
</div> </div>
<div fxFlex="40" align="end"> <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)="submitGeneralForm(_generalForm.value)"><mat-icon>save</mat-icon></button> <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Save"
matTooltipPosition="above" (click)="submitGeneralForm(_generalForm.value)">
<mat-icon>save</mat-icon>
</button>
</div> </div>
</mat-dialog-actions> </mat-dialog-actions>
</form> </form>
<notifier-container></notifier-container> <notifier-container></notifier-container>

View File

@ -17,34 +17,50 @@ import { Options } from 'selenium-webdriver/edge';
providers: [SearchRelationPipe], providers: [SearchRelationPipe],
}) })
export class GeneralInfoComponent implements OnInit { export class GeneralInfoComponent implements OnInit {
/* Declaration for Header Variables */
pageTitle: string = "General Information";
subproduct_abbr: any; subproduct_abbr: any;
customer_segment_abbr: any; customer_segment_abbr: any;
lender_applicant_id: any; lender_applicant_id: any;
main_applicant: any; main_applicant: any;
/* Declaration for Common Variables */
pipe = new DatePipe('en-US'); pipe = new DatePipe('en-US');
pageTitle: string ="General Information";
pdid: string; pdid: string;
form_id: number; form_id: number;
is_new : boolean;
count: number = 1; count: number = 1;
private notifier: NotifierService; errorMessage: any;
maxDate: any;
public pd_applicants_details: any;
public _generalForm: FormGroup; public _generalForm: FormGroup;
private notifier: NotifierService;
/* Declaration for DataTables */
displayedColumns = ['applicant_name', 'is_person_met', 'is_applicant', 'age', 'qualification', 'course_name', 'actions']; displayedColumns = ['applicant_name', 'is_person_met', 'is_applicant', 'age', 'qualification', 'course_name', 'actions'];
secondDisplayedColumns = ['applicant_name', 'relation', 'relation_to'];
thridDisplayedColumns = ['applicant_name', 'company_relationship', 'relation_to_company'];
public individualsSource = new MatTableDataSource(); public individualsSource = new MatTableDataSource();
public relationSource = new MatTableDataSource(); public relationSource = new MatTableDataSource();
public CompanySource = new MatTableDataSource(); public CompanySource = new MatTableDataSource();
secondDisplayedColumns = ['applicant_name','relation','relation_to'];
thridDisplayedColumns = ['applicant_name','company_relationship','relation_to_company']; /* Declaration for Dropdowns */
public pd_applicants_details: any;
relationShipList: any = []; relationShipList: any = [];
companyRelationShipList: any = []; companyRelationShipList: any = [];
errorMessage:any;
individualsList: any = []; individualsList: any = [];
individualsListBothCase: any = []; individualsListBothCase: any = [];
companyList: any = []; companyList: any = [];
qualificationList: any = []; qualificationList: any = [];
businessEntityTypeList: any = []; businessEntityTypeList: any = [];
maxDate: any;
/********************** Declaration Section Ends Here *****************/
/** Constructor Section */
constructor(notifier: NotifierService, private _fb: FormBuilder, private _pd: PdTrigerService, private dialog: MatDialog, @Inject(MAT_DIALOG_DATA) public pd_all_details: any, private dialogRef: MatDialogRef<GeneralInfoComponent>) { constructor(notifier: NotifierService, private _fb: FormBuilder, private _pd: PdTrigerService, private dialog: MatDialog, @Inject(MAT_DIALOG_DATA) public pd_all_details: any, private dialogRef: MatDialogRef<GeneralInfoComponent>) {
this.pdid = this.pd_all_details.pdmaster_details.pd_id; this.pdid = this.pd_all_details.pdmaster_details.pd_id;
this.notifier = notifier; this.notifier = notifier;
@ -54,9 +70,10 @@ export class GeneralInfoComponent implements OnInit {
this.lender_applicant_id = this.pd_all_details.pdmaster_details.lender_applicant_id; this.lender_applicant_id = this.pd_all_details.pdmaster_details.lender_applicant_id;
this.subproduct_abbr = this.pd_all_details.pdmaster_details.subproduct_abbr; this.subproduct_abbr = this.pd_all_details.pdmaster_details.subproduct_abbr;
this.customer_segment_abbr = this.pd_all_details.pdmaster_details.customer_segment_abbr; this.customer_segment_abbr = this.pd_all_details.pdmaster_details.customer_segment_abbr;
} }
/********************** Constructor Section Ends Here ****************/
/** ng Oninit Section */
ngOnInit() { ngOnInit() {
let get_max_date = this.pd_all_details.pdmaster_details.pd_date_of_initiation.split('/').reverse().join("/"); let get_max_date = this.pd_all_details.pdmaster_details.pd_date_of_initiation.split('/').reverse().join("/");
this.maxDate = new Date(get_max_date); this.maxDate = new Date(get_max_date);
@ -65,6 +82,7 @@ export class GeneralInfoComponent implements OnInit {
this.getMasterDetails('COMPANYRELATIONSHIPS', 2); this.getMasterDetails('COMPANYRELATIONSHIPS', 2);
this.getMasterDetails('EDUQUALIFICATION', 3); this.getMasterDetails('EDUQUALIFICATION', 3);
this.getMasterDetails('BUSINESSENTITYTYPE', 4); this.getMasterDetails('BUSINESSENTITYTYPE', 4);
// update data source table when change the individuals details // update data source table when change the individuals details
this._generalForm.controls['individuals'].valueChanges.subscribe(val => { this._generalForm.controls['individuals'].valueChanges.subscribe(val => {
let control = <FormArray>this._generalForm.controls['individuals']; let control = <FormArray>this._generalForm.controls['individuals'];
@ -72,6 +90,7 @@ export class GeneralInfoComponent implements OnInit {
this.individualsList = control.value.filter(element => element.is_applicant === true); 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); this.individualsListBothCase = control.value.filter(element => element.is_applicant === true || element.is_person_met === true);
}); });
// update company details // update company details
this._generalForm.controls['companies'].valueChanges.subscribe(val => { this._generalForm.controls['companies'].valueChanges.subscribe(val => {
let control = <FormArray>this._generalForm.controls['companies']; let control = <FormArray>this._generalForm.controls['companies'];
@ -91,8 +110,9 @@ export class GeneralInfoComponent implements OnInit {
}); });
} }
/***************************** ng Oninit Section Ends Here **********************************/
// init form /** init form */
initFormDetails() { initFormDetails() {
this._generalForm = this._fb.group({ this._generalForm = this._fb.group({
pdid: this.pdid, pdid: this.pdid,
@ -106,14 +126,16 @@ export class GeneralInfoComponent implements OnInit {
}) })
this.loadFormData(); this.loadFormData();
} }
// get all master details /**************************** init form Ends Here **************/
/*** get all master details **/
getMasterDetails(table: string, type: number) { getMasterDetails(table: string, type: number) {
this._pd.getAllMasterDatas(table).subscribe( this._pd.getAllMasterDatas(table).subscribe(
data => { data => {
if (data.status == 200) { if (data.status == 200) {
if (type == 1) { if (type == 1) {
this.relationShipList = data.records.filter(item => item.isactive == 1); this.relationShipList = data.records.filter(item => item.isactive == 1);
//this.relationShipList.push({'relationship_id':"0",'name':'Not Applicable'}); //this.relationShipList.push({'relationship_id':"0",'name':'Not Applicable'});
} }
if (type == 2) { if (type == 2) {
@ -130,8 +152,12 @@ export class GeneralInfoComponent implements OnInit {
} }
}, error => this.errorMessage = <any>error); }, error => this.errorMessage = <any>error);
} }
/********************** get all master details Ends Here **************************/
// load form data /** load form data
* IF part => Fetch The DB Datas;
* Else Part => initial stage;
*/
loadFormData() { loadFormData() {
let params: any = {}; let params: any = {};
params.pd_id = this.pdid; params.pd_id = this.pdid;
@ -150,16 +176,18 @@ export class GeneralInfoComponent implements OnInit {
let exist_relation: any; let exist_relation: any;
let exist_personsWithRelationships: any; let exist_personsWithRelationships: any;
let exist_companyWithRelationships: any; let exist_companyWithRelationships: any;
this._pd.retriveForm(params).subscribe(data => { this._pd.retriveForm(params).subscribe(data => {
console.log('data',data);
if (data.dataStatus) { if (data.dataStatus) {
this._generalForm.controls['general_remark'].setValue(data.records.general_remark ? data.records.general_remark : ''); this._generalForm.controls['general_remark'].setValue(data.records.general_remark ? data.records.general_remark : '');
// create individuals // create individuals
exist_individuals = Object.keys(data.records.individuals).map(function (key) { exist_individuals = Object.keys(data.records.individuals).map(function (key) {
return data.records.individuals[key]; return data.records.individuals[key];
}); });
console.log('exist_individuals',exist_individuals);
if (exist_individuals.length > 0) { if (exist_individuals.length > 0) {
exist_individuals.forEach(element => { exist_individuals.forEach(element => {
individualsControl.push(this.createIndividulas(element)) individualsControl.push(this.createIndividulas(element))
@ -182,12 +210,16 @@ export class GeneralInfoComponent implements OnInit {
return data.records.company_with_relationships[key]; return data.records.company_with_relationships[key];
}); });
if (exist_companyWithRelationships.length > 0) { if (exist_companyWithRelationships.length > 0) {
exist_companyWithRelationships.forEach(element => { exist_companyWithRelationships.forEach(element => {
//individualsControl.push(this.createIndividulas(element)) //individualsControl.push(this.createIndividulas(element))
companyWithRelationshipsControl.push(this.createCompaniesRelationshipWithData(element)); companyWithRelationshipsControl.push(this.createCompaniesRelationshipWithData(element));
}); });
} }
else if(exist_companyWithRelationships.length == 0) {
companyWithRelationshipsControl.push(this.createCompaniesRelationship());
}
// create companies // create companies
exist_companies = Object.keys(data.records.companies).map(function (key) { exist_companies = Object.keys(data.records.companies).map(function (key) {
@ -234,17 +266,21 @@ export class GeneralInfoComponent implements OnInit {
} }
else { else {
this.pd_applicants_details.forEach((element, key) => { this.pd_applicants_details.forEach((element, key) => {
console.log('element element',element);
element.is_applicant = true; element.is_applicant = true;
element.is_person_met = false; element.is_person_met = false;
element.is_new = false; element.is_new = false;
element.is_main_applicant = element.applicant_type == '1' ? true : false;
element.is_active = true;
element.individuals_order_id = key + 1; element.individuals_order_id = key + 1;
element.age = '', element.age = '',
element.qualification = '', element.qualification = '',
element.course_name = '', element.course_name = '',
individualsControl.push(this.createIndividulas(element)); individualsControl.push(this.createIndividulas(element));
personsWithRelationshipsControl.push(this.createPersonsWithRelationships(element)); personsWithRelationshipsControl.push(this.createPersonsWithRelationships(element));
//let relationControl = <FormArray>this._generalForm.controls['applicant_relation']; //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, 'individula_order_id':relationControl.controls.length+1}; // let applicant_details: any= {'pd_co_applicant_id':element.pd_co_applicant_id,'applicant_name':element.applicant_name, 'individula_order_id':relationControl.controls.length+1};
// relationControl.push(this.createApplicantRelation(applicant_details)); // relationControl.push(this.createApplicantRelation(applicant_details));
@ -259,6 +295,7 @@ export class GeneralInfoComponent implements OnInit {
companyControl.push(this.createCompanies(setCompanyValues)) companyControl.push(this.createCompanies(setCompanyValues))
} }
}); });
companyWithRelationshipsControl.push(this.createCompaniesRelationship());
// check company if null update one row // check company if null update one row
if (companyControl.controls.length == 0) { if (companyControl.controls.length == 0) {
let setCompanyValues: any = { company_order_id: companyControl.controls.length + 1, company_name: '', is_company_applicant: false, business_entity_type: '', business_entity_type_other: '', business_years: '', business_month: '', business_date_object: '', is_active: true, is_new: false } let setCompanyValues: any = { company_order_id: companyControl.controls.length + 1, company_name: '', is_company_applicant: false, business_entity_type: '', business_entity_type_other: '', business_years: '', business_month: '', business_date_object: '', is_active: true, is_new: false }
@ -269,8 +306,11 @@ export class GeneralInfoComponent implements OnInit {
}, error => this.errorMessage = <any>error); }, error => this.errorMessage = <any>error);
} }
/******************************* load form data Ends Here *************************/
// create individuals // create individuals
createIndividulas(elementValue: any) { createIndividulas(elementValue: any) {
return this._fb.group({ return this._fb.group({
pd_co_applicant_id: [elementValue.pd_co_applicant_id], pd_co_applicant_id: [elementValue.pd_co_applicant_id],
applicant_title_name: [elementValue.applicant_title_name], applicant_title_name: [elementValue.applicant_title_name],
@ -278,12 +318,15 @@ export class GeneralInfoComponent implements OnInit {
is_applicant: [elementValue.is_applicant], is_applicant: [elementValue.is_applicant],
is_person_met: [elementValue.is_person_met], is_person_met: [elementValue.is_person_met],
is_new: [elementValue.is_new], is_new: [elementValue.is_new],
is_main_applicant: [elementValue.is_main_applicant],
is_active: [elementValue.is_active],
individuals_order_id: [elementValue.individuals_order_id], individuals_order_id: [elementValue.individuals_order_id],
age: [elementValue.age], age: [elementValue.age],
qualification: [elementValue.qualification], qualification: [elementValue.qualification],
course_name: [elementValue.course_name] course_name: [elementValue.course_name]
}); });
} }
createPersonsWithRelationships(elementValue: any) { createPersonsWithRelationships(elementValue: any) {
return this._fb.group({ return this._fb.group({
pd_co_applicant_id: [elementValue.pd_co_applicant_id], pd_co_applicant_id: [elementValue.pd_co_applicant_id],
@ -291,8 +334,10 @@ export class GeneralInfoComponent implements OnInit {
relationship: [elementValue.relationship], relationship: [elementValue.relationship],
relation_to: [elementValue.relation_to], relation_to: [elementValue.relation_to],
individuals_order_id: [elementValue.individuals_order_id], individuals_order_id: [elementValue.individuals_order_id],
is_active:[elementValue.is_active]
}); });
} }
// create companies // create companies
createCompanies(elementValue: any) { createCompanies(elementValue: any) {
return this._fb.group({ return this._fb.group({
@ -449,15 +494,17 @@ export class GeneralInfoComponent implements OnInit {
.subscribe(dataresult => { .subscribe(dataresult => {
if (dataresult.data.length > 0) { if (dataresult.data.length > 0) {
dataresult.data.forEach((element, index) => { dataresult.data.forEach((element, index) => {
console.log('element',element);
let individualsControl = <FormArray>this._generalForm.controls['individuals']; let individualsControl = <FormArray>this._generalForm.controls['individuals'];
element.pd_co_applicant_id = this.count; element.pd_co_applicant_id = this.count;
this.count = this.count + 1; this.count = this.count + 1;
element.individuals_order_id = individualsControl.controls.length + 1; element.individuals_order_id = individualsControl.controls.length + 1;
element.is_new = true; element.is_new = true;
element.is_active = true;
element.is_main_applicant = false;
individualsControl.push(this.createIndividulas(element)); individualsControl.push(this.createIndividulas(element));
let relationControl = <FormArray>this._generalForm.controls['persons_with_relationships']; let relationControl = <FormArray>this._generalForm.controls['persons_with_relationships'];
let applicant_details: any= {'pd_co_applicant_id':element.pd_co_applicant_id,'applicant_name':element.applicant_name,'relationship':'','relation_to':'','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, 'relationship': '', 'relation_to': '', 'individuals_order_id': element.individuals_order_id,'is_active': element.is_active };
relationControl.push(this.createPersonsWithRelationships(applicant_details)); relationControl.push(this.createPersonsWithRelationships(applicant_details));
}); });
@ -467,6 +514,27 @@ export class GeneralInfoComponent implements OnInit {
} }
ApplicantName(event,coApplicantId){
let relationControl = <FormArray>this._generalForm.controls['persons_with_relationships'];
let index1 = relationControl.value.map(data => data.pd_co_applicant_id).indexOf(coApplicantId);
// details.value.applicant_name
let control = relationControl.controls[index1] as FormArray;
control.controls['applicant_name'].setValue(event.target.value);
// event.target.value
// controls.controls[index1].disable();
// let personsWithRelationshipsControl : any = <FormArray>control.controls[index1];
// personsWithRelationshipsControl.controls.is_applicant.setValue(false);
// control.markAsDirty({onlySelf:true});
// controls.removeAt(index1);
// let index1 = controls.value.map(data => data.applicant_name).indexOf(name);
}
// remove individuals // remove individuals
// removeIndividuals(findex){ // removeIndividuals(findex){
// let control = <FormArray>this._generalForm.controls['individuals']; // let control = <FormArray>this._generalForm.controls['individuals'];
@ -478,26 +546,27 @@ export class GeneralInfoComponent implements OnInit {
removeIndividuals(findex, details) { removeIndividuals(findex, details) {
let control = <FormArray>this._generalForm.controls['individuals']; let control = <FormArray>this._generalForm.controls['individuals'];
let individualsControl : any = <FormArray>control.controls[findex]; let individualsControl: any = <FormGroup>control.controls[findex];
individualsControl.controls.is_active.setValue(false);
// individualsControl.disable();
// individualsControl.controls.is_applicant.setValue(false); // individualsControl.controls.is_applicant.setValue(false);
// console.log(control.controls[findex].value.is_active);
// .controls.is_active.setValue(false); // .controls.is_active.setValue(false);
// console.log('control',control.dirty);
// console.log('control',control.dirty);
// control.markAsDirty({onlySelf:true}); // control.markAsDirty({onlySelf:true});
// console.log(control);
control.removeAt(findex); control.removeAt(findex);
let controls = <FormArray>this._generalForm.controls['persons_with_relationships']; let controls = <FormArray>this._generalForm.controls['persons_with_relationships'];
// console.log('control',control);
let name = details.value.applicant_name; let name = details.value.applicant_name;
let index1 = controls.value.map(data => data.applicant_name).indexOf(name); let index1 = controls.value.map(data => data.applicant_name).indexOf(name);
// controls.controls[index1].disable();
// let personsWithRelationshipsControl : any = <FormArray>control.controls[index1]; // let personsWithRelationshipsControl : any = <FormArray>control.controls[index1];
// personsWithRelationshipsControl.controls.is_applicant.setValue(false); // personsWithRelationshipsControl.controls.is_applicant.setValue(false);
// control.markAsDirty({onlySelf:true}); // control.markAsDirty({onlySelf:true});
// console.log('control',);
controls.removeAt(index1); controls.removeAt(index1);
} }
@ -515,7 +584,51 @@ export class GeneralInfoComponent implements OnInit {
} }
/** On Key Press Event For Amount */ // submit form details
submitGeneralForm(formData: any) {
if (this._generalForm.invalid) {
this.validateAllFormFields(this._generalForm);
this.notifier.notify('warning', 'Please Fill All Mandatory Fields.!');
return;
}
// else if(formData.applicant_relation.length==0){
// this.notifier.notify('warning', 'Please Choose Name of Person Met.!');
// }
else {
let saveRecords: any = {}
saveRecords.pdid = formData.pdid;
saveRecords.formid = formData.formid;
saveRecords.individuals = formData.individuals;
saveRecords.companies = formData.companies;
saveRecords.persons_with_relationships = formData.persons_with_relationships;
saveRecords.company_with_relationships = formData.company_with_relationships;
//saveRecords.applicant_relation=formData.applicant_relation;
saveRecords.general_remark = formData.general_remark;
this._pd.savePDFormDetailsWithID(saveRecords).subscribe(
dataresult => {
if (dataresult.status == 200) {
this.notifier.notify('success', 'Saved Successfully.');
setTimeout(() => {
this.dialogRef.close();
}, 3000);
}
else {
this.notifier.notify('warning', 'Something Wents Wrong Try Again.!');
// this.errorMessage = "Some Thing Wents Wrong Try Again !";
}
}, error => {
this.notifier.notify('warning', 'Something Wents Wrong Try Again.!');
// this.errorMessage = "Something Wents Wrong Try Again !";
});
}
}
/**************************** submit form details Ends Here ***********************/
/** On Key Press Event For Amount and Number Fields */
keyPress(event: any) { keyPress(event: any) {
const pattern = /[0-9]/; const pattern = /[0-9]/;
@ -525,7 +638,7 @@ export class GeneralInfoComponent implements OnInit {
} }
} }
// convert mkonth to year business has been running // convert month to year business has been running
ConvertMonthintoYearforBusiness(e, controlIndex) { ConvertMonthintoYearforBusiness(e, controlIndex) {
let control: any = this._generalForm.get('companies') as FormArray; let control: any = this._generalForm.get('companies') as FormArray;
control = control.controls[controlIndex]; control = control.controls[controlIndex];
@ -566,61 +679,6 @@ export class GeneralInfoComponent implements OnInit {
} }
// submit form details
submitGeneralForm(formData:any) {
if (this._generalForm.invalid) {
// console.log('if',this._generalForm.value);
this.validateAllFormFields(this._generalForm);
this.notifier.notify('warning', 'Please Fill All Mandatory Fields.!');
return;
}
// else if(formData.applicant_relation.length==0){
// console.log('else if',this._generalForm.value);
// this.notifier.notify('warning', 'Please Choose Name of Person Met.!');
// }
else{
let saveRecords:any = {}
saveRecords.pdid=formData.pdid;
saveRecords.formid=formData.formid;
saveRecords.individuals=formData.individuals;
saveRecords.companies=formData.companies;
saveRecords.persons_with_relationships=formData.persons_with_relationships;
saveRecords.company_with_relationships=formData.company_with_relationships;
//saveRecords.applicant_relation=formData.applicant_relation;
saveRecords.general_remark=formData.general_remark;
// console.log(saveRecords);
this._pd.savePDFormDetailsWithID(saveRecords).subscribe(
dataresult => {
if (dataresult.status == 200) {
this.notifier.notify('success', 'Saved Successfully.');
setTimeout(() =>{
this.dialogRef.close();
},3000);
}
else {
this.notifier.notify('warning', 'Something Wents Wrong Try Again.!');
// this.errorMessage = "Some Thing Wents Wrong Try Again !";
}
}, error => {
this.notifier.notify('warning', 'Something Wents Wrong Try Again.!');
// this.errorMessage = "Something Wents Wrong Try Again !";
});
}
}
// selectedfrequency(e,i){
// switch(+e){
// case 1: this.placeholderName[i] = 'Weekly Instalment Amount'; break;
// case 2: this.placeholderName[i] = 'Daily Instalment Amount'; break;
// case 3: this.placeholderName[i] = 'Annual Instalment Amount'; break;
// case 4: this.placeholderName[i] = 'Hourly Instalment Amount'; break;
// case 5: this.placeholderName[i] = 'EMI Amount'; break;
// case 6: this.placeholderName[i] = 'Quarterly Instalment Amount'; break;
// case 7: this.placeholderName[i] = 'Halfyearly Instalment Amount'; break;
// default : this.placeholderName[i] = ''; break;
// }
// }
// validate all form group and form array fields // validate all form group and form array fields
validateAllFormFields(formGroup: any) { validateAllFormFields(formGroup: any) {
@ -636,7 +694,6 @@ validateAllFormFields(formGroup: any) {
} }
}); });
} }
/******************* validate all form group and form array fields ENd Here ********/
} }

View File

@ -47,7 +47,7 @@ export class LenderRepresentativeComponent implements OnInit {
this.lender_applicant_id = this.pd_all_details.pdmaster_details.lender_applicant_id; this.lender_applicant_id = this.pd_all_details.pdmaster_details.lender_applicant_id;
this.subproduct_abbr = this.pd_all_details.pdmaster_details.subproduct_abbr; this.subproduct_abbr = this.pd_all_details.pdmaster_details.subproduct_abbr;
this.customer_segment_abbr = this.pd_all_details.pdmaster_details.customer_segment_abbr; this.customer_segment_abbr = this.pd_all_details.pdmaster_details.customer_segment_abbr;
// console.log(this.main_applicant+','+this.lender_applicant_id+','+this.subproduct_abbr+','+this.customer_segment_abbr);
this.form_id = 15; this.form_id = 15;
this.notifier = notifier; this.notifier = notifier;
} }
@ -78,8 +78,6 @@ export class LenderRepresentativeComponent implements OnInit {
}; };
// open() { // open() {
// // console.log('hai');
// const config = new MatSnackBarConfig(); // const config = new MatSnackBarConfig();
// config.duration = this.autoHide; // config.duration = this.autoHide;
// config.panelClass = this.addExtraClass ? ['party'] : null; // config.panelClass = this.addExtraClass ? ['party'] : null;

View File

@ -5,7 +5,10 @@
{{pageTitle}} {{pageTitle}}
</div> </div>
<div fxFlex="30" align="end" style="padding: 10px !important;"> <div fxFlex="30" align="end" style="padding: 10px !important;">
<button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Close" matTooltipPosition="right" mat-dialog-close><mat-icon>close</mat-icon></button> <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Close"
matTooltipPosition="right" mat-dialog-close>
<mat-icon>close</mat-icon>
</button>
</div> </div>
</h2> </h2>
@ -20,14 +23,23 @@
<mat-card> <mat-card>
<mat-card-content class="matcard"> <mat-card-content class="matcard">
<mat-form-field style="width: 64%"> <mat-form-field style="width: 64%">
<input matInput placeholder="Loan Amount Applied for ? " formControlName="loan_amount" (keypress)="keyPress($event)" (keyup)="inWords($event,1)" (change)="loanCalc()" autocomplete="off"> <input matInput placeholder="Loan Amount Applied for ? " formControlName="loan_amount"
<mat-hint align="start" style="font-size:90%" *ngIf="loanDetailsForm.controls['loan_amount'].value != ''">{{"&#8377;"}} {{loanAmtInWords}} Only</mat-hint> (keypress)="keyPress($event)" (keyup)="inWords($event,1)" (change)="loanCalc()"
autocomplete="off">
<mat-hint align="start" style="font-size:90%" *ngIf="loanDetailsForm.controls['loan_amount'].value != ''">{{"&#8377;"}}
{{loanAmtInWords}} Only</mat-hint>
</mat-form-field> </mat-form-field>
<mat-form-field style="width: 64%"> <mat-form-field style="width: 64%">
<mat-select multiple (selectionChange)="endUserChange($event.value)" placeholder="What is the end use" formControlName="end_use" > <mat-select multiple (selectionChange)="endUserChange($event.value)"
<mat-option *ngFor="let enduse of m_endUseForLoan" [value]="enduse.enduse_of_loan_id">{{ enduse.enduse_of_loan}}</mat-option> placeholder="What is the end use" formControlName="end_use">
<mat-option *ngFor="let enduse of m_endUseForLoan" [value]="enduse.enduse_of_loan_id">{{
enduse.enduse_of_loan}}</mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<mat-form-field *ngIf="isOtherPurpose" style="width: 28%">
<input matInput placeholder="Specify End Use" formControlName="end_use_other"
autocomplete="off">
</mat-form-field>
<mat-form-field style="width: 64%"> <mat-form-field style="width: 64%">
<mat-select placeholder="Is there a balance transfer ? " (selectionChange)="selectedBalancesTransferChanges($event)" <mat-select placeholder="Is there a balance transfer ? " (selectionChange)="selectedBalancesTransferChanges($event)"
formControlName="is_transfer"> formControlName="is_transfer">
@ -35,15 +47,16 @@
<mat-option value="no">No</mat-option> <mat-option value="no">No</mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<mat-form-field *ngIf="isOtherPurpose" style="width: 28%">
<input matInput placeholder="Specify End Use" formControlName="end_use_other" autocomplete="off">
</mat-form-field>
<!-- </div> --> <!-- </div> -->
<span *ngIf="loanDetailsForm.controls['is_transfer'].value == 'yes' && loanDetailsForm.controls['is_transfer'].value != ''"> <span *ngIf="loanDetailsForm.controls['is_transfer'].value == 'yes' && loanDetailsForm.controls['is_transfer'].value != ''">
<mat-form-field style="width: 64%"> <mat-form-field style="width: 64%">
<input matInput placeholder="What is the amount for Balance Transfer ? " (keypress)="keyPress($event)" formControlName="balance_transfer_amount" (keyup)="inWords($event,2)" (change)="loanCalc()" autocomplete="off"> <input matInput placeholder="What is the amount for Balance Transfer ? "
<mat-hint align="start" style="font-size:90%" *ngIf="loanDetailsForm.controls['loan_amount'].value != ''">{{"&#8377;"}} {{balTxrfAmtInWords}} Only</mat-hint> (keypress)="keyPress($event)" formControlName="balance_transfer_amount"
(keyup)="inWords($event,2)" (change)="loanCalc()" autocomplete="off">
<mat-hint align="start" style="font-size:90%" *ngIf="loanDetailsForm.controls['loan_amount'].value != ''">{{"&#8377;"}}
{{balTxrfAmtInWords}} Only</mat-hint>
</mat-form-field> </mat-form-field>
<!-- <mat-form-field style="width:28%"> <!-- <mat-form-field style="width:28%">
<mat-select placeholder="Is there a Top Up" <mat-select placeholder="Is there a Top Up"
@ -55,24 +68,30 @@
<mat-form-field style="width: 64%"> <mat-form-field style="width: 64%">
<mat-select placeholder="Lender from where balance transfer done" <mat-select placeholder="Lender from where balance transfer done"
formControlName="lender"> formControlName="lender">
<mat-option *ngFor="let btLen of m_btLenderList" [value]="btLen.bt_lender_list_id">{{ btLen.lender_name }}</mat-option> <mat-option *ngFor="let btLen of m_btLenderList" [value]="btLen.bt_lender_list_id">{{
btLen.lender_name }}</mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<mat-form-field *ngIf="loanDetailsForm.controls['lender'].value == 1" style="width: 28%"> <mat-form-field *ngIf="loanDetailsForm.controls['lender'].value == 1" style="width: 28%">
<input matInput placeholder="Specify Others Lender" formControlName="other_bt_lender" autocomplete="off"> <input matInput placeholder="Specify Others Lender" formControlName="other_bt_lender"
autocomplete="off">
</mat-form-field> </mat-form-field>
<mat-form-field style="width: 64%"> <mat-form-field style="width: 64%">
<input matInput placeholder="Top Up Amount" (keypress)="keyPress($event)" formControlName="topup_amount" (keyup)="inWords($event,5)" autocomplete="off"> <input matInput placeholder="Top Up Amount" (keypress)="keyPress($event)"
<mat-hint align="start" style="font-size:90%" *ngIf="loanDetailsForm.controls['topup_amount'].value != ''">{{"&#8377;"}} {{topUpAmtInWords}} Only</mat-hint> formControlName="topup_amount" (keyup)="inWords($event,5)"
autocomplete="off">
<mat-hint align="start" style="font-size:90%" *ngIf="loanDetailsForm.controls['topup_amount'].value != ''">{{"&#8377;"}}
{{topUpAmtInWords}} Only</mat-hint>
</mat-form-field> </mat-form-field>
<mat-form-field style="width:64%" *ngIf="loanDetailsForm.controls['topup_amount'].value > 0 "> <mat-form-field style="width:64%" *ngIf="loanDetailsForm.controls['topup_amount'].value > 0 ">
<mat-select placeholder="What is the End Use of the Top Up?" <mat-select placeholder="What is the End Use of the Top Up?"
formControlName="end_use_topup"> formControlName="end_use_topup">
<mat-option *ngFor="let list of m_endUseOFTopUpList" [value]="list.end_use_of_topup_id">{{ list.end_use_of_topup }}</mat-option> <mat-option *ngFor="let list of m_endUseOFTopUpList" [value]="list.end_use_of_topup_id">{{
list.end_use_of_topup }}</mat-option>
<!-- <mat-option value=2>Business Use.</mat-option> <!-- <mat-option value=2>Business Use.</mat-option>
<mat-option value=3>Childs Marriage.</mat-option> <mat-option value=3>Childs Marriage.</mat-option>
<mat-option value=4>Furniture & Finishing of House Property.</mat-option> <mat-option value=4>Furniture & Finishing of House Property.</mat-option>
@ -82,20 +101,27 @@
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<mat-form-field *ngIf="loanDetailsForm.controls['end_use_topup'].value == 1" style="width: 28%"> <mat-form-field *ngIf="loanDetailsForm.controls['end_use_topup'].value == 1"
<input matInput placeholder="Specify End Use of Top Up" formControlName="other_end_use_topup" autocomplete="off"> style="width: 28%">
<input matInput placeholder="Specify End Use of Top Up" formControlName="other_end_use_topup"
autocomplete="off">
</mat-form-field> </mat-form-field>
</span> </span>
<span *ngIf="loanDetailsForm.controls['is_transfer'].value != 'yes' && loanDetailsForm.controls['is_transfer'].value != '' && !isContribution"> <span *ngIf="loanDetailsForm.controls['is_transfer'].value != 'yes' && loanDetailsForm.controls['is_transfer'].value != '' && !isContribution">
<mat-form-field style="width: 64%"> <mat-form-field style="width: 64%">
<input matInput placeholder="Amount of Own Contribution" formControlName="own_contribution" (keypress)="keyPress($event)" (keyup)="inWords($event,4)" autocomplete="off"> <input matInput placeholder="Amount of Own Contribution"
<mat-hint align="start" style="font-size:90%" *ngIf="loanDetailsForm.controls['own_contribution'].value != ''">{{"&#8377;"}} {{ownContributionInWords}} Only</mat-hint> formControlName="own_contribution" (keypress)="keyPress($event)"
(keyup)="inWords($event,4)" autocomplete="off">
<mat-hint align="start" style="font-size:90%" *ngIf="loanDetailsForm.controls['own_contribution'].value != ''">{{"&#8377;"}}
{{ownContributionInWords}} Only</mat-hint>
</mat-form-field> </mat-form-field>
<mat-form-field style="width: 28%"> <mat-form-field style="width: 28%">
<mat-select (selectionChange)="sourceChange($event.value)" placeholder="Source of Own Contribution" formControlName="source" multiple> <mat-select (selectionChange)="sourceChange($event.value)" placeholder="Source of Own Contribution"
<mat-option *ngFor="let sour of m_sourceofamount" [value]="sour.id">{{ sour.name }}</mat-option> formControlName="source" multiple>
<mat-option *ngFor="let sour of m_sourceofamount" [value]="sour.id">{{
sour.name }}</mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
@ -104,35 +130,43 @@
</mat-form-field> --> </mat-form-field> -->
<mat-form-field *ngIf="isOtherSource" style="width: 28%"> <mat-form-field *ngIf="isOtherSource" style="width: 28%">
<input matInput placeholder="Specify Other Sources" formControlName="other_source" autocomplete="off"> <input matInput placeholder="Specify Other Sources" formControlName="other_source"
autocomplete="off">
</mat-form-field> </mat-form-field>
</span> </span>
<mat-form-field style="width: 64%"> <mat-form-field style="width: 64%">
<input matInput placeholder="EMI Amount Comfortable Paying" formControlName="emi_level" (keypress)="keyPress($event)" (keyup)="inWords($event,6)" autocomplete="off"> <input matInput placeholder="EMI Amount Comfortable Paying" formControlName="emi_level"
<mat-hint align="start" style="font-size:90%" *ngIf="loanDetailsForm.controls['emi_level'].value != ''">{{"&#8377;"}} {{emiAmtInWords}} Only</mat-hint> (keypress)="keyPress($event)" (keyup)="inWords($event,6)" autocomplete="off">
<mat-hint align="start" style="font-size:90%" *ngIf="loanDetailsForm.controls['emi_level'].value != ''">{{"&#8377;"}}
{{emiAmtInWords}} Only</mat-hint>
</mat-form-field> </mat-form-field>
</mat-card-content> </mat-card-content>
</mat-card> </mat-card>
<!-- <div *ngIf="productAbbr === 'HL' || productAbbr === 'LL' || productAbbr === 'LAP' "> --> <!-- <div *ngIf="productAbbr === 'HL' || productAbbr === 'LL' || productAbbr === 'LAP' "> -->
<mat-card *ngIf="mortageCardAccess"> <mat-card *ngIf="mortageCardAccess">
<mat-card-header><p>Details of Property being Mortgaged</p></mat-card-header> <mat-card-header>
<p>Details of Property being Mortgaged</p>
</mat-card-header>
<mat-card-content class="matcard"> <mat-card-content class="matcard">
<mat-form-field style="width:50%;"> <mat-form-field style="width:50%;">
<mat-select placeholder="Type of Property" formControlName="property_type" (selectionChange)="mortage_type($event.value)" > <mat-select placeholder="Type of Property" formControlName="property_type"
<mat-option *ngFor="let typeprop of m_mortageTypeProperty" [value]="typeprop.mortage_property_id">{{ typeprop.property_name }}</mat-option> (selectionChange)="mortage_type($event.value)">
<mat-option *ngFor="let typeprop of m_mortageTypeProperty" [value]="typeprop.mortage_property_id">{{
typeprop.property_name }}</mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<mat-form-field *ngIf="mortageAccess" style="width:50%;"> <mat-form-field *ngIf="mortageAccess" style="width:50%;">
<input matInput placeholder="Specify Type of Property" formControlName="property_type_others" autocomplete="off"> <input matInput placeholder="Specify Type of Property" formControlName="property_type_others"
autocomplete="off">
</mat-form-field> </mat-form-field>
<mat-form-field style="width:50%;"> <mat-form-field style="width:50%;">
<mat-select multiple placeholder="Name of the Owner" <mat-select multiple placeholder="Name of the Owner" formControlName="owner_name"
formControlName="owner_name" [compareWith]="compareObjects" > [compareWith]="compareObjects">
<mat-optgroup *ngFor="let group of mergeCompanyApplicant" [label]="group.groupName"> <mat-optgroup *ngFor="let group of mergeCompanyApplicant" [label]="group.groupName">
<mat-option *ngFor="let val of group.groupValues" [value]="val"> <mat-option *ngFor="let val of group.groupValues" [value]="val">
{{val.name}} {{val.name}}
@ -166,14 +200,17 @@
<mat-form-field style="width:50%;"> <mat-form-field style="width:50%;">
<mat-select placeholder="Status of Construction" formControlName="construction_status"> <mat-select placeholder="Status of Construction" formControlName="construction_status">
<mat-option *ngFor="let status of m_statusofCunstruction" [value]="status.id">{{ status.name }}</mat-option> <mat-option *ngFor="let status of m_statusofCunstruction" [value]="status.id">{{
status.name }}</mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<mat-form-field style="width:50%"> <mat-form-field style="width:50%">
<input matInput placeholder="Estimate Market Value as Per Customer" <input matInput placeholder="Estimate Market Value as Per Customer"
formControlName="emv_per_customer" (keypress)="keyPress($event)" (keyup)="inWords($event,7)" autocomplete="off"> formControlName="emv_per_customer" (keypress)="keyPress($event)"
<mat-hint align="start" style="font-size:90%" *ngIf="loanDetailsForm.controls['emv_per_customer'].value != ''">{{"&#8377;"}} {{emvAmtInWords}} Only</mat-hint> (keyup)="inWords($event,7)" autocomplete="off">
<mat-hint align="start" style="font-size:90%" *ngIf="loanDetailsForm.controls['emv_per_customer'].value != ''">{{"&#8377;"}}
{{emvAmtInWords}} Only</mat-hint>
</mat-form-field> </mat-form-field>
</mat-card-content> </mat-card-content>
@ -234,43 +271,91 @@
<div fxFlex="row"> <div fxFlex="row">
<div fxFlex="100" class="m-gap p-gap"> <div fxFlex="100" class="m-gap p-gap">
<div fxLayout="row" fxLayoutWrap="wrap"> <div fxLayout="row" fxLayoutWrap="wrap">
<div class="text-center mb-2 hover-icon" fxFlex.xs="50" fxFlex.sm="50" fxFlex.md="20" fxFlex.lg="20" fxFlex.xl="20"> <div class="text-center mb-2 hover-icon" fxFlex.xs="50" fxFlex.sm="50"
<a href="http://www.google.com"><mat-icon style="color: #e00201;font-size: 60px !important;width:inherit !important;">picture_as_pdf</mat-icon> <span class="d-block">version_111</span></a> fxFlex.md="20" fxFlex.lg="20" fxFlex.xl="20">
<a href="http://www.google.com">
<mat-icon style="color: #e00201;font-size: 60px !important;width:inherit !important;">picture_as_pdf</mat-icon>
<span class="d-block">version_111</span>
</a>
</div> </div>
<div class="text-center mb-2 hover-icon" fxFlex.xs="50" fxFlex.sm="50" fxFlex.md="20" fxFlex.lg="20" fxFlex.xl="20"> <div class="text-center mb-2 hover-icon" fxFlex.xs="50" fxFlex.sm="50"
<a href="http://www.google.com"><mat-icon style="color: #e00201;font-size: 60px !important;width:inherit !important;">picture_as_pdf</mat-icon> <span class="d-block">version_111</span></a> fxFlex.md="20" fxFlex.lg="20" fxFlex.xl="20">
<a href="http://www.google.com">
<mat-icon style="color: #e00201;font-size: 60px !important;width:inherit !important;">picture_as_pdf</mat-icon>
<span class="d-block">version_111</span>
</a>
</div> </div>
<div class="text-center mb-2 hover-icon" fxFlex.xs="50" fxFlex.sm="50" fxFlex.md="20" fxFlex.lg="20" fxFlex.xl="20"> <div class="text-center mb-2 hover-icon" fxFlex.xs="50" fxFlex.sm="50"
<a href="http://www.google.com"><mat-icon style="color: #e00201;font-size: 60px !important;width:inherit !important;">picture_as_pdf</mat-icon> <span class="d-block">version_111</span></a> fxFlex.md="20" fxFlex.lg="20" fxFlex.xl="20">
<a href="http://www.google.com">
<mat-icon style="color: #e00201;font-size: 60px !important;width:inherit !important;">picture_as_pdf</mat-icon>
<span class="d-block">version_111</span>
</a>
</div> </div>
<div class="text-center mb-2 hover-icon" fxFlex.xs="50" fxFlex.sm="50" fxFlex.md="20" fxFlex.lg="20" fxFlex.xl="20"> <div class="text-center mb-2 hover-icon" fxFlex.xs="50" fxFlex.sm="50"
<a href="http://www.google.com"><mat-icon style="color: #e00201;font-size: 60px !important;width:inherit !important;">picture_as_pdf</mat-icon> <span class="d-block">version_111</span></a> fxFlex.md="20" fxFlex.lg="20" fxFlex.xl="20">
<a href="http://www.google.com">
<mat-icon style="color: #e00201;font-size: 60px !important;width:inherit !important;">picture_as_pdf</mat-icon>
<span class="d-block">version_111</span>
</a>
</div> </div>
<div class="text-center mb-2 hover-icon" fxFlex.xs="50" fxFlex.sm="50" fxFlex.md="20" fxFlex.lg="20" fxFlex.xl="20"> <div class="text-center mb-2 hover-icon" fxFlex.xs="50" fxFlex.sm="50"
<a href="http://www.google.com"><mat-icon style="color: #e00201;font-size: 60px !important;width:inherit !important;">picture_as_pdf</mat-icon> <span class="d-block">version_111</span></a> fxFlex.md="20" fxFlex.lg="20" fxFlex.xl="20">
<a href="http://www.google.com">
<mat-icon style="color: #e00201;font-size: 60px !important;width:inherit !important;">picture_as_pdf</mat-icon>
<span class="d-block">version_111</span>
</a>
</div> </div>
<div class="text-center mb-2 hover-icon" fxFlex.xs="50" fxFlex.sm="50" fxFlex.md="20" fxFlex.lg="20" fxFlex.xl="20"> <div class="text-center mb-2 hover-icon" fxFlex.xs="50" fxFlex.sm="50"
<a href="http://www.google.com"><mat-icon style="color: #e00201;font-size: 60px !important;width:inherit !important;">picture_as_pdf</mat-icon> <span class="d-block">version_111</span></a> fxFlex.md="20" fxFlex.lg="20" fxFlex.xl="20">
<a href="http://www.google.com">
<mat-icon style="color: #e00201;font-size: 60px !important;width:inherit !important;">picture_as_pdf</mat-icon>
<span class="d-block">version_111</span>
</a>
</div> </div>
</div> </div>
<div fxLayout="row" fxLayoutWrap="wrap"> <div fxLayout="row" fxLayoutWrap="wrap">
<div class="text-center mb-2 hover-icon" fxFlex.xs="50" fxFlex.sm="50" fxFlex.md="25" fxFlex.lg="25" fxFlex.xl="25"> <div class="text-center mb-2 hover-icon" fxFlex.xs="50" fxFlex.sm="50"
<a href="http://www.google.com"><mat-icon style="color: #e00201;font-size: 60px !important;width:inherit !important;">picture_as_pdf</mat-icon> <span class="d-block">version_111</span></a> fxFlex.md="25" fxFlex.lg="25" fxFlex.xl="25">
<a href="http://www.google.com">
<mat-icon style="color: #e00201;font-size: 60px !important;width:inherit !important;">picture_as_pdf</mat-icon>
<span class="d-block">version_111</span>
</a>
</div> </div>
<div class="text-center mb-2 hover-icon" fxFlex.xs="50" fxFlex.sm="50" fxFlex.md="25" fxFlex.lg="25" fxFlex.xl="25"> <div class="text-center mb-2 hover-icon" fxFlex.xs="50" fxFlex.sm="50"
<a href="http://www.google.com"><mat-icon style="color: #e00201;font-size: 60px !important;width:inherit !important;">picture_as_pdf</mat-icon> <span class="d-block">version_111</span></a> fxFlex.md="25" fxFlex.lg="25" fxFlex.xl="25">
<a href="http://www.google.com">
<mat-icon style="color: #e00201;font-size: 60px !important;width:inherit !important;">picture_as_pdf</mat-icon>
<span class="d-block">version_111</span>
</a>
</div> </div>
<div class="text-center mb-2 hover-icon" fxFlex.xs="50" fxFlex.sm="50" fxFlex.md="25" fxFlex.lg="25" fxFlex.xl="25"> <div class="text-center mb-2 hover-icon" fxFlex.xs="50" fxFlex.sm="50"
<a href="http://www.google.com"><mat-icon style="color: #e00201;font-size: 60px !important;width:inherit !important;">picture_as_pdf</mat-icon> <span class="d-block">version_111</span></a> fxFlex.md="25" fxFlex.lg="25" fxFlex.xl="25">
<a href="http://www.google.com">
<mat-icon style="color: #e00201;font-size: 60px !important;width:inherit !important;">picture_as_pdf</mat-icon>
<span class="d-block">version_111</span>
</a>
</div> </div>
<div class="text-center mb-2 hover-icon" fxFlex.xs="50" fxFlex.sm="50" fxFlex.md="25" fxFlex.lg="25" fxFlex.xl="25"> <div class="text-center mb-2 hover-icon" fxFlex.xs="50" fxFlex.sm="50"
<a href="http://www.google.com"><mat-icon style="color: #e00201;font-size: 60px !important;width:inherit !important;">picture_as_pdf</mat-icon> <span class="d-block">version_111</span></a> fxFlex.md="25" fxFlex.lg="25" fxFlex.xl="25">
<a href="http://www.google.com">
<mat-icon style="color: #e00201;font-size: 60px !important;width:inherit !important;">picture_as_pdf</mat-icon>
<span class="d-block">version_111</span>
</a>
</div> </div>
<div class="text-center mb-2 hover-icon" fxFlex.xs="50" fxFlex.sm="50" fxFlex.md="20" fxFlex.lg="20" fxFlex.xl="20"> <div class="text-center mb-2 hover-icon" fxFlex.xs="50" fxFlex.sm="50"
<a href="http://www.google.com"><mat-icon style="color: #e00201;font-size: 60px !important;width:inherit !important;">picture_as_pdf</mat-icon> <span class="d-block">version_111</span></a> fxFlex.md="20" fxFlex.lg="20" fxFlex.xl="20">
<a href="http://www.google.com">
<mat-icon style="color: #e00201;font-size: 60px !important;width:inherit !important;">picture_as_pdf</mat-icon>
<span class="d-block">version_111</span>
</a>
</div> </div>
<div class="text-center mb-2 hover-icon" fxFlex.xs="50" fxFlex.sm="50" fxFlex.md="20" fxFlex.lg="20" fxFlex.xl="20"> <div class="text-center mb-2 hover-icon" fxFlex.xs="50" fxFlex.sm="50"
<a href="http://www.google.com"><mat-icon style="color: #e00201;font-size: 60px !important;width:inherit !important;">picture_as_pdf</mat-icon> <span class="d-block">version_111</span></a> fxFlex.md="20" fxFlex.lg="20" fxFlex.xl="20">
<a href="http://www.google.com">
<mat-icon style="color: #e00201;font-size: 60px !important;width:inherit !important;">picture_as_pdf</mat-icon>
<span class="d-block">version_111</span>
</a>
</div> </div>
</div> </div>
</div> </div>
@ -294,7 +379,9 @@
<div fxFlex="40" align="end"> <div fxFlex="40" align="end">
<button type="submit" class="mr-1 mb-1 hover-icon" mat-raised-button mat-icon-button matTooltip="Submit" matTooltipPosition="above" (click)="submitLoanDetails()"><mat-icon>save</mat-icon> <button type="submit" class="mr-1 mb-1 hover-icon" mat-raised-button mat-icon-button matTooltip="Submit"
matTooltipPosition="above" (click)="submitLoanDetails()">
<mat-icon>save</mat-icon>
</button> </button>
</div> </div>
</mat-dialog-actions> </mat-dialog-actions>

View File

@ -523,8 +523,7 @@ getM_sourceofamount() {
this.isOtherPurpose = true; this.isOtherPurpose = true;
this.loanDetailsForm.controls['end_use_other'].setValidators([Validators.required]); this.loanDetailsForm.controls['end_use_other'].setValidators([Validators.required]);
}else } else {
{
this.loanDetailsForm.controls['end_use_other'].clearValidators(); this.loanDetailsForm.controls['end_use_other'].clearValidators();
this.isOtherPurpose = false; this.isOtherPurpose = false;
} }
@ -574,6 +573,18 @@ getM_sourceofamount() {
} }
submitLoanDetails() { submitLoanDetails() {
if ((this.isContribution == true) && (this.loanDetailsForm.controls['is_transfer'].value != 'yes')) {
this.loanDetailsForm.controls['own_contribution'].setValue('');
this.loanDetailsForm.controls['own_contribution'].clearValidators();
this.loanDetailsForm.controls['own_contribution'].updateValueAndValidity();
this.loanDetailsForm.controls['other_source'].setValue('');
this.loanDetailsForm.controls['other_source'].clearValidators();
this.loanDetailsForm.controls['other_source'].updateValueAndValidity();
this.loanDetailsForm.controls['source'].setValue('');
this.loanDetailsForm.controls['source'].clearValidators();
this.loanDetailsForm.controls['source'].updateValueAndValidity();
}
if (this.loanDetailsForm.controls['lender'].value == 1) { if (this.loanDetailsForm.controls['lender'].value == 1) {
this.loanDetailsForm.controls['other_bt_lender'].setValidators([Validators.required]); this.loanDetailsForm.controls['other_bt_lender'].setValidators([Validators.required]);
this.loanDetailsForm.controls['other_bt_lender'].updateValueAndValidity(); this.loanDetailsForm.controls['other_bt_lender'].updateValueAndValidity();
@ -790,8 +801,7 @@ getM_sourceofamount() {
/** /**
* mortage_type * mortage_type
*/ */
mortage_type(mortage_value) mortage_type(mortage_value) {
{
//let mortagetypes = this.m_mortageTypeProperty.filter(mor=>mor.mortage_property_id==mortage_value)[0]; //let mortagetypes = this.m_mortageTypeProperty.filter(mor=>mor.mortage_property_id==mortage_value)[0];
let mortagetypes = this.m_mortageTypeProperty.filter(mor => mor.mortage_property_id == mortage_value)[0]; let mortagetypes = this.m_mortageTypeProperty.filter(mor => mor.mortage_property_id == mortage_value)[0];
@ -810,13 +820,11 @@ getM_sourceofamount() {
/** /**
* LoanCalculation * LoanCalculation
*/ */
loanCalc() loanCalc() {
{
let BtAmount: number = +this.loanDetailsForm.value.balance_transfer_amount; let BtAmount: number = +this.loanDetailsForm.value.balance_transfer_amount;
let loanAmount: number = +this.loanDetailsForm.value.loan_amount; let loanAmount: number = +this.loanDetailsForm.value.loan_amount;
let topupAmt; let topupAmt;
if(BtAmount !=null && loanAmount !=null) if (BtAmount != null && loanAmount != null) {
{
if (loanAmount >= BtAmount) { if (loanAmount >= BtAmount) {
topupAmt = loanAmount - BtAmount; topupAmt = loanAmount - BtAmount;
this.loanDetailsForm.controls['topup_amount'].setValue(topupAmt); this.loanDetailsForm.controls['topup_amount'].setValue(topupAmt);

View File

@ -101,7 +101,7 @@ public viewerOptions: any = {
this.getMasterDetails('EDUQUALIFICATION',3); this.getMasterDetails('EDUQUALIFICATION',3);
this.getMasterDetails('NONINDIVIDUALENTITIES',4); this.getMasterDetails('NONINDIVIDUALENTITIES',4);
this.mainApplicantDetails = this.pd_all_details.pdapplicants_detials.filter(item => item.applicant_type == 1); this.mainApplicantDetails = this.pd_all_details.pdapplicants_detials.filter(item => item.applicant_type == 1);
// console.log(this.mainApplicantDetails)
this.coApplicantDetails = this.pd_all_details.pdapplicants_detials.filter(item => item.applicant_type == 0); this.coApplicantDetails = this.pd_all_details.pdapplicants_detials.filter(item => item.applicant_type == 0);
} }
@ -414,13 +414,10 @@ validateAllFormFields(formGroup: any) {
// selectedAccTypeChanges(event: any){ // selectedAccTypeChanges(event: any){
// console.log('First Time',event);
// console.log('First Time Value',event.value);
// if(event.value == 2) { // if(event.value == 2) {
// const control = <FormArray>this.bankingForm.controls['itemRows']; // const control = <FormArray>this.bankingForm.controls['itemRows'];
// console.log('Inside If Condition');
// console.log(control);
// console.log(control.controls);
// control.controls[0].get('limit').clearValidators(); // control.controls[0].get('limit').clearValidators();
// control.controls[0].get('limit').updateValueAndValidity(); // control.controls[0].get('limit').updateValueAndValidity();
@ -430,7 +427,7 @@ validateAllFormFields(formGroup: any) {
// // this.bankingForm.controls.get('limit').clearValidators(); // // this.bankingForm.controls.get('limit').clearValidators();
// // this.bankingForm.controls.itemRows['controls'].get('limit').updateValueAndValidity(); // // this.bankingForm.controls.itemRows['controls'].get('limit').updateValueAndValidity();
// // const control = <FormArray>this.bankingForm.controls['itemRows']; // // const control = <FormArray>this.bankingForm.controls['itemRows'];
// // console.log(control.controls['limit'].value);
// } // }
// else{ // else{

View File

@ -87,13 +87,13 @@ export class RentalInfoComponent implements OnInit {
control.push(this.createpropertyArray()); control.push(this.createpropertyArray());
const parentControl = <FormGroup>this.rentalForm.controls['rental_home']['controls'][index]; const parentControl = <FormGroup>this.rentalForm.controls['rental_home']['controls'][index];
const sub = <FormArray>parentControl.controls['details_tenants']; const sub = <FormArray>parentControl.controls['details_tenants'];
console.log('control', parentControl); // console.log('control', parentControl);
subArray = Object.keys(datas.details_tenants).map(function (key) { subArray = Object.keys(datas.details_tenants).map(function (key) {
return datas.details_tenants[key]; return datas.details_tenants[key];
}); });
if (subArray.length > 0) { if (subArray.length > 0) {
subArray.forEach((val) => { subArray.forEach((val) => {
console.log('val', val); // console.log('val', val);
sub.push(this.createTenatsArray()); sub.push(this.createTenatsArray());
}) })
sub.removeAt(0); sub.removeAt(0);
@ -176,8 +176,8 @@ export class RentalInfoComponent implements OnInit {
addTenant(parentIndex:number) { addTenant(parentIndex:number) {
const parentControl = <FormGroup>this.rentalForm.controls['rental_home']['controls'][parentIndex]; const parentControl = <FormGroup>this.rentalForm.controls['rental_home']['controls'][parentIndex];
const control = <FormArray>parentControl.controls['details_tenants']; const control = <FormArray>parentControl.controls['details_tenants'];
console.log(parentControl); // console.log(parentControl);
console.log(control); // console.log(control);
control.push(this.createTenatsArray()); control.push(this.createTenatsArray());
} }