forms : ps

This commit is contained in:
venbatechnologies@gmail.com 2019-03-11 19:54:15 +05:30
parent c23addbc7c
commit 1fff549130
35 changed files with 9756 additions and 8547 deletions

View File

@ -3,7 +3,8 @@
<h2 mat-dialog-title class="paragraph_change"> <h2 mat-dialog-title class="paragraph_change">
<div fxFlex="70" align="left" style="padding: 10px !important;"> <div fxFlex="70" align="left" style="padding: 10px !important;">
<span>{{main_applicant}} ({{lender_applicant_id}}), {{customer_segment_abbr}} <span *ngIf="subproduct_abbr">- {{subproduct_abbr}} </span></span><br> <span>{{main_applicant}} ({{lender_applicant_id}}), {{customer_segment_abbr}} <span *ngIf="subproduct_abbr">-
{{subproduct_abbr}} </span></span><br>
{{pageTitle}} {{pageTitle}}
</div> </div>
<div fxFlex="30" align="end" style="padding: 10px !important;"> <div fxFlex="30" align="end" style="padding: 10px !important;">
@ -138,8 +139,8 @@
<div fxFlex="100" fxLayout="nowrap"> <div fxFlex="100" fxLayout="nowrap">
<mat-form-field style="width: 46%;"> <mat-form-field style="width: 46%;">
<input matInput [placeholder]="placeholderName[i] ? placeholderName[i] : 'Estimated area of the (Address Type)'" formControlName="estimated_area" <input matInput [placeholder]="placeholderName[i] ? placeholderName[i] : 'Estimated area of the (Address Type)'"
OnlyNumber type="text"> formControlName="estimated_area" OnlyNumber type="text">
</mat-form-field> </mat-form-field>
<mat-form-field style="width: 46%;"> <mat-form-field style="width: 46%;">

View File

@ -2,11 +2,15 @@
<h2 mat-dialog-title class="paragraph_change"> <h2 mat-dialog-title class="paragraph_change">
<div fxFlex="70" align="left" style="padding: 10px !important;"> <div fxFlex="70" align="left" style="padding: 10px !important;">
<span>{{main_applicant}} ({{lender_applicant_id}}), {{customer_segment_abbr}} <span *ngIf="subproduct_abbr">- {{subproduct_abbr}} </span></span><br> <span>{{main_applicant}} ({{lender_applicant_id}}), {{customer_segment_abbr}} <span *ngIf="subproduct_abbr">-
{{subproduct_abbr}} </span></span><br>
{{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>
@ -28,7 +32,8 @@
<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,1)" placeholder="Assets Type" formControlName="assets_mode" requried> <mat-select (selectionChange)="selectedAssetsType($event,i,1)" placeholder="Assets Type"
formControlName="assets_mode" requried>
<mat-option>Select</mat-option> <mat-option>Select</mat-option>
<mat-option *ngFor="let asset of m_assets_type" [value]="asset.id">{{ asset.name }}</mat-option> <mat-option *ngFor="let asset of m_assets_type" [value]="asset.id">{{ asset.name }}</mat-option>
</mat-select> </mat-select>
@ -42,13 +47,16 @@
<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:45%"> <mat-form-field style="width:45%">
<mat-select placeholder="Property Type" formControlName="property_type" (selectionChange)="setRequiredValidation($event.value,i,s,1)"> <mat-select placeholder="Property Type" formControlName="property_type"
(selectionChange)="setRequiredValidation($event.value,i,s,1)">
<mat-option>Select</mat-option> <mat-option>Select</mat-option>
<mat-option *ngFor="let prop of m_propertyType" [value]="prop.id">{{ prop.name }}</mat-option> <mat-option *ngFor="let prop of m_propertyType" [value]="prop.id">{{
prop.name }}</mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<mat-form-field *ngIf="detail.get('property_type').value == 1" style="width:45%"> <mat-form-field *ngIf="detail.get('property_type').value == 1" style="width:45%">
<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>
</div> </div>
<div fxLayout="row" fxLayoutGap="2px" fxLayoutAlign="start none"> <div fxLayout="row" fxLayoutGap="2px" fxLayoutAlign="start none">
@ -67,13 +75,16 @@
autocomplete="off"> autocomplete="off">
</mat-form-field> </mat-form-field>
<mat-form-field style="width:45%"> <mat-form-field style="width:45%">
<mat-select placeholder="Unit of Measurement" formControlName="uom_of_the_property" (selectionChange)="setRequiredValidation($event.value,detail,6)"> <mat-select placeholder="Unit of Measurement" formControlName="uom_of_the_property"
(selectionChange)="setRequiredValidation($event.value,detail,6)">
<mat-option>Select</mat-option> <mat-option>Select</mat-option>
<mat-option *ngFor="let uom of m_uom_type" [value]="uom.uom_id">{{ uom.name }}</mat-option> <mat-option *ngFor="let uom of m_uom_type" [value]="uom.uom_id">{{ uom.name
}}</mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<mat-form-field *ngIf="detail.get('uom_of_the_property').value == 1" style="width:45%"> <mat-form-field *ngIf="detail.get('uom_of_the_property').value == 1" style="width:45%">
<input matInput placeholder="Specify Unit of Measurement" formControlName="other_uom" autocomplete="off"> <input matInput placeholder="Specify Unit of Measurement" formControlName="other_uom"
autocomplete="off">
</mat-form-field> </mat-form-field>
</div> </div>
</div> </div>
@ -85,13 +96,16 @@
<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: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"
(selectionChange)="setRequiredValidation($event.value,detail,5)">
<mat-option>Select</mat-option> <mat-option>Select</mat-option>
<mat-option *ngFor="let vehicle of m_vehicle_type" [value]="vehicle.vehicle_type_id">{{ vehicle.vehicle_type_name }}</mat-option> <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:40%"> --> <!-- <mat-form-field style="width:40%"> -->
<!--<input matInput placeholder="Manufacturer, Model" formControlName="manufacturer_model_four_weeler" autocomplete="off"> <!--<input matInput placeholder="Manufacturer, Model" formControlName="manufacturer_model_four_weeler" autocomplete="off">
@ -99,7 +113,8 @@
<!-- <input matInput placeholder="Manufacturer, Model" formControlName="manufacturer_model_vehicle" autocomplete="off"> --> <!-- <input matInput placeholder="Manufacturer, Model" formControlName="manufacturer_model_vehicle" 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>
@ -158,29 +173,37 @@
<div [formGroupName]="s"> <div [formGroupName]="s">
<div fxLayout="row wrap" fxLayoutGap="2px" fxLayoutAlign="start none"> <div fxLayout="row wrap" fxLayoutGap="2px" fxLayoutAlign="start none">
<mat-form-field style="width:45%"> <mat-form-field style="width:45%">
<input matInput placeholder="Premium Paid" formControlName="premium_paid" OnlyNumber type="text" autocomplete="off" (keyup)="inWords($event,s,6)"> <input matInput placeholder="Premium Paid" formControlName="premium_paid"
<mat-hint align="start" style="font-size:90%" *ngIf="detail.get('premium_paid').value != ''">{{"&#8377;"}} {{OtherPremiumPaidInwords[s]}} Only</mat-hint> OnlyNumber type="text" autocomplete="off" (keyup)="inWords($event,s,6)">
<mat-hint align="start" style="font-size:90%" *ngIf="detail.get('premium_paid').value != ''">{{"&#8377;"}}
{{OtherPremiumPaidInwords[s]}} Only</mat-hint>
<!-- <mat-hint align="start" style="font-size:90%" *ngIf="detail.get('premium_paid').value != ''">{{ "&#8377;" + detail.get('premium_paid').value | numberToWords + 'Only'}} </mat-hint> --> <!-- <mat-hint align="start" style="font-size:90%" *ngIf="detail.get('premium_paid').value != ''">{{ "&#8377;" + detail.get('premium_paid').value | numberToWords + 'Only'}} </mat-hint> -->
</mat-form-field> </mat-form-field>
<mat-form-field style="width:45%"> <mat-form-field style="width:45%">
<mat-select placeholder="Frequency" formControlName="frequency_mode" (selectionChange)="setRequiredValidation($event.value,detail,2)"> <mat-select placeholder="Frequency" formControlName="frequency_mode"
(selectionChange)="setRequiredValidation($event.value,detail,2)">
<mat-option>Select</mat-option> <mat-option>Select</mat-option>
<mat-option *ngFor="let freqn of m_freqOfPurchase" [value]="freqn.frequency_id">{{ freqn.name }}</mat-option> <mat-option *ngFor="let freqn of m_freqOfPurchase" [value]="freqn.frequency_id">{{
freqn.name }}</mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<mat-form-field style="width:45%" *ngIf="detail.get('frequency_mode').value == 1 "> <mat-form-field style="width:45%" *ngIf="detail.get('frequency_mode').value == 1 ">
<input matInput placeholder="Specify Frequency" formControlName="other_frequency_mode" autocomplete="off"> <input matInput placeholder="Specify Frequency" formControlName="other_frequency_mode"
autocomplete="off">
</mat-form-field> </mat-form-field>
</div> </div>
<div fxLayout="row wrap" fxLayoutGap="2px" fxLayoutAlign="start none"> <div fxLayout="row wrap" fxLayoutGap="2px" fxLayoutAlign="start none">
<mat-form-field style="width:45%"> <mat-form-field style="width:45%">
<input matInput placeholder="Sum Assured" formControlName="sum_assured" OnlyNumber type="text" autocomplete="off" (keyup)="inWords($event,s,8)"> <input matInput placeholder="Sum Assured" formControlName="sum_assured"
<mat-hint align="start" style="font-size:90%" *ngIf="detail.get('sum_assured').value != ''">{{"&#8377;"}} {{OtherSumAssuredInwords[s]}} Only</mat-hint> OnlyNumber type="text" autocomplete="off" (keyup)="inWords($event,s,8)">
<mat-hint align="start" style="font-size:90%" *ngIf="detail.get('sum_assured').value != ''">{{"&#8377;"}}
{{OtherSumAssuredInwords[s]}} Only</mat-hint>
</mat-form-field> </mat-form-field>
<mat-form-field style="width:45%"> <mat-form-field style="width:45%">
<input matInput placeholder="Members Covered" formControlName="members_coverd" autocomplete="off"> <input matInput placeholder="Members Covered" formControlName="members_coverd"
autocomplete="off">
</mat-form-field> </mat-form-field>
</div> </div>
@ -196,33 +219,40 @@
<div fxLayout="row wrap" fxLayoutGap="2px" fxLayoutAlign="start none"> <div fxLayout="row wrap" fxLayoutGap="2px" fxLayoutAlign="start none">
<mat-form-field style="width:45%"> <mat-form-field style="width:45%">
<mat-select placeholder="Type" formControlName="investments_type" (selectionChange)="setRequiredValidation($event.value,detail,3)"> <mat-select placeholder="Type" formControlName="investments_type"
(selectionChange)="setRequiredValidation($event.value,detail,3)">
<mat-option>Select</mat-option> <mat-option>Select</mat-option>
<mat-option *ngFor="let ins_type of m_investmentType" [value]="ins_type.id">{{ ins_type.name }}</mat-option> <mat-option *ngFor="let ins_type of m_investmentType" [value]="ins_type.id">{{
ins_type.name }}</mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<mat-form-field style="width:45%" *ngIf="detail.get('investments_type').value == 1"> <mat-form-field style="width:45%" *ngIf="detail.get('investments_type').value == 1">
<input matInput placeholder="Specify Type" formControlName="other_investments_type" autocomplete="off"> <input matInput placeholder="Specify Type" formControlName="other_investments_type"
autocomplete="off">
</mat-form-field> </mat-form-field>
<mat-form-field style="width:54%" *ngIf="detail.get('investments_type').value == 6 || detail.get('investments_type').value == 5 || detail.get('investments_type').value == 4"> <mat-form-field style="width:54%" *ngIf="detail.get('investments_type').value == 6 || detail.get('investments_type').value == 5 || detail.get('investments_type').value == 4">
<input matInput autocomplete="off" placeholder="Name of organisation in which investment done" formControlName="in_which_organisation"> <input matInput autocomplete="off" placeholder="Name of organisation in which investment done"
formControlName="in_which_organisation">
</mat-form-field> </mat-form-field>
<mat-form-field style="width:45%"> <mat-form-field style="width:45%">
<input matInput placeholder="Current Market Value" formControlName="amount_of_invest" OnlyNumber type="text" autocomplete="off" (keyup)="inWords($event,i,10)"> <input matInput placeholder="Current Market Value" formControlName="amount_of_invest"
OnlyNumber type="text" autocomplete="off" (keyup)="inWords($event,i,10)">
<!--<mat-hint align="start" style="font-size:90%" *ngIf="sup.get('amount_of_invest').value != ''">{{"&#8377;"}} {{OtherAmtInvestInwords[i]}} Only</mat-hint>--> <!--<mat-hint align="start" style="font-size:90%" *ngIf="sup.get('amount_of_invest').value != ''">{{"&#8377;"}} {{OtherAmtInvestInwords[i]}} Only</mat-hint>-->
<mat-hint align="start" style="font-size:90%" *ngIf="detail.get('amount_of_invest').value != ''">{{"&#8377;"}} {{OtherAmtInvestInwords[i]}} Only</mat-hint> <mat-hint align="start" style="font-size:90%" *ngIf="detail.get('amount_of_invest').value != ''">{{"&#8377;"}}
{{OtherAmtInvestInwords[i]}} Only</mat-hint>
</mat-form-field> </mat-form-field>
</div> </div>
<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="detail.get('investments_type').value == 1 || detail.get('investments_type').value == 2 || detail.get('investments_type').value == 3"> <mat-form-field style="width:45%" *ngIf="detail.get('investments_type').value == 1 || detail.get('investments_type').value == 2 || detail.get('investments_type').value == 3">
<input matInput placeholder="Bank Name" formControlName="bank_name" autocomplete="off"> <input matInput placeholder="Bank Name" formControlName="bank_name"
autocomplete="off">
</mat-form-field> </mat-form-field>
</div> </div>
</div> </div>
@ -237,7 +267,8 @@
<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">
@ -271,12 +302,16 @@
</div> </div>
<!--Desction Dynamic details : END --> <!--Desction Dynamic details : END -->
<div fxLayout="row wrap" fxLayoutGap="2px" fxLayoutAlign="start none"> <div fxLayout="row wrap" fxLayoutGap="2px" fxLayoutAlign="start none">
<mat-form-field *ngIf="sup.get('assets_mode').value == 2 || sup.get('assets_mode').value == 5" style="width:45%"> <mat-form-field *ngIf="sup.get('assets_mode').value == 2 || sup.get('assets_mode').value == 5"
<input matInput placeholder="Approximate Market Value" formControlName="approximate_market_value" OnlyNumber type="text" autocomplete="off" (keyup)="inWords($event,i,2)"> style="width:45%">
<mat-hint align="start" style="font-size:90%" *ngIf="sup.get('approximate_market_value').value != ''">{{"&#8377;"}} {{OtherAppxMarketAmtInwords[i]}} Only</mat-hint> <input matInput placeholder="Approximate Market Value" formControlName="approximate_market_value"
OnlyNumber type="text" autocomplete="off" (keyup)="inWords($event,i,2)">
<mat-hint align="start" style="font-size:90%" *ngIf="sup.get('approximate_market_value').value != ''">{{"&#8377;"}}
{{OtherAppxMarketAmtInwords[i]}} Only</mat-hint>
</mat-form-field> </mat-form-field>
<mat-form-field *ngIf="sup.get('assets_mode').value != ''" style="width:45%"><!-- 1 || sup.get('assets_mode').value == 2 || sup.get('assets_mode').value == 3 || sup.get('assets_mode').value == 4 || sup.get('assets_mode').value == 5 || sup.get('assets_mode').value == 6" style="width:45%"> --> <mat-form-field *ngIf="sup.get('assets_mode').value != ''" style="width:45%">
<!-- 1 || sup.get('assets_mode').value == 2 || sup.get('assets_mode').value == 3 || sup.get('assets_mode').value == 4 || sup.get('assets_mode').value == 5 || sup.get('assets_mode').value == 6" style="width:45%"> -->
<!-- <mat-select placeholder="Name of the Owner" formControlName="name_of_the_owner" > <!-- <mat-select placeholder="Name of the Owner" formControlName="name_of_the_owner" >
<mat-option value="{{owner.pd_co_applicant_id}}" *ngFor="let owner of applicants">{{owner.applicant_name | titlecase}}</mat-option> <mat-option value="{{owner.pd_co_applicant_id}}" *ngFor="let owner of applicants">{{owner.applicant_name | titlecase}}</mat-option>
</mat-select> --> </mat-select> -->
@ -299,8 +334,8 @@
</mat-form-field> </mat-form-field>
<mat-form-field *ngIf="isOtherOwner[i]" style="width:45%"> <mat-form-field *ngIf="isOtherOwner[i]" style="width:45%">
<input matInput placeholder="Specify Owner Name" <input matInput placeholder="Specify Owner Name" formControlName="other_owner"
formControlName="other_owner" autocomplete="off"> autocomplete="off">
</mat-form-field> </mat-form-field>
<!-- check --> <!-- check -->
<!-- <mat-form-field *ngIf="sup.get('assets_mode').value == 1 || sup.get('assets_mode').value == 2 || sup.get('assets_mode').value == 3 || sup.get('assets_mode').value == 4 || sup.get('assets_mode').value == 5" style="width:40%"> <!-- <mat-form-field *ngIf="sup.get('assets_mode').value == 1 || sup.get('assets_mode').value == 2 || sup.get('assets_mode').value == 3 || sup.get('assets_mode').value == 4 || sup.get('assets_mode').value == 5" style="width:40%">
@ -318,14 +353,16 @@
<mat-form-field style="width:45%"> <mat-form-field style="width:45%">
<mat-label>Age of Asset in Years</mat-label> <mat-label>Age of Asset in Years</mat-label>
<input matInput autocomplete="off" placeholder="eg.999" formControlName="vintage_personal" minlength="1" maxlength="3" OnlyNumber type="text" (keyup)="calculateVintagePurchase($event.target.value,i,3)"> <input matInput autocomplete="off" placeholder="eg.999" formControlName="vintage_personal"
minlength="1" maxlength="3" OnlyNumber type="text" (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="purchase_year" minlength="4" maxlength="4" OnlyNumber type="text" (keyup)="calculateVintagePurchase($event.target.value,i,4)"> <input matInput autocomplete="off" placeholder="YYYY eg.2018" formControlName="purchase_year"
minlength="4" maxlength="4" OnlyNumber type="text" (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>
@ -334,7 +371,8 @@
<div fxLayout="row wrap" fxLayoutGap="2px" fxLayoutAlign="start none"> <div fxLayout="row wrap" fxLayoutGap="2px" fxLayoutAlign="start none">
<mat-form-field *ngIf="sup.get('assets_mode').value != ''" style="width:95%"> <mat-form-field *ngIf="sup.get('assets_mode').value != ''" style="width:95%">
<mat-select placeholder="Is There a Loan Existing Against This Asset?" formControlName="emi"> <mat-select placeholder="Is There a Loan Existing Against This Asset?"
formControlName="emi">
<mat-option>Select</mat-option> <mat-option>Select</mat-option>
<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>
@ -355,7 +393,8 @@
<mat-card-actions> <mat-card-actions>
<div align="right"> <div align="right">
<button type="button" mat-raised-button mat-icon-button (click)="removeAssetsDetails(i,1)" <button type="button" mat-raised-button mat-icon-button (click)="removeAssetsDetails(i,1)"
matTooltip="Delete Other Assets" matTooltipPosition="above" class="mr-1 mb-1 hover-icon" *ngIf="_assetsQuesFrom.controls.assets_details.controls.length > 1"> matTooltip="Delete Other Assets" matTooltipPosition="above" class="mr-1 mb-1 hover-icon"
*ngIf="_assetsQuesFrom.controls.assets_details.controls.length > 1">
<mat-icon>delete</mat-icon> <mat-icon>delete</mat-icon>
</button> </button>
</div> </div>
@ -440,43 +479,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>
@ -497,7 +584,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" [disabled]="disableAfterSubmit===true" ><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" [disabled]="disableAfterSubmit===true">
<mat-icon>save</mat-icon>
</button>
</div> </div>
</mat-dialog-actions> </mat-dialog-actions>
</form> </form>

View File

@ -232,8 +232,8 @@ export class AssetsInfoComponent implements OnInit {
this.pdTrigerService.getAllMasterDatas('UOM').subscribe( this.pdTrigerService.getAllMasterDatas('UOM').subscribe(
data => { data => {
this.m_uom_type = data.records.filter(data => data.isactive == 1 && data.is_land_uom == 1 || data.is_land_uom == 2); this.m_uom_type = data.records.filter(data => data.isactive == 1 && data.is_land_uom == 1 || data.is_land_uom == 2);
// console.log('this.m_uom_type',data.records,this.m_uom_type);
//
}) })
} }
@ -647,7 +647,8 @@ export class AssetsInfoComponent implements OnInit {
case '1': { case '1': {
let array_data: any; let array_data: any;
data.forEach((datas, i) => { data.forEach((datas, i) => {
array_data = { 'any_other_assets': datas.any_other_assets, array_data = {
'any_other_assets': datas.any_other_assets,
// 'name_of_the_owner':datas.name_of_the_owner, // 'name_of_the_owner':datas.name_of_the_owner,
// 'other_owner':datas.other_owner, // 'other_owner':datas.other_owner,
//'relation':datas.relation, //'relation':datas.relation,
@ -663,10 +664,12 @@ export class AssetsInfoComponent implements OnInit {
case '2': { case '2': {
let array_data: any; let array_data: any;
data.forEach((datas, i) => { data.forEach((datas, i) => {
array_data = { 'property_type':datas.property_type,'other_property_type':datas.other_property_type, array_data = {
'property_type': datas.property_type, 'other_property_type': datas.other_property_type,
'address_of_the_property': datas.address_of_the_property, 'describe_of_the_property_asset': datas.describe_of_the_property_asset, 'address_of_the_property': datas.address_of_the_property, 'describe_of_the_property_asset': datas.describe_of_the_property_asset,
'uom_of_the_property': datas.uom_of_the_property, 'uom_of_the_property': datas.uom_of_the_property,
'area_covered_by_this_property' :datas.area_covered_by_this_property,'other_uom':datas.other_uom }; 'area_covered_by_this_property': datas.area_covered_by_this_property, 'other_uom': datas.other_uom
};
}); });
const control = (<FormArray>this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray; const control = (<FormArray>this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray;
control.push(this.loadPropertyWithData(array_data)); control.push(this.loadPropertyWithData(array_data));
@ -675,9 +678,11 @@ export class AssetsInfoComponent implements OnInit {
case '3': { case '3': {
let array_data: any; let array_data: any;
data.forEach((datas, i) => { data.forEach((datas, i) => {
array_data = { 'manufacturer_model_vehicle': datas.manufacturer_model_vehicle, array_data = {
'manufacturer_model_vehicle': datas.manufacturer_model_vehicle,
'vehicle_type': datas.vehicle_type, 'vehicle_type': datas.vehicle_type,
'other_vehicle_type':datas.other_vehicle_type}; 'other_vehicle_type': datas.other_vehicle_type
};
}); });
const control = (<FormArray>this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray; const control = (<FormArray>this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray;
control.push(this.load_Four_WeelerWithData(array_data)); control.push(this.load_Four_WeelerWithData(array_data));
@ -719,11 +724,13 @@ export class AssetsInfoComponent implements OnInit {
let array_data: any; let array_data: any;
data.forEach((datas, i) => { data.forEach((datas, i) => {
this.OtherAmtInvestInwords[i] = this.pdTrigerService.convertNumberToWords(+datas.amount_of_invest); this.OtherAmtInvestInwords[i] = this.pdTrigerService.convertNumberToWords(+datas.amount_of_invest);
array_data = { 'investments_type': datas.investments_type, array_data = {
'investments_type': datas.investments_type,
'other_investments_type': datas.other_investments_type, 'other_investments_type': datas.other_investments_type,
'in_which_organisation': datas.in_which_organisation, 'in_which_organisation': datas.in_which_organisation,
'amount_of_invest': datas.amount_of_invest, 'amount_of_invest': datas.amount_of_invest,
'bank_name': datas.bank_name }; 'bank_name': datas.bank_name
};
}); });
const control = (<FormArray>this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray; const control = (<FormArray>this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray;
control.push(this.loadInvestDescriptionWithData(array_data)); control.push(this.loadInvestDescriptionWithData(array_data));
@ -844,8 +851,7 @@ export class AssetsInfoComponent implements OnInit {
// } // }
/** To calculating Loan Elapsed Tenure both "Other Asset" And "Business Asset" using Flag */ /** To calculating Loan Elapsed Tenure both "Other Asset" And "Business Asset" using Flag */
loanTenureCalc(details ,flag) loanTenureCalc(details, flag) {
{
if (flag == 1) { if (flag == 1) {
let ElapsedValues; let ElapsedValues;
@ -865,11 +871,11 @@ export class AssetsInfoComponent implements OnInit {
} }
setRequiredValidation(value, ParInx, ChdInx, flag) { setRequiredValidation(value, ParInx, ChdInx, flag) {
console.log('value',value,'ParInx',ParInx,'ChdInx',ChdInx,'flag',flag);
let ParCtrls = <FormArray>this._assetsQuesFrom.controls.assets_details; let ParCtrls = <FormArray>this._assetsQuesFrom.controls.assets_details;
// console.log('ParCtrls',ParCtrls);
let ChdCtrls: any = <FormArray>ParCtrls.controls[ParInx]; let ChdCtrls: any = <FormArray>ParCtrls.controls[ParInx];
// console.log('ChdCtrls',ChdCtrls);
if (flag == 1) { if (flag == 1) {
value == 1 value == 1
@ -897,7 +903,7 @@ export class AssetsInfoComponent implements OnInit {
// } // }
if (flag == 4) { if (flag == 4) {
let Avaliablity = 1; let Avaliablity = 1;
// console.log('val',value);
if (value.length > 0) { if (value.length > 0) {
value.forEach(option => { value.forEach(option => {
if (option.id == 0 && option.group_id == 2) { if (option.id == 0 && option.group_id == 2) {
@ -906,18 +912,18 @@ export class AssetsInfoComponent implements OnInit {
}); });
} }
if (Avaliablity == 0) { if (Avaliablity == 0) {
console.log('if Avaliablity',Avaliablity);
// console.log('if this.isOtherOwner[ParInx]',this.isOtherOwner[ParInx]);
ChdCtrls.controls.other_owner.setValidators([Validators.required]); ChdCtrls.controls.other_owner.setValidators([Validators.required]);
this.isOtherOwner[ParInx] = true; this.isOtherOwner[ParInx] = true;
// console.log('if this.isOtherOwner[ParInx]',this.isOtherOwner[ParInx]);
} else if (Avaliablity == 1) { } else if (Avaliablity == 1) {
console.log('else Avaliablity',Avaliablity);
// console.log('esle this.isOtherOwner[ParInx]',this.isOtherOwner[ParInx]);
ChdCtrls.controls.other_owner.setValue(''); ChdCtrls.controls.other_owner.setValue('');
ChdCtrls.controls.other_owner.clearValidators(); ChdCtrls.controls.other_owner.clearValidators();
this.isOtherOwner[ParInx] = false; this.isOtherOwner[ParInx] = false;
// console.log('else this.isOtherOwner[ParInx]',this.isOtherOwner[ParInx]);
} }
ChdCtrls.controls.other_owner.updateValueAndValidity(); ChdCtrls.controls.other_owner.updateValueAndValidity();

View File

@ -70,11 +70,15 @@
<form [formGroup]="bankingForm" class="bankForm"> <form [formGroup]="bankingForm" class="bankForm">
<h2 mat-dialog-title class="paragraph_change"> <h2 mat-dialog-title class="paragraph_change">
<div fxFlex="70" align="left" style="padding: 10px !important;"> <div fxFlex="70" align="left" style="padding: 10px !important;">
<span>{{main_applicant}} ({{lender_applicant_id}}), {{customer_segment_abbr}} <span *ngIf="subproduct_abbr">- {{subproduct_abbr}} </span></span><br> <span>{{main_applicant}} ({{lender_applicant_id}}), {{customer_segment_abbr}} <span *ngIf="subproduct_abbr">-
{{subproduct_abbr}} </span></span><br>
{{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>
@ -84,8 +88,7 @@
<mat-card> <mat-card>
<mat-card-content> <mat-card-content>
<div formArrayName="itemRows" autocomplete="off"> <div formArrayName="itemRows" autocomplete="off">
<mat-accordion <mat-accordion *ngFor="let itemrow of bankingForm.controls.itemRows['controls']; let i=index;let last=last"
*ngFor="let itemrow of bankingForm.controls.itemRows['controls']; let i=index;let last=last"
[formGroupName]="i"> [formGroupName]="i">
<mat-expansion-panel class="banlFields" [expanded]="step == i"> <mat-expansion-panel class="banlFields" [expanded]="step == i">
<mat-expansion-panel-header> <mat-expansion-panel-header>
@ -95,7 +98,8 @@
</mat-panel-title> </mat-panel-title>
</mat-expansion-panel-header> </mat-expansion-panel-header>
<mat-form-field> <mat-form-field>
<mat-select placeholder="Account Name" formControlName="applicant_name" [compareWith]="compareObjects" (selectionChange)="setRequiredValidation($event.values.id,itemrow,1)"> <mat-select placeholder="Account Name" formControlName="applicant_name"
[compareWith]="compareObjects" (selectionChange)="setRequiredValidation($event.values.id,itemrow,1)">
<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}}
@ -103,26 +107,32 @@
</mat-optgroup> </mat-optgroup>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<mat-form-field *ngIf="checkOthers(itemrow.get('applicant_name').value)===true" style="width:45%"> <mat-form-field *ngIf="checkOthers(itemrow.get('applicant_name').value)===true"
<input matInput placeholder="Specify Applicant Name" formControlName="other_applicant" autocomplete="off"> style="width:45%">
<input matInput placeholder="Specify Applicant Name" formControlName="other_applicant"
autocomplete="off">
</mat-form-field> </mat-form-field>
<mat-form-field> <mat-form-field>
<mat-select placeholder="Bank Name" formControlName="bank_name" (selectionChange)="setRequiredValidation($event.value,itemrow,2)"> <mat-select placeholder="Bank Name" formControlName="bank_name"
(selectionChange)="setRequiredValidation($event.value,itemrow,2)">
<mat-option>Select</mat-option> <mat-option>Select</mat-option>
<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="itemrow.get('bank_name').value == 1"> <mat-form-field *ngIf="itemrow.get('bank_name').value == 1">
<input matInput placeholder="Specify Bank Name" <input matInput placeholder="Specify Bank Name" formControlName="other_bank"
formControlName="other_bank" autocomplete="off"> autocomplete="off">
</mat-form-field> </mat-form-field>
<mat-form-field> <mat-form-field>
<mat-select (selectionChange)="selectedAccTypeChanges($event.value,i)" placeholder="Account Type" formControlName="account_type" > <mat-select (selectionChange)="selectedAccTypeChanges($event.value,i)"
placeholder="Account Type" formControlName="account_type">
<mat-option>Select</mat-option> <mat-option>Select</mat-option>
<mat-option *ngFor="let prop of m_accountType" [value]="prop.id">{{ prop.name }}</mat-option> <mat-option *ngFor="let prop of m_accountType" [value]="prop.id">{{
prop.name }}</mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
@ -136,8 +146,7 @@
<div fxLayout="row" fxLayoutAlign="start none"> <div fxLayout="row" fxLayoutAlign="start none">
<mat-form-field style="width: 35%;" *ngIf="salaryField"> <mat-form-field style="width: 35%;" *ngIf="salaryField">
<mat-select placeholder="Salary Credited in this account" <mat-select placeholder="Salary Credited in this account" formControlName="salary">
formControlName="salary" >
<mat-option>Select</mat-option> <mat-option>Select</mat-option>
<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>
@ -145,10 +154,12 @@
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<mat-form-field style="width: 45%;" *ngIf="this.limitCaseFlag[i]"> <!-- *ngIf="itemrow.get('account_type').value != 2"> --> <mat-form-field style="width: 45%;" *ngIf="this.limitCaseFlag[i]">
<!-- *ngIf="itemrow.get('account_type').value != 2"> -->
<input matInput autocomplete="off" placeholder="Limit in case of OD / CC account" <input matInput autocomplete="off" placeholder="Limit in case of OD / CC account"
formControlName="limit" OnlyNumber type="text" (keyup)="inWords($event,i,1)"> formControlName="limit" OnlyNumber type="text" (keyup)="inWords($event,i,1)">
<mat-hint align="start" style="font-size:90%" *ngIf="itemrow.get('limit').value != ''">{{"&#8377;"}} {{amtInwords[i]}} Only</mat-hint> <mat-hint align="start" style="font-size:90%" *ngIf="itemrow.get('limit').value != ''">{{"&#8377;"}}
{{amtInwords[i]}} Only</mat-hint>
</mat-form-field> </mat-form-field>
</div> </div>
<div> <div>
@ -156,10 +167,12 @@
<br> <br>
<div fxLayout="row" fxLayoutGap="2px" fxLayoutAlign="start none"> <div fxLayout="row" fxLayoutGap="2px" fxLayoutAlign="start none">
<mat-form-field> <mat-form-field>
<input matInput autocomplete="off" placeholder="Year(s)" formControlName="vintage_year" OnlyNumber type="text"> <input matInput autocomplete="off" placeholder="Year(s)"
formControlName="vintage_year" OnlyNumber type="text">
</mat-form-field> </mat-form-field>
<mat-form-field> <mat-form-field>
<input matInput autocomplete="off" placeholder="Month(s)" formControlName="vintage_month" OnlyNumber type="text" (change)="ConvertMonthintoYear(itemrow,$event.target.value)"> <input matInput autocomplete="off" placeholder="Month(s)"
formControlName="vintage_month" OnlyNumber type="text" (change)="ConvertMonthintoYear(itemrow,$event.target.value)">
</mat-form-field> </mat-form-field>
</div> </div>
</div> </div>
@ -172,7 +185,8 @@
</div> </div>
<div align="right"> <div align="right">
<button mat-raised-button mat-icon-button matTooltip="Delete Banking Details" matTooltipPosition="above" (click)="deleteBankdetails(i)" *ngIf="bankingForm.controls.itemRows.controls.length > 1"> <button mat-raised-button mat-icon-button matTooltip="Delete Banking Details"
matTooltipPosition="above" (click)="deleteBankdetails(i)" *ngIf="bankingForm.controls.itemRows.controls.length > 1">
<mat-icon>delete</mat-icon> <mat-icon>delete</mat-icon>
</button> </button>
</div> </div>
@ -249,43 +263,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>
@ -305,7 +367,9 @@
</mat-form-field> </mat-form-field>
</div> </div>
<div fxFlex="40" align="end"> <div fxFlex="40" align="end">
<button class="mr-1 mb-1 hover-icon" type="submit" mat-raised-button mat-icon-button type="submit" matTooltip="Submit" matTooltipPosition="above" (click)="bankSubmit()"><mat-icon>save</mat-icon> <button class="mr-1 mb-1 hover-icon" type="submit" mat-raised-button mat-icon-button type="submit"
matTooltip="Submit" matTooltipPosition="above" (click)="bankSubmit()">
<mat-icon>save</mat-icon>
</button> </button>
</div> </div>
</mat-dialog-actions> </mat-dialog-actions>

View File

@ -1,7 +1,8 @@
<form *ngIf="apiLoadFinish && loadDetails" [formGroup]="_businessAssetsQuesFrom" (submit)="onSubmit()" novalidate> <form *ngIf="apiLoadFinish && loadDetails" [formGroup]="_businessAssetsQuesFrom" (submit)="onSubmit()" novalidate>
<h2 mat-dialog-title class="paragraph_change"> <h2 mat-dialog-title class="paragraph_change">
<div fxFlex="70" align="left" style="padding: 10px !important;"> <div fxFlex="70" align="left" style="padding: 10px !important;">
<span>{{main_applicant}} ({{lender_applicant_id}}), {{customer_segment_abbr}} <span *ngIf="subproduct_abbr">- {{subproduct_abbr}}</span> </span><br> <span>{{main_applicant}} ({{lender_applicant_id}}), {{customer_segment_abbr}} <span *ngIf="subproduct_abbr">-
{{subproduct_abbr}}</span> </span><br>
{{pageTitle}} {{pageTitle}}
</div> </div>
<div fxFlex="30" align="end" style="padding: 10px !important;"> <div fxFlex="30" align="end" style="padding: 10px !important;">
@ -60,7 +61,8 @@
<mat-form-field style="width: 95%;"> <mat-form-field style="width: 95%;">
<mat-select [placeholder]="placeholderName[i] ? placeholderName[i] :'Was any business activity seen at the Address Type during PD visit?'" formControlName="business_is_pd_visited"> <mat-select [placeholder]="placeholderName[i] ? placeholderName[i] :'Was any business activity seen at the Address Type during PD visit?'"
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>

View File

@ -186,23 +186,21 @@ export class BusinessAssetsInfoComponent implements OnInit {
); );
} }
loadaddresses() { loadaddresses() {
// console.log('function inside loaded');
let params: any = {}; let params: any = {};
params.pd_id = this.pdid; params.pd_id = this.pdid;
params.pd_form_id = '5'; params.pd_form_id = '5';
this.pdTrigerService.retriveForm(params).subscribe(data => { this.pdTrigerService.retriveForm(params).subscribe(data => {
// console.log('response',data);
if (data.status == 200) { if (data.status == 200) {
let dataOfAddress = data.records.addresses.filter(item => item.isactive == 1); let dataOfAddress = data.records.addresses.filter(item => item.isactive == 1);
// console.log(data.records);
// console.log(data.records.addresses);
// console.log(dataOfAddress);
// // const control = <FormArray>this._businessAssetsQuesFrom.controls['business_assets_for_address']; // // const control = <FormArray>this._businessAssetsQuesFrom.controls['business_assets_for_address'];
if (data.records.addresses.length > 0) { if (data.records.addresses.length > 0) {
data.records.addresses.forEach((data, inx) => { data.records.addresses.forEach((data, inx) => {
// console.log(data);
this.addressLabel[inx] = ''; this.addressLabel[inx] = '';
@ -608,7 +606,7 @@ export class BusinessAssetsInfoComponent implements OnInit {
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; let Avaliablity = 1;
console.log('datas.business_name_of_the_owner.length',datas.business_name_of_the_owner.length);
if (datas.business_name_of_the_owner.length > 0) { if (datas.business_name_of_the_owner.length > 0) {
datas.business_name_of_the_owner.forEach(option => { datas.business_name_of_the_owner.forEach(option => {
if (option.id == 0 && option.group_id == 2) { if (option.id == 0 && option.group_id == 2) {
@ -782,16 +780,15 @@ export class BusinessAssetsInfoComponent implements OnInit {
/** To Convert Month into Year */ /** To Convert Month into Year */
ConvertMonthintoYear(e, i) { ConvertMonthintoYear(e, i) {
// const address_control = <FormArray>this._EditPDtriggerForm.controls['addresses']; // const address_control = <FormArray>this._EditPDtriggerForm.controls['addresses'];
// console.log(e);
// console.log(i);
const control = <FormArray>this._businessAssetsQuesFrom.controls['business_assets_for_address']; const control = <FormArray>this._businessAssetsQuesFrom.controls['business_assets_for_address'];
// control.controls[i]['controls'].isactive.setValue(0); // control.controls[i]['controls'].isactive.setValue(0);
// address_control.controls[index].disable(); // address_control.controls[index].disable();
// console.log(by);
// return; // return;
// console.log('address_control',address_control);
let business_year = control.controls[i]['controls'].business_years.value; let business_year = control.controls[i]['controls'].business_years.value;

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>
<mat-dialog-content> <mat-dialog-content>
@ -15,8 +18,7 @@
<mat-card> <mat-card>
<mat-card-content> <mat-card-content>
<div formArrayName="itemRows" autocomplete="off"> <div formArrayName="itemRows" autocomplete="off">
<mat-accordion <mat-accordion *ngFor="let itemrow of bankingForm.controls.itemRows['controls']; let i=index;let last=last"
*ngFor="let itemrow of bankingForm.controls.itemRows['controls']; let i=index;let last=last"
[formGroupName]="i"> [formGroupName]="i">
<mat-expansion-panel class="banlFields" [expanded]="step == i"> <mat-expansion-panel class="banlFields" [expanded]="step == i">
<mat-expansion-panel-header> <mat-expansion-panel-header>
@ -29,7 +31,8 @@
</mat-panel-description> --> </mat-panel-description> -->
</mat-expansion-panel-header> </mat-expansion-panel-header>
<mat-form-field> <mat-form-field>
<mat-select placeholder="Account Name" formControlName="applicant_name" [compareWith]="compareObjects" (selectionChange)="setRequiredValidation($event.value,itemrow,1)"> <mat-select placeholder="Account Name" formControlName="applicant_name"
[compareWith]="compareObjects" (selectionChange)="setRequiredValidation($event.value,itemrow,1)">
<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}}
@ -37,32 +40,37 @@
</mat-optgroup> </mat-optgroup>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<mat-form-field *ngIf="checkOthers(itemrow.get('applicant_name').value)===true" style="width:45%"> <mat-form-field *ngIf="checkOthers(itemrow.get('applicant_name').value)===true"
<input matInput placeholder="Specify Applicant Name" formControlName="other_applicant" autocomplete="off"> style="width:45%">
<input matInput placeholder="Specify Applicant Name" formControlName="other_applicant"
autocomplete="off">
</mat-form-field> </mat-form-field>
<mat-form-field> <mat-form-field>
<mat-select placeholder="Bank Name" formControlName="bank_name" (selectionChange)="setRequiredValidation($event.values,itemrow,2)"> <mat-select placeholder="Bank Name" formControlName="bank_name"
(selectionChange)="setRequiredValidation($event.values,itemrow,2)">
<mat-option>Select</mat-option> <mat-option>Select</mat-option>
<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="itemrow.get('bank_name').value == 1"> <mat-form-field *ngIf="itemrow.get('bank_name').value == 1">
<input matInput placeholder="Specify Bank Name" <input matInput placeholder="Specify Bank Name" formControlName="other_bank"
formControlName="other_bank" autocomplete="off"> autocomplete="off">
</mat-form-field> </mat-form-field>
<mat-form-field> <mat-form-field>
<mat-select (selectionChange)="selectedAccTypeChanges($event.value,i)" placeholder="Account Type" formControlName="account_type" > <mat-select (selectionChange)="selectedAccTypeChanges($event.value,i)"
placeholder="Account Type" formControlName="account_type">
<mat-option>Select</mat-option> <mat-option>Select</mat-option>
<mat-option *ngFor="let prop of m_accountType" [value]="prop.id">{{ prop.name }}</mat-option> <mat-option *ngFor="let prop of m_accountType" [value]="prop.id">{{
prop.name }}</mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<mat-form-field *ngIf="pd_cus_segment!='SAL'"> <mat-form-field *ngIf="pd_cus_segment!='SAL'">
<mat-select placeholder="Is this the main business account" <mat-select placeholder="Is this the main business account" formControlName="is_main">
formControlName="is_main" >
<mat-option>Select</mat-option> <mat-option>Select</mat-option>
<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>
@ -71,8 +79,7 @@
<div fxLayout="row" fxLayoutAlign="start none"> <div fxLayout="row" fxLayoutAlign="start none">
<mat-form-field style="width: 35%;" *ngIf="salaryField"> <mat-form-field style="width: 35%;" *ngIf="salaryField">
<mat-select placeholder="Salary Credited in this account" <mat-select placeholder="Salary Credited in this account" formControlName="salary">
formControlName="salary" >
<mat-option>Select</mat-option> <mat-option>Select</mat-option>
<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>
@ -80,10 +87,12 @@
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<mat-form-field style="width: 45%;" *ngIf="this.limitCaseFlag[i]"> <!-- *ngIf="itemrow.get('account_type').value != 2"> --> <mat-form-field style="width: 45%;" *ngIf="this.limitCaseFlag[i]">
<!-- *ngIf="itemrow.get('account_type').value != 2"> -->
<input matInput autocomplete="off" placeholder="Limit in case of OD / CC account" <input matInput autocomplete="off" placeholder="Limit in case of OD / CC account"
formControlName="limit" OnlyNumber type="text" (keyup)="inWords($event,i,1)"> formControlName="limit" OnlyNumber type="text" (keyup)="inWords($event,i,1)">
<mat-hint align="start" style="font-size:90%" *ngIf="itemrow.get('limit').value != ''">{{"&#8377;"}} {{amtInwords[i]}} Only</mat-hint> <mat-hint align="start" style="font-size:90%" *ngIf="itemrow.get('limit').value != ''">{{"&#8377;"}}
{{amtInwords[i]}} Only</mat-hint>
</mat-form-field> </mat-form-field>
</div> </div>
<div> <div>
@ -91,10 +100,12 @@
<br> <br>
<div fxLayout="row" fxLayoutGap="2px" fxLayoutAlign="start none"> <div fxLayout="row" fxLayoutGap="2px" fxLayoutAlign="start none">
<mat-form-field> <mat-form-field>
<input matInput autocomplete="off" placeholder="Year(s)" formControlName="vintage_year" OnlyNumber type="text"> <input matInput autocomplete="off" placeholder="Year(s)"
formControlName="vintage_year" OnlyNumber type="text">
</mat-form-field> </mat-form-field>
<mat-form-field> <mat-form-field>
<input matInput autocomplete="off" placeholder="Month(s)" formControlName="vintage_month" OnlyNumber type="text" (change)="ConvertMonthintoYear(itemrow,$event.target.value)"> <input matInput autocomplete="off" placeholder="Month(s)"
formControlName="vintage_month" OnlyNumber type="text" (change)="ConvertMonthintoYear(itemrow,$event.target.value)">
</mat-form-field> </mat-form-field>
</div> </div>
</div> </div>
@ -115,8 +126,8 @@
<!-- ngIf="i > 0" --> <!-- ngIf="i > 0" -->
<div align="right"> <div align="right">
<button mat-raised-button mat-icon-button matTooltip="Delete Banking Details" matTooltipPosition="above" (click)="deleteBankdetails(i)" <button mat-raised-button mat-icon-button matTooltip="Delete Banking Details"
*ngIf="bankingForm.controls.itemRows.controls.length > 1"> matTooltipPosition="above" (click)="deleteBankdetails(i)" *ngIf="bankingForm.controls.itemRows.controls.length > 1">
<mat-icon>delete</mat-icon> <mat-icon>delete</mat-icon>
</button> </button>
</div> </div>
@ -184,43 +195,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>
@ -240,7 +299,9 @@
</mat-form-field> </mat-form-field>
</div> </div>
<div fxFlex="40" align="end"> <div fxFlex="40" align="end">
<button class="mr-1 mb-1 hover-icon" type="submit" mat-raised-button mat-icon-button type="submit" matTooltip="Submit" matTooltipPosition="above" (click)="bankSubmit()"><mat-icon>save</mat-icon> <button class="mr-1 mb-1 hover-icon" type="submit" mat-raised-button mat-icon-button type="submit"
matTooltip="Submit" matTooltipPosition="above" (click)="bankSubmit()">
<mat-icon>save</mat-icon>
</button> </button>
</div> </div>
</mat-dialog-actions> </mat-dialog-actions>

View File

@ -272,8 +272,7 @@ export class BusinessInfoComponent implements OnInit {
} }
}).filter(item => item != undefined); }).filter(item => item != undefined);
if(check_exist_businees_activity.length > 0) if (check_exist_businees_activity.length > 0) {
{
check_exist_businees_activity.forEach(val => { check_exist_businees_activity.forEach(val => {
businessActivityControl.push(this.createEntityType(val)); businessActivityControl.push(this.createEntityType(val));
}); });
@ -285,7 +284,8 @@ export class BusinessInfoComponent implements OnInit {
if (data.records.seasonality.toUpperCase() == 'YES') { if (data.records.seasonality.toUpperCase() == 'YES') {
this.businessForm.addControl('peak_period_of_business', new FormControl('', Validators.required)); this.businessForm.addControl('peak_period_of_business', new FormControl('', Validators.required));
this.businessForm.addControl('month_of_business_run', new FormControl('', Validators.required)); } this.businessForm.addControl('month_of_business_run', new FormControl('', Validators.required));
}
} }
if (data.records.manufacturing_activity_details) { if (data.records.manufacturing_activity_details) {
@ -588,8 +588,7 @@ export class BusinessInfoComponent implements OnInit {
// find business activity type businees activity type list // find business activity type businees activity type list
let activityData = this.activityData.map(item => ({ name: item.name, type_of_activity_id: item.type_of_activity_id, exist_status: 0 })) let activityData = this.activityData.map(item => ({ name: item.name, type_of_activity_id: item.type_of_activity_id, exist_status: 0 }))
if(activityData.length > 0) if (activityData.length > 0) {
{
activityData.forEach(val => { activityData.forEach(val => {
businessActivityControl.push(this.createEntityType(val)); businessActivityControl.push(this.createEntityType(val));
}); });
@ -889,10 +888,12 @@ export class BusinessInfoComponent implements OnInit {
control.controls[selectedIndex].removeControl('max_sale_state_name'); control.controls[selectedIndex].removeControl('max_sale_state_name');
if (value == 'Yes') { if (value == 'Yes') {
control.controls[selectedIndex].addControl('india_where_sale_done', this.fb.array([])); control.controls[selectedIndex].addControl('india_where_sale_done', this.fb.array([]));
control.controls[selectedIndex].addControl('max_sale_state_name',this.fb.array([this.createMaxSaleState()])); } control.controls[selectedIndex].addControl('max_sale_state_name', this.fb.array([this.createMaxSaleState()]));
}
else if (value == 'No') { else if (value == 'No') {
control.controls[selectedIndex].addControl('india_where_sale_done', this.fb.array([this.createStateSale()])); control.controls[selectedIndex].addControl('india_where_sale_done', this.fb.array([this.createStateSale()]));
control.controls[selectedIndex].addControl('max_sale_state_name',this.fb.array([this.createMaxSaleState()])); } control.controls[selectedIndex].addControl('max_sale_state_name', this.fb.array([this.createMaxSaleState()]));
}
} }
else if (type == 2) { else if (type == 2) {
let control: any = this.businessForm.get('retail_trading_activity_details') as FormArray; let control: any = this.businessForm.get('retail_trading_activity_details') as FormArray;
@ -900,10 +901,12 @@ export class BusinessInfoComponent implements OnInit {
control.controls[selectedIndex].removeControl('max_sale_state_name'); control.controls[selectedIndex].removeControl('max_sale_state_name');
if (value == 'Yes') { if (value == 'Yes') {
control.controls[selectedIndex].addControl('india_where_sale_done', this.fb.array([])); control.controls[selectedIndex].addControl('india_where_sale_done', this.fb.array([]));
control.controls[selectedIndex].addControl('max_sale_state_name',this.fb.array([this.createMaxSaleState()])); } control.controls[selectedIndex].addControl('max_sale_state_name', this.fb.array([this.createMaxSaleState()]));
}
else if (value == 'No') { else if (value == 'No') {
control.controls[selectedIndex].addControl('india_where_sale_done', this.fb.array([this.createStateSale()])); control.controls[selectedIndex].addControl('india_where_sale_done', this.fb.array([this.createStateSale()]));
control.controls[selectedIndex].addControl('max_sale_state_name',this.fb.array([this.createMaxSaleState()])); } control.controls[selectedIndex].addControl('max_sale_state_name', this.fb.array([this.createMaxSaleState()]));
}
} }
else if (type == 3) { else if (type == 3) {
let control: any = this.businessForm.get('wholesale_trading_activity_details') as FormArray; let control: any = this.businessForm.get('wholesale_trading_activity_details') as FormArray;
@ -911,10 +914,12 @@ export class BusinessInfoComponent implements OnInit {
control.controls[selectedIndex].removeControl('max_sale_state_name'); control.controls[selectedIndex].removeControl('max_sale_state_name');
if (value == 'Yes') { if (value == 'Yes') {
control.controls[selectedIndex].addControl('india_where_sale_done', this.fb.array([])); control.controls[selectedIndex].addControl('india_where_sale_done', this.fb.array([]));
control.controls[selectedIndex].addControl('max_sale_state_name',this.fb.array([this.createMaxSaleState()])); } control.controls[selectedIndex].addControl('max_sale_state_name', this.fb.array([this.createMaxSaleState()]));
}
else if (value == 'No') { else if (value == 'No') {
control.controls[selectedIndex].addControl('india_where_sale_done', this.fb.array([this.createStateSale()])); control.controls[selectedIndex].addControl('india_where_sale_done', this.fb.array([this.createStateSale()]));
control.controls[selectedIndex].addControl('max_sale_state_name',this.fb.array([this.createMaxSaleState()])); } control.controls[selectedIndex].addControl('max_sale_state_name', this.fb.array([this.createMaxSaleState()]));
}
} }
else if (type == 4) { else if (type == 4) {
let control: any = this.businessForm.get('service_provider_activity_details') as FormArray; let control: any = this.businessForm.get('service_provider_activity_details') as FormArray;
@ -922,10 +927,12 @@ export class BusinessInfoComponent implements OnInit {
control.controls[selectedIndex].removeControl('max_sale_state_name'); control.controls[selectedIndex].removeControl('max_sale_state_name');
if (value == 'Yes') { if (value == 'Yes') {
control.controls[selectedIndex].addControl('india_where_sale_done', this.fb.array([])); control.controls[selectedIndex].addControl('india_where_sale_done', this.fb.array([]));
control.controls[selectedIndex].addControl('max_sale_state_name',this.fb.array([this.createMaxSaleState()])); } control.controls[selectedIndex].addControl('max_sale_state_name', this.fb.array([this.createMaxSaleState()]));
}
else if (value == 'No') { else if (value == 'No') {
control.controls[selectedIndex].addControl('india_where_sale_done', this.fb.array([this.createStateSale()])); control.controls[selectedIndex].addControl('india_where_sale_done', this.fb.array([this.createStateSale()]));
control.controls[selectedIndex].addControl('max_sale_state_name',this.fb.array([this.createMaxSaleState()])); } control.controls[selectedIndex].addControl('max_sale_state_name', this.fb.array([this.createMaxSaleState()]));
}
} }
} }
@ -1389,8 +1396,7 @@ export class BusinessInfoComponent implements OnInit {
} }
else { else {
if(Year == this.generalExistBusinessYear && +converted_month > this.generalExistBusinessMonth) if (Year == this.generalExistBusinessYear && +converted_month > this.generalExistBusinessMonth) {
{
this.monthErrorMessage[i] = "Higher than Business Vintage"; this.monthErrorMessage[i] = "Higher than Business Vintage";
itemrow.controls.current_business_experiance_year.setValue(''); itemrow.controls.current_business_experiance_year.setValue('');
itemrow.controls.current_business_experiance_month.setValue(''); itemrow.controls.current_business_experiance_month.setValue('');
@ -1806,8 +1812,7 @@ CheckExport(value,stringFlag,index){
if (!this.ServiceUnChecked) { if (!this.ServiceUnChecked) {
if(stringFlag == 'SPActivity' && value == "Both") if (stringFlag == 'SPActivity' && value == "Both") {
{
this.ServiceCounterArray[index] = 1; this.ServiceCounterArray[index] = 1;
} }
else if (stringFlag == 'SPActivity' && value != "Both") { else if (stringFlag == 'SPActivity' && value != "Both") {

View File

@ -4,8 +4,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" <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Close"
mat-dialog-close><mat-icon>close</mat-icon></button> matTooltipPosition="right" mat-dialog-close>
<mat-icon>close</mat-icon>
</button>
</div> </div>
</h2> </h2>
<div *ngIf="noRecordsFound" style="max-width: 100vw !important;width: 100% !important;height: 95% !important;"> <div *ngIf="noRecordsFound" style="max-width: 100vw !important;width: 100% !important;height: 95% !important;">
@ -14,16 +16,19 @@
<mat-card *ngIf="manufacturingForm"> <mat-card *ngIf="manufacturingForm">
<h5 style="margin: 12px;padding:10px !important;">Manufacturing Product Details</h5> <h5 style="margin: 12px;padding:10px !important;">Manufacturing Product Details</h5>
<div formArrayName="manufacturing_details"> <div formArrayName="manufacturing_details">
<div *ngFor="let item of _supplierQuesFrom.controls.manufacturing_details['controls']; let i=index" [formGroupName]="i"> <div *ngFor="let item of _supplierQuesFrom.controls.manufacturing_details['controls']; let i=index"
[formGroupName]="i">
<div formArrayName="main_raw_materials"> <div formArrayName="main_raw_materials">
<div *ngFor="let items of item.controls.main_raw_materials['controls']; let l=index" [formGroupName]="l"> <div *ngFor="let items of item.controls.main_raw_materials['controls']; let l=index"
[formGroupName]="l">
<mat-card style="margin: 12px;"> <mat-card style="margin: 12px;">
<h6 style="margin: 12px;padding:10px !important;">Product #{{l+1}}</h6> <h6 style="margin: 12px;padding:10px !important;">Product #{{l+1}}</h6>
<div fxLayout="row nowrap" fxLayoutGap="2px" fxLayoutAlign="start none"> <div fxLayout="row nowrap" fxLayoutGap="2px" fxLayoutAlign="start none">
<mat-form-field style="width:45%"> <mat-form-field style="width:45%">
<mat-select placeholder="Manufacturing Product Name" formControlName="manufacturing_product_name"> <mat-select placeholder="Manufacturing Product Name" formControlName="manufacturing_product_name">
<mat-option>Select</mat-option> <mat-option>Select</mat-option>
<mat-option *ngFor="let pm of m_manufacturingProducts[0]" [value]="pm.name">{{ pm.name }}</mat-option> <mat-option *ngFor="let pm of m_manufacturingProducts[0]" [value]="pm.name">{{
pm.name }}</mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
@ -47,7 +52,8 @@
<input matInput placeholder="Client Contact Person Name" formControlName="manufacturing_contact_person_name"> <input matInput placeholder="Client Contact Person Name" formControlName="manufacturing_contact_person_name">
</mat-form-field> </mat-form-field>
<mat-form-field style="width: 35%"> <mat-form-field style="width: 35%">
<mat-select placeholder="Contact Person Designation" formControlName="person_designation" (selectionChange)="selectedPersonDesignation(items,$event.value,1)" > <mat-select placeholder="Contact Person Designation" formControlName="person_designation"
(selectionChange)="selectedPersonDesignation(items,$event.value,1)">
<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}} {{comrelShip.name}}
@ -61,15 +67,18 @@
</div> </div>
<div fxLayout="row wrap" fxLayoutGap="2px" fxLayoutAlign="start none"> <div fxLayout="row wrap" fxLayoutGap="2px" fxLayoutAlign="start none">
<mat-form-field style="width: 35%"> <mat-form-field style="width: 35%">
<input matInput placeholder="Client Contact Person Mobile Number" formControlName="manufacturing_contact_person_mobile_number"> <input matInput placeholder="Client Contact Person Mobile Number"
formControlName="manufacturing_contact_person_mobile_number">
<mat-error>Enter Valid Mobile Number.</mat-error> <mat-error>Enter Valid Mobile Number.</mat-error>
</mat-form-field> </mat-form-field>
<mat-form-field style="width: 15%"> <mat-form-field style="width: 15%">
<input matInput autocomplete="off" placeholder="STD Code" formControlName="person_stdcode" type="text" OnlyNumber type="text"> <input matInput autocomplete="off" placeholder="STD Code" formControlName="person_stdcode"
type="text" OnlyNumber type="text">
<mat-error>Enter Valid STD Code Number.</mat-error> <mat-error>Enter Valid STD Code Number.</mat-error>
</mat-form-field> &nbsp; - &nbsp; </mat-form-field> &nbsp; - &nbsp;
<mat-form-field style="width: 35%"> <mat-form-field style="width: 35%">
<input matInput autocomplete="off" placeholder="Client Contact Person Landline Number" formControlName="person_landline" type="text" OnlyNumber type="text"> <input matInput autocomplete="off" placeholder="Client Contact Person Landline Number"
formControlName="person_landline" type="text" OnlyNumber type="text">
<mat-error>Enter Valid LandLine Number.</mat-error> <mat-error>Enter Valid LandLine Number.</mat-error>
</mat-form-field> </mat-form-field>
</div> </div>
@ -78,9 +87,11 @@
<!-- <mat-select placeholder="Payment Type" formControlName="manufacturing_payment_type"> <!-- <mat-select placeholder="Payment Type" formControlName="manufacturing_payment_type">
<mat-option *ngFor="let pm of m_paymentModeType" [value]="pm.id">{{ pm.name }}</mat-option> <mat-option *ngFor="let pm of m_paymentModeType" [value]="pm.id">{{ pm.name }}</mat-option>
</mat-select> --> </mat-select> -->
<mat-select placeholder="Payment Terms" formControlName="manufacturing_payment_type" (selectionChange)="checkCard($event.value,1,l);"> <mat-select placeholder="Payment Terms" formControlName="manufacturing_payment_type"
(selectionChange)="checkCard($event.value,1,l);">
<mat-option>Select</mat-option> <mat-option>Select</mat-option>
<mat-option *ngFor="let pm of m_paymentType" [value]="pm.id">{{ pm.name }}</mat-option> <mat-option *ngFor="let pm of m_paymentType" [value]="pm.id">{{ pm.name
}}</mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
@ -88,7 +99,8 @@
<mat-select placeholder="Payment Mode" formControlName="manufacturing_payment_mode"> <mat-select placeholder="Payment Mode" formControlName="manufacturing_payment_mode">
<mat-option>Select</mat-option> <mat-option>Select</mat-option>
<mat-option value="Payment received in Cash.">Payment received in Cash.</mat-option> <mat-option value="Payment received in Cash.">Payment received in Cash.</mat-option>
<mat-option value="Payment received through Banking channels.">Payment received through Banking channels.</mat-option> <mat-option value="Payment received through Banking channels.">Payment
received through Banking channels.</mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
@ -98,15 +110,20 @@
<mat-label>No of days of Credit provided to Client for payment</mat-label> <mat-label>No of days of Credit provided to Client for payment</mat-label>
<mat-form-field style="width: 25%"> <mat-form-field style="width: 25%">
<input matInput placeholder="Days From" formControlName="manufacturing_credit_days_from" type="number"> <input matInput placeholder="Days From" formControlName="manufacturing_credit_days_from"
type="number">
</mat-form-field> </mat-form-field>
<mat-form-field style="width: 25%"> <mat-form-field style="width: 25%">
<input matInput placeholder="Days To" formControlName="manufacturing_credit_days_to" type="number"> <input matInput placeholder="Days To" formControlName="manufacturing_credit_days_to"
type="number">
</mat-form-field> </mat-form-field>
</div> </div>
<div align="end"> <div align="end">
<span *ngIf="item.controls.main_raw_materials.controls.length > 1" (click)="removeRawMaterials(l)"> <span *ngIf="item.controls.main_raw_materials.controls.length > 1" (click)="removeRawMaterials(l)">
<button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" color="primary" matTooltip="Delete" matTooltipPosition="above"><mat-icon>delete</mat-icon></button> <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon"
color="primary" matTooltip="Delete" matTooltipPosition="above">
<mat-icon>delete</mat-icon>
</button>
</span> </span>
</div> </div>
</mat-card> </mat-card>
@ -114,14 +131,15 @@
</div> </div>
<div fxlayout="row"> <div fxlayout="row">
<div fxFlex="100" align="center"> <div fxFlex="100" align="center">
<button mat-flat-button color="primary" matTooltip="Add More" matTooltipPosition="above" type="button" <button mat-flat-button color="primary" matTooltip="Add More" matTooltipPosition="above"
class="mr-1 mb-1 hover-icon" (click)="addMoreRawMaterials($event); false"><strong>Add More Client</strong></button> type="button" class="mr-1 mb-1 hover-icon" (click)="addMoreRawMaterials($event); false"><strong>Add
More Client</strong></button>
</div> </div>
</div> </div>
<div fxlayout="row"> <div fxlayout="row">
<mat-form-field style="width: 80%" *ngIf="mfgCreditCardFlag"> <mat-form-field style="width: 80%" *ngIf="mfgCreditCardFlag">
<input matInput placeholder="What Percentage of Total Sales is done on Credit ?" formControlName="main_raw_materials_total_payments_percent_on_credit" <input matInput placeholder="What Percentage of Total Sales is done on Credit ?"
type="number"> formControlName="main_raw_materials_total_payments_percent_on_credit" type="number">
</mat-form-field> </mat-form-field>
</div> </div>
@ -131,16 +149,19 @@
<mat-card *ngIf="tradingForm"> <mat-card *ngIf="tradingForm">
<h5 style="margin: 12px;padding:10px !important;">Trading Product Details</h5> <h5 style="margin: 12px;padding:10px !important;">Trading Product Details</h5>
<div formArrayName="trade_details"> <div formArrayName="trade_details">
<div *ngFor="let item of _supplierQuesFrom.controls.trade_details['controls']; let i=index" [formGroupName]="i"> <div *ngFor="let item of _supplierQuesFrom.controls.trade_details['controls']; let i=index"
[formGroupName]="i">
<div formArrayName="trading_products"> <div formArrayName="trading_products">
<div *ngFor="let items of item.controls.trading_products['controls']; let l=index" [formGroupName]="l"> <div *ngFor="let items of item.controls.trading_products['controls']; let l=index"
[formGroupName]="l">
<mat-card style="margin: 12px;"> <mat-card style="margin: 12px;">
<h6 style="margin: 12px;padding:10px !important;">Trading Product #{{l+1}}</h6> <h6 style="margin: 12px;padding:10px !important;">Trading Product #{{l+1}}</h6>
<div fxLayout="row nowrap" fxLayoutGap="2px" fxLayoutAlign="start none"> <div fxLayout="row nowrap" fxLayoutGap="2px" fxLayoutAlign="start none">
<mat-form-field style="width: 45%"> <mat-form-field style="width: 45%">
<mat-select placeholder="Trading Product Name" formControlName="trade_product_name"> <mat-select placeholder="Trading Product Name" formControlName="trade_product_name">
<mat-option>Select</mat-option> <mat-option>Select</mat-option>
<mat-option *ngFor="let pm of m_tradingProducts" [value]="pm.name">{{ pm.name }}</mat-option> <mat-option *ngFor="let pm of m_tradingProducts" [value]="pm.name">{{
pm.name }}</mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<!--<mat-form-field style="width: 100%"> <!--<mat-form-field style="width: 100%">
@ -163,7 +184,8 @@
<input matInput placeholder="Client Contact Person Name" formControlName="trade_product_contact_person_name"> <input matInput placeholder="Client Contact Person Name" formControlName="trade_product_contact_person_name">
</mat-form-field> </mat-form-field>
<mat-form-field style="width: 35%"> <mat-form-field style="width: 35%">
<mat-select placeholder="Contact Person Designation" formControlName="person_designation" (selectionChange)="selectedPersonDesignation(items,$event.value,2)"> <mat-select placeholder="Contact Person Designation" formControlName="person_designation"
(selectionChange)="selectedPersonDesignation(items,$event.value,2)">
<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}} {{comrelShip.name}}
@ -177,15 +199,19 @@
</div> </div>
<div fxLayout="row wrap" fxLayoutGap="2px" fxLayoutAlign="start none"> <div fxLayout="row wrap" fxLayoutGap="2px" fxLayoutAlign="start none">
<mat-form-field style="width: 35%"> <mat-form-field style="width: 35%">
<input matInput placeholder="Client Contact Person Mobile Number" formControlName="trade_product_contact_person_mobile_number" OnlyNumber type="text"> <input matInput placeholder="Client Contact Person Mobile Number"
formControlName="trade_product_contact_person_mobile_number" OnlyNumber
type="text">
<mat-error>Enter Valid Mobile Number.</mat-error> <mat-error>Enter Valid Mobile Number.</mat-error>
</mat-form-field> </mat-form-field>
<mat-form-field style="width: 15%"> <mat-form-field style="width: 15%">
<input matInput autocomplete="off" placeholder="STD Code" formControlName="person_stdcode" type="text" OnlyNumber type="text"> <input matInput autocomplete="off" placeholder="STD Code" formControlName="person_stdcode"
type="text" OnlyNumber type="text">
<mat-error>Enter Valid STD Code Number.</mat-error> <mat-error>Enter Valid STD Code Number.</mat-error>
</mat-form-field> &nbsp; - &nbsp; </mat-form-field> &nbsp; - &nbsp;
<mat-form-field style="width: 35%"> <mat-form-field style="width: 35%">
<input matInput autocomplete="off" placeholder="Client Contact Person Landline Number" formControlName="person_landline" type="text" OnlyNumber type="text"> <input matInput autocomplete="off" placeholder="Client Contact Person Landline Number"
formControlName="person_landline" type="text" OnlyNumber type="text">
<mat-error>Enter Valid LandLine Number.</mat-error> <mat-error>Enter Valid LandLine Number.</mat-error>
</mat-form-field> </mat-form-field>
</div> </div>
@ -195,9 +221,11 @@
<!-- <mat-select placeholder="Payment Type" formControlName="trade_product_payment_type"> <!-- <mat-select placeholder="Payment Type" formControlName="trade_product_payment_type">
<mat-option *ngFor="let pm of m_paymentModeType" [value]="pm.id">{{ pm.name }}</mat-option> <mat-option *ngFor="let pm of m_paymentModeType" [value]="pm.id">{{ pm.name }}</mat-option>
</mat-select> --> </mat-select> -->
<mat-select placeholder="Payment Terms" formControlName="trade_product_payment_type" (selectionChange)="checkCard($event.value,2,l);"> <mat-select placeholder="Payment Terms" formControlName="trade_product_payment_type"
(selectionChange)="checkCard($event.value,2,l);">
<mat-option>Select</mat-option> <mat-option>Select</mat-option>
<mat-option *ngFor="let pm of m_paymentType" [value]="pm.id">{{ pm.name }}</mat-option> <mat-option *ngFor="let pm of m_paymentType" [value]="pm.id">{{ pm.name
}}</mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
@ -205,7 +233,8 @@
<mat-select placeholder="Payment Mode" formControlName="trade_product_payment_mode"> <mat-select placeholder="Payment Mode" formControlName="trade_product_payment_mode">
<mat-option>Select</mat-option> <mat-option>Select</mat-option>
<mat-option value="Payment received in Cash.">Payment received in Cash.</mat-option> <mat-option value="Payment received in Cash.">Payment received in Cash.</mat-option>
<mat-option value="Payment received through Banking channels.">Payment received through Banking channels.</mat-option> <mat-option value="Payment received through Banking channels.">Payment
received through Banking channels.</mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
@ -216,15 +245,20 @@
<div fxLayout="row nowrap" style="padding-left: 2%;" *ngIf="items.get('trade_product_payment_type').value == 3"> <div fxLayout="row nowrap" style="padding-left: 2%;" *ngIf="items.get('trade_product_payment_type').value == 3">
<mat-label>No of days of Credit provided to Client for payment</mat-label> <mat-label>No of days of Credit provided to Client for payment</mat-label>
<mat-form-field style="width: 25%"> <mat-form-field style="width: 25%">
<input matInput placeholder="Days From" formControlName="trade_product_credit_days_from" type="number"> <input matInput placeholder="Days From" formControlName="trade_product_credit_days_from"
type="number">
</mat-form-field> </mat-form-field>
<mat-form-field style="width: 25%"> <mat-form-field style="width: 25%">
<input matInput placeholder="Days To" formControlName="trade_product_credit_days_to" type="number"> <input matInput placeholder="Days To" formControlName="trade_product_credit_days_to"
type="number">
</mat-form-field> </mat-form-field>
</div> </div>
<div align="end"> <div align="end">
<span *ngIf="item.controls.trading_products.controls.length > 1" (click)="removeTradingProduct(l)"> <span *ngIf="item.controls.trading_products.controls.length > 1" (click)="removeTradingProduct(l)">
<button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" color="primary" matTooltip="Delete" matTooltipPosition="above"><mat-icon>delete</mat-icon></button> <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon"
color="primary" matTooltip="Delete" matTooltipPosition="above">
<mat-icon>delete</mat-icon>
</button>
</span> </span>
</div> </div>
</mat-card> </mat-card>
@ -232,14 +266,15 @@
</div> </div>
<div fxlayout="row"> <div fxlayout="row">
<div fxFlex="100" align="center"> <div fxFlex="100" align="center">
<button mat-flat-button color="primary" matTooltip="Add More" matTooltipPosition="above" type="button" <button mat-flat-button color="primary" matTooltip="Add More" matTooltipPosition="above"
class="mr-1 mb-1 hover-icon" (click)="addMoretradeProduct($event); false"><strong>Add More Client</strong></button> type="button" class="mr-1 mb-1 hover-icon" (click)="addMoretradeProduct($event); false"><strong>Add
More Client</strong></button>
</div> </div>
</div> </div>
<div fxlayout="row"> <div fxlayout="row">
<mat-form-field style="width: 80%" *ngIf="trdCreditCardFlag"> <mat-form-field style="width: 80%" *ngIf="trdCreditCardFlag">
<input matInput placeholder="What Percentage of Total Sales is done on Credit ?" formControlName="trading_products_total_payments_percent_on_credit" <input matInput placeholder="What Percentage of Total Sales is done on Credit ?"
type="number"> formControlName="trading_products_total_payments_percent_on_credit" type="number">
</mat-form-field> </mat-form-field>
</div> </div>
</div> </div>
@ -249,16 +284,19 @@
<mat-card *ngIf="serviceProviderForm"> <mat-card *ngIf="serviceProviderForm">
<!--<h5 style="margin: 12px;padding:10px !important;">Service Provider Product Details</h5>--> <!--<h5 style="margin: 12px;padding:10px !important;">Service Provider Product Details</h5>-->
<div formArrayName="service_provider_details"> <div formArrayName="service_provider_details">
<div *ngFor="let item of _supplierQuesFrom.controls.service_provider_details['controls']; let i=index" [formGroupName]="i"> <div *ngFor="let item of _supplierQuesFrom.controls.service_provider_details['controls']; let i=index"
[formGroupName]="i">
<div formArrayName="service_products"> <div formArrayName="service_products">
<div *ngFor="let items of item.controls.service_products['controls']; let l=index" [formGroupName]="l"> <div *ngFor="let items of item.controls.service_products['controls']; let l=index"
[formGroupName]="l">
<mat-card style="margin: 12px;"> <mat-card style="margin: 12px;">
<h6 style="margin: 12px;padding:10px !important;">Service Provided #{{l+1}}</h6> <h6 style="margin: 12px;padding:10px !important;">Service Provided #{{l+1}}</h6>
<div fxLayout="row wrap" fxLayoutGap="2px" fxLayoutAlign="start none"> <div fxLayout="row wrap" fxLayoutGap="2px" fxLayoutAlign="start none">
<mat-form-field style="width: 45%"> <mat-form-field style="width: 45%">
<mat-select placeholder="Select the Service Provided" formControlName="service_provider_product_name"> <mat-select placeholder="Select the Service Provided" formControlName="service_provider_product_name">
<mat-option>Select</mat-option> <mat-option>Select</mat-option>
<mat-option *ngFor="let pm of m_suplierProducts[0]" [value]="pm.name">{{ pm.name }}</mat-option> <mat-option *ngFor="let pm of m_suplierProducts[0]" [value]="pm.name">{{
pm.name }}</mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<mat-form-field style="width: 45%"> <mat-form-field style="width: 45%">
@ -281,7 +319,8 @@
<input matInput placeholder="Client Contact Person Name" formControlName="service_provider_product_contact_person_name"> <input matInput placeholder="Client Contact Person Name" formControlName="service_provider_product_contact_person_name">
</mat-form-field> </mat-form-field>
<mat-form-field style="width: 35%"> <mat-form-field style="width: 35%">
<mat-select placeholder="Contact Person Designation" formControlName="person_designation" (selectionChange)="selectedPersonDesignation(items,$event.value,3)"> <mat-select placeholder="Contact Person Designation" formControlName="person_designation"
(selectionChange)="selectedPersonDesignation(items,$event.value,3)">
<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}} {{comrelShip.name}}
@ -295,15 +334,18 @@
</div> </div>
<div fxLayout="row wrap" fxLayoutGap="2px" fxLayoutAlign="start none"> <div fxLayout="row wrap" fxLayoutGap="2px" fxLayoutAlign="start none">
<mat-form-field style="width: 35%"> <mat-form-field style="width: 35%">
<input matInput placeholder="Client Contact Person Mobile Number" formControlName="service_provider_product_contact_person_mobile_number"> <input matInput placeholder="Client Contact Person Mobile Number"
formControlName="service_provider_product_contact_person_mobile_number">
<mat-error>Enter Valid Mobile Number.</mat-error> <mat-error>Enter Valid Mobile Number.</mat-error>
</mat-form-field> </mat-form-field>
<mat-form-field style="width: 15%"> <mat-form-field style="width: 15%">
<input matInput autocomplete="off" placeholder="STD Code" formControlName="person_stdcode" type="text" OnlyNumber type="text"> <input matInput autocomplete="off" placeholder="STD Code" formControlName="person_stdcode"
type="text" OnlyNumber type="text">
<mat-error>Enter Valid STD Code Number.</mat-error> <mat-error>Enter Valid STD Code Number.</mat-error>
</mat-form-field> &nbsp; - &nbsp; </mat-form-field> &nbsp; - &nbsp;
<mat-form-field style="width: 35%"> <mat-form-field style="width: 35%">
<input matInput autocomplete="off" placeholder="Client Contact Person Landline Number" formControlName="person_landline" type="text" OnlyNumber type="text"> <input matInput autocomplete="off" placeholder="Client Contact Person Landline Number"
formControlName="person_landline" type="text" OnlyNumber type="text">
<mat-error>Enter Valid LandLine Number.</mat-error> <mat-error>Enter Valid LandLine Number.</mat-error>
</mat-form-field> </mat-form-field>
</div> </div>
@ -312,9 +354,11 @@
<!-- <mat-select placeholder="Payment Type" formControlName="service_provider_product_payment_type"> <!-- <mat-select placeholder="Payment Type" formControlName="service_provider_product_payment_type">
<mat-option *ngFor="let pm of m_paymentModeType" [value]="pm.id">{{ pm.name }}</mat-option> <mat-option *ngFor="let pm of m_paymentModeType" [value]="pm.id">{{ pm.name }}</mat-option>
</mat-select> --> </mat-select> -->
<mat-select placeholder="Payment Terms" formControlName="service_provider_product_payment_type" (selectionChange)="checkCard($event.value,3,l);"> <mat-select placeholder="Payment Terms" formControlName="service_provider_product_payment_type"
(selectionChange)="checkCard($event.value,3,l);">
<mat-option>Select</mat-option> <mat-option>Select</mat-option>
<mat-option *ngFor="let pm of m_paymentType" [value]="pm.id">{{ pm.name }}</mat-option> <mat-option *ngFor="let pm of m_paymentType" [value]="pm.id">{{ pm.name
}}</mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
@ -322,7 +366,8 @@
<mat-select placeholder="Payment Mode" formControlName="service_provider_product_payment_mode"> <mat-select placeholder="Payment Mode" formControlName="service_provider_product_payment_mode">
<mat-option>Select</mat-option> <mat-option>Select</mat-option>
<mat-option value="Payment received in Cash.">Payment received in Cash.</mat-option> <mat-option value="Payment received in Cash.">Payment received in Cash.</mat-option>
<mat-option value="Payment received through Banking channels.">Payment received through Banking channels.</mat-option> <mat-option value="Payment received through Banking channels.">Payment
received through Banking channels.</mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
@ -333,15 +378,20 @@
<div fxLayout="row nowrap" style="padding-left: 2%;" *ngIf="items.get('service_provider_product_payment_type').value == 3"> <div fxLayout="row nowrap" style="padding-left: 2%;" *ngIf="items.get('service_provider_product_payment_type').value == 3">
<mat-label>No of days of Credit provided to Client for payment</mat-label> <mat-label>No of days of Credit provided to Client for payment</mat-label>
<mat-form-field style="width: 25%"> <mat-form-field style="width: 25%">
<input matInput placeholder="Days From" formControlName="service_provider_product_credit_days_from" type="number"> <input matInput placeholder="Days From" formControlName="service_provider_product_credit_days_from"
type="number">
</mat-form-field> </mat-form-field>
<mat-form-field style="width: 25%"> <mat-form-field style="width: 25%">
<input matInput placeholder="Days To" formControlName="service_provider_product_credit_days_to" type="number"> <input matInput placeholder="Days To" formControlName="service_provider_product_credit_days_to"
type="number">
</mat-form-field> </mat-form-field>
</div> </div>
<div align="end"> <div align="end">
<span *ngIf="item.controls.service_products.controls.length > 1" (click)="removeServiceProduct(l)"> <span *ngIf="item.controls.service_products.controls.length > 1" (click)="removeServiceProduct(l)">
<button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" color="primary" matTooltip="Delete" matTooltipPosition="above"><mat-icon>delete</mat-icon></button> <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon"
color="primary" matTooltip="Delete" matTooltipPosition="above">
<mat-icon>delete</mat-icon>
</button>
</span> </span>
</div> </div>
</mat-card> </mat-card>
@ -349,14 +399,15 @@
</div> </div>
<div fxlayout="row"> <div fxlayout="row">
<div fxFlex="100" align="center"> <div fxFlex="100" align="center">
<button mat-flat-button color="primary" matTooltip="Add More" matTooltipPosition="above" type="button" <button mat-flat-button color="primary" matTooltip="Add More" matTooltipPosition="above"
class="mr-1 mb-1 hover-icon" (click)="addMoreServiceProduct($event); false"><strong>Add More Client</strong></button> type="button" class="mr-1 mb-1 hover-icon" (click)="addMoreServiceProduct($event); false"><strong>Add
More Client</strong></button>
</div> </div>
</div> </div>
<div fxlayout="row"> <div fxlayout="row">
<mat-form-field style="width: 80%" *ngIf="spCreditCardFlag"> <mat-form-field style="width: 80%" *ngIf="spCreditCardFlag">
<input matInput placeholder="What Percentage of Total Sales is done on Credit ?" formControlName="service_products_total_payments_percent_on_credit" <input matInput placeholder="What Percentage of Total Sales is done on Credit ?"
type="number"> formControlName="service_products_total_payments_percent_on_credit" type="number">
</mat-form-field> </mat-form-field>
</div> </div>
@ -376,7 +427,10 @@
</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" 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

@ -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>
@ -38,42 +41,55 @@
<div *ngFor="let details of currentLoanForm.get('loan_details').controls; let i=index; let last=last" <div *ngFor="let details of currentLoanForm.get('loan_details').controls; let i=index; let last=last"
[formGroupName]="i"> [formGroupName]="i">
<mat-card-header> <mat-card-header>
<mat-card-title><p>Loan Details {{details.get('label').value}}</p></mat-card-title> <mat-card-title>
<p>Loan Details {{details.get('label').value}}</p>
</mat-card-title>
</mat-card-header> </mat-card-header>
<!-- {{frequencyData | json}} --> <!-- {{frequencyData | json}} -->
<!-- Loan type, Loan amount, Lender, Loan Taken By, Instalment Frequency, Instalment Amount, Original Tenure, Balance Tenure --> <!-- Loan type, Loan amount, Lender, Loan Taken By, Instalment Frequency, Instalment Amount, Original Tenure, Balance Tenure -->
<mat-card-content class="matcard"> <mat-card-content class="matcard">
<mat-form-field style="width:45%;"> <mat-form-field style="width:45%;">
<mat-select placeholder="Loan Type" formControlName="loan_type" (selectionChange)="setRequiredValidation($event.value,details,1)"> <mat-select placeholder="Loan Type" formControlName="loan_type"
(selectionChange)="setRequiredValidation($event.value,details,1)">
<mat-option>Select</mat-option> <mat-option>Select</mat-option>
<mat-option value="{{types.existing_loan_type_id}}" *ngFor="let types of loanTypeData">{{types.loan_type_name}}</mat-option> <mat-option value="{{types.existing_loan_type_id}}" *ngFor="let types of loanTypeData">{{types.loan_type_name}}</mat-option>
</mat-select> </mat-select>
<!-- <input matInput autocomplete="off" placeholder="Loan Type" formControlName="loan_type" > --> <!-- <input matInput autocomplete="off" placeholder="Loan Type" formControlName="loan_type" > -->
</mat-form-field> </mat-form-field>
<mat-form-field *ngIf="details.get('loan_type').value == 1 " style="width:45%;"> <mat-form-field *ngIf="details.get('loan_type').value == 1 " style="width:45%;">
<input matInput autocomplete="off" placeholder="Specify Loan Type" formControlName="others_loan_type"> <input matInput autocomplete="off" placeholder="Specify Loan Type"
formControlName="others_loan_type">
</mat-form-field> </mat-form-field>
<mat-form-field style="width:45%;"> <mat-form-field style="width:45%;">
<input matInput autocomplete="off" placeholder="Loan Amount" formControlName="loan_amount" OnlyNumber type="text" (keyup)="inWords($event,i,1)"> <input matInput autocomplete="off" placeholder="Loan Amount"
<mat-hint my-mat-hint align="start" style="font-size:90%" *ngIf="details.get('loan_amount').value != ''">{{"&#8377;"}} {{amtInwords[i]}} Only</mat-hint> formControlName="loan_amount" OnlyNumber type="text"
(keyup)="inWords($event,i,1)">
<mat-hint my-mat-hint align="start" style="font-size:90%" *ngIf="details.get('loan_amount').value != ''">{{"&#8377;"}}
{{amtInwords[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="Lender" formControlName="lender" (selectionChange)="setRequiredValidation($event.value,details,2)"> <mat-select placeholder="Lender" formControlName="lender"
(selectionChange)="setRequiredValidation($event.value,details,2)">
<mat-option>Select</mat-option> <mat-option>Select</mat-option>
<mat-option *ngFor="let btLen of lenderData" [value]="btLen.bt_lender_list_id">{{ btLen.lender_name }}</mat-option> <mat-option *ngFor="let btLen of lenderData" [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="details.get('lender').value == 1" style="width:45%;"> <mat-form-field *ngIf="details.get('lender').value == 1" style="width:45%;">
<input matInput autocomplete="off" placeholder="Specify Lender" formControlName="others_lender" > <input matInput autocomplete="off" placeholder="Specify Lender"
formControlName="others_lender">
</mat-form-field> </mat-form-field>
<mat-form-field style="width:45%;"> <mat-form-field style="width:45%;">
<!-- <mat-select placeholder="Loan Taken By" formControlName="loan_taken_by" (selectionChange)="selectedBorrower($event.value,i)"> <!-- <mat-select placeholder="Loan Taken By" formControlName="loan_taken_by" (selectionChange)="selectedBorrower($event.value,i)">
<mat-option value="{{owner.pd_co_applicant_id}}" *ngFor="let owner of applicants">{{owner.applicant_name}}</mat-option> <mat-option value="{{owner.pd_co_applicant_id}}" *ngFor="let owner of applicants">{{owner.applicant_name}}</mat-option>
<!-- <mat-option value= 0 >Others</mat-option> -> <!-- <mat-option value= 0 >Others</mat-option> ->
</mat-select> --> </mat-select> -->
<mat-select placeholder="Loan Taken By" formControlName="loan_taken_by" [compareWith]="compareObjects" (selectionChange)="setRequiredValidation($event.value.id,details,3)"> <mat-select placeholder="Loan Taken By" formControlName="loan_taken_by"
<mat-optgroup *ngFor="let group of mergeCompanyApplicant" [label]="group.groupName"> [compareWith]="compareObjects" (selectionChange)="setRequiredValidation($event.value.id,details,3)">
<mat-option *ngFor="let val of group.groupValues" [value]="val"> <mat-optgroup *ngFor="let group of mergeCompanyApplicant"
[label]="group.groupName">
<mat-option *ngFor="let val of group.groupValues"
[value]="val">
{{val.name}} {{val.name}}
</mat-option> </mat-option>
</mat-optgroup> </mat-optgroup>
@ -82,38 +98,46 @@
<!-- {{details.get('loan_taken_by').value}} --> <!-- {{details.get('loan_taken_by').value}} -->
<!-- <mat-form-field *ngIf="details.get('loan_taken_by').value == 0"> --> <!-- <mat-form-field *ngIf="details.get('loan_taken_by').value == 0"> -->
<mat-form-field style="width:45%;" *ngIf="checkOthers(details.get('loan_taken_by').value)===true"> <mat-form-field style="width:45%;" *ngIf="checkOthers(details.get('loan_taken_by').value)===true">
<input matInput autocomplete="off" placeholder="Specify Borrower" formControlName="others_loan_taken"> <input matInput autocomplete="off" placeholder="Specify Borrower"
formControlName="others_loan_taken">
</mat-form-field> </mat-form-field>
<mat-form-field style="width:45%;"> <mat-form-field style="width:45%;">
<mat-select placeholder="Instalment Frequency" (selectionChange)="selectedfrequency($event.value,i);setRequiredValidation($event.value,details,4);" <mat-select placeholder="Instalment Frequency"
(selectionChange)="selectedfrequency($event.value,i);setRequiredValidation($event.value,details,4);"
formControlName="frequency"> formControlName="frequency">
<mat-option>Select</mat-option> <mat-option>Select</mat-option>
<mat-option *ngFor="let freq of frequencyData" value="{{freq.frequency_id}}">{{freq.name}}</mat-option> <mat-option *ngFor="let freq of frequencyData" value="{{freq.frequency_id}}">{{freq.name}}</mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<mat-form-field *ngIf="details.get('frequency').value == 1" style="width:45%"> <mat-form-field *ngIf="details.get('frequency').value == 1" style="width:45%">
<input matInput autocomplete="off" placeholder="Specify Frequency" formControlName="other_frequency"> <input matInput autocomplete="off" placeholder="Specify Frequency"
formControlName="other_frequency">
</mat-form-field> </mat-form-field>
<mat-form-field *ngIf="details.get('frequency').value != ''" style="width:45%"> <mat-form-field *ngIf="details.get('frequency').value != ''" style="width:45%">
<input matInput autocomplete="off" [placeholder]="placeholderName[i] != '' ? placeholderName[i] : 'Instalment Amount' " formControlName="emi" OnlyNumber type="text" (keyup)="inWords($event,i,2)"> <input matInput autocomplete="off" [placeholder]="placeholderName[i] != '' ? placeholderName[i] : 'Instalment Amount' "
formControlName="emi" OnlyNumber type="text" (keyup)="inWords($event,i,2)">
<!-- <input matInput autocomplete="off" placeholder="details.get('loan_type').value + Instalment Amount " formControlName="emi" OnlyNumber type="text" (keyup)="inWords($event,i,2)"> --> <!-- <input matInput autocomplete="off" placeholder="details.get('loan_type').value + Instalment Amount " formControlName="emi" OnlyNumber type="text" (keyup)="inWords($event,i,2)"> -->
<mat-hint my-mat-hint align="start" style="font-size:90%" *ngIf="details.get('emi').value != ''">{{"&#8377;"}} {{emiAmtInwords[i]}} Only</mat-hint> <mat-hint my-mat-hint align="start" style="font-size:90%" *ngIf="details.get('emi').value != ''">{{"&#8377;"}}
{{emiAmtInwords[i]}} Only</mat-hint>
</mat-form-field> </mat-form-field>
<!-- <mat-form-field> <!-- <mat-form-field>
<input matInput autocomplete="off" placeholder="Lender" formControlName="lender" > <input matInput autocomplete="off" placeholder="Lender" formControlName="lender" >
</mat-form-field> --> </mat-form-field> -->
<div style="width:100%"> <div style="width:100%">
<mat-form-field style="width:25%"> <mat-form-field style="width:25%">
<input matInput autocomplete="off" placeholder="Original Tenure in Months" formControlName="original_tenure" (change)="checkTenure(details);calculateTenure(details)"> <input matInput autocomplete="off" placeholder="Original Tenure in Months"
formControlName="original_tenure" (change)="checkTenure(details);calculateTenure(details)">
</mat-form-field> </mat-form-field>
<mat-form-field style="width:35%"> <mat-form-field style="width:35%">
<input matInput autocomplete="off" placeholder="Current Balance Tenure in Months" formControlName="current_balance_tenure" (change)="calculateTenure(details)"> <input matInput autocomplete="off" placeholder="Current Balance Tenure in Months"
formControlName="current_balance_tenure" (change)="calculateTenure(details)">
<mat-error>Invalid Balance Tenure.</mat-error> <mat-error>Invalid Balance Tenure.</mat-error>
<!-- //*ngIf="current_balance_tenure.hasError('min')" class="mat-text-warn" --> <!-- //*ngIf="current_balance_tenure.hasError('min')" class="mat-text-warn" -->
</mat-form-field> </mat-form-field>
<mat-form-field style="width:25%"> <mat-form-field style="width:25%">
<input matInput placeholder="Elapsed Tenure in Months" formControlName="elapsed_tenure" autocomplete="off"> <input matInput placeholder="Elapsed Tenure in Months"
formControlName="elapsed_tenure" autocomplete="off">
</mat-form-field> </mat-form-field>
</div> </div>
@ -128,13 +152,17 @@
</mat-card-content> </mat-card-content>
<mat-card-actions> <mat-card-actions>
<div align="right"> <div align="right">
<button *ngIf="currentLoanForm.controls.loan_details.controls.length > 1" type="button" class="mr-1 mb-1 hover-icon" mat-raised-button mat-icon-button matTooltip="Delete" matTooltipPosition="above" (click)="deleteLoanDetails(i)"> <button *ngIf="currentLoanForm.controls.loan_details.controls.length > 1"
type="button" class="mr-1 mb-1 hover-icon"
mat-raised-button mat-icon-button matTooltip="Delete"
matTooltipPosition="above" (click)="deleteLoanDetails(i)">
<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)="addLoanDetails()" <button type="button" mat-flat-button (click)="addLoanDetails()"
matTooltip="Add More" matTooltipPosition="left" color="primary" *ngIf="last"> matTooltip="Add More" matTooltipPosition="left" color="primary"
*ngIf="last">
<strong>Add More Loan Details </strong> <strong>Add More Loan Details </strong>
</button> </button>
</div> </div>
@ -209,43 +237,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>
@ -267,7 +343,9 @@
</mat-form-field> </mat-form-field>
</div> </div>
<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)="submitCurrentloan()"><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)="submitCurrentloan()">
<mat-icon>save</mat-icon>
</button> </button>
</div> </div>
</mat-dialog-actions> </mat-dialog-actions>
@ -371,4 +449,3 @@
</form> </form>
</mat-card-content> </mat-card-content>
</mat-card> --> </mat-card> -->

View File

@ -184,37 +184,40 @@ export class CurrentLoanComponent implements OnInit {
} else { } else {
this._pd.getAssetsWithLoanFromBusiness(this.pdid).subscribe(data => { this._pd.getAssetsWithLoanFromBusiness(this.pdid).subscribe(data => {
// console.log('data',data);
if (data.dataStatus == true) { if (data.dataStatus == true) {
// console.log('data',data.record);
// return;
let AssetData = data.record; let AssetData = data.record;
if (AssetData.business_address_asset.length > 0) { if (AssetData.business_address_asset.length > 0) {
AssetData.business_address_asset.map(element => { AssetData.business_address_asset.map(element => {
this.dataFromAssets.push({mode:0, this.dataFromAssets.push({
mode: 0,
mode_name: element.address_label, mode_name: element.address_label,
details: [], details: [],
owner_name: element.business_name_of_the_owner, owner_name: element.business_name_of_the_owner,
form_type:'Data From Bussiness Address'}) form_type: 'Data From Bussiness Address'
})
}); });
} }
if (AssetData.business_assets.length > 0) { if (AssetData.business_assets.length > 0) {
AssetData.business_assets.map(element => { AssetData.business_assets.map(element => {
this.dataFromAssets.push({mode:element.business_assets_mode, this.dataFromAssets.push({
mode: element.business_assets_mode,
mode_name: element.business_assets_mode_name, mode_name: element.business_assets_mode_name,
details: element.business_details, details: element.business_details,
owner_name: element.business_name_of_the_owner, owner_name: element.business_name_of_the_owner,
form_type:'Data From Business Assets'}) form_type: 'Data From Business Assets'
})
}); });
} }
if (AssetData.other_assests.length > 0) { if (AssetData.other_assests.length > 0) {
AssetData.other_assests.map(element => { AssetData.other_assests.map(element => {
this.dataFromAssets.push({mode:element.assets_mode, this.dataFromAssets.push({
mode: element.assets_mode,
mode_name: element.assets_mode_name, mode_name: element.assets_mode_name,
details: element.details, details: element.details,
owner_name: element.name_of_the_owner, owner_name: element.name_of_the_owner,
@ -494,8 +497,7 @@ export class CurrentLoanComponent implements OnInit {
control.removeAt(index); control.removeAt(index);
} }
calculateTenure(details) calculateTenure(details) {
{
let ElapsedValues; let ElapsedValues;
if (details.value.original_tenure != null && details.value.original_tenure != '' && details.value.current_balance_tenure != null && details.value.current_balance_tenure != '') { if (details.value.original_tenure != null && details.value.original_tenure != '' && details.value.current_balance_tenure != null && details.value.current_balance_tenure != '') {

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>
@ -21,7 +24,8 @@
<!-- <input matInput> --> <!-- <input matInput> -->
<mat-select placeholder="Name of Employer" formControlName="employer_name" required> <mat-select placeholder="Name of Employer" formControlName="employer_name" required>
<mat-option>Select</mat-option> <mat-option>Select</mat-option>
<mat-option *ngFor="let cl of company_list" [value]="cl.company_order_id+'-'+cl.company_name">{{ cl.company_name }}</mat-option> <mat-option *ngFor="let cl of company_list" [value]="cl.company_order_id+'-'+cl.company_name">{{
cl.company_name }}</mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<div> <div>
@ -29,16 +33,17 @@
<br> <br>
<div fxLayout="row" fxLayoutGap="2px" fxLayoutAlign="start none"> <div fxLayout="row" fxLayoutGap="2px" fxLayoutAlign="start none">
<mat-form-field> <mat-form-field>
<input matInput OnlyNumber type="text" autocomplete="off" placeholder="Year" formControlName="how_long_year" required min='0'> <input matInput OnlyNumber type="text" autocomplete="off" placeholder="Year"
formControlName="how_long_year" required min='0'>
</mat-form-field> </mat-form-field>
<mat-form-field> <mat-form-field>
<input matInput OnlyNumber type="text" autocomplete="off" placeholder="Month" formControlName="how_long_month" min='0' (change)="ConvertMonthintoYear($event.target.value)"> <input matInput OnlyNumber type="text" autocomplete="off" placeholder="Month"
formControlName="how_long_month" min='0' (change)="ConvertMonthintoYear($event.target.value)">
</mat-form-field> </mat-form-field>
</div> </div>
</div> </div>
<mat-form-field *ngIf="pd_cus_segment!='SAL-CHQ'" style="width: 45%"> <mat-form-field *ngIf="pd_cus_segment!='SAL-CHQ'" style="width: 45%">
<mat-select placeholder="Was the employer met?" <mat-select placeholder="Was the employer met?" formControlName="was_met" required>
formControlName="was_met" required>
<mat-option>Select</mat-option> <mat-option>Select</mat-option>
<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>
@ -47,7 +52,8 @@
<div fxLayout="row" fxLayoutGap="2px" fxLayoutAlign="start none" *ngIf="employmentForm.controls['was_met'].value == 'yes'"> <div fxLayout="row" fxLayoutGap="2px" fxLayoutAlign="start none" *ngIf="employmentForm.controls['was_met'].value == 'yes'">
<mat-form-field fxFlex="50"> <mat-form-field fxFlex="50">
<!-- <input matInput placeholder="Name of Person Met" formControlName="name_person_met" required> --> <!-- <input matInput placeholder="Name of Person Met" formControlName="name_person_met" required> -->
<mat-select placeholder="Name of Person Met" formControlName="name_person_met" required (selectionChange)="filtercompanyrelationship(employmentForm.controls['employer_name'].value,$event.value)"> <mat-select placeholder="Name of Person Met" formControlName="name_person_met"
required (selectionChange)="filtercompanyrelationship(employmentForm.controls['employer_name'].value,$event.value)">
<mat-option>Select</mat-option> <mat-option>Select</mat-option>
<mat-option *ngFor="let person of person_met_list" [value]="person.pd_co_applicant_id"> <mat-option *ngFor="let person of person_met_list" [value]="person.pd_co_applicant_id">
{{person.applicant_name | titlecase}} {{person.applicant_name | titlecase}}
@ -55,7 +61,8 @@
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<mat-form-field fxFlex="50"> <mat-form-field fxFlex="50">
<input matInput placeholder="Designation of Person Met" formControlName="designation_person_met" required> <input matInput placeholder="Designation of Person Met" formControlName="designation_person_met"
required>
<!-- <mat-select placeholder="Designation of Person Met" formControlName="designation_person_met" required> <!-- <mat-select placeholder="Designation of Person Met" formControlName="designation_person_met" required>
<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">
@ -66,8 +73,8 @@
</mat-form-field> </mat-form-field>
</div> </div>
<mat-form-field *ngIf="pd_cus_segment!='SAL-CHQ'" style="width: 45%"> <mat-form-field *ngIf="pd_cus_segment!='SAL-CHQ'" style="width: 45%">
<mat-select placeholder="Salary amount confirmed ?" <mat-select placeholder="Salary amount confirmed ?" formControlName="confirm_salary"
formControlName="confirm_salary" required> required>
<mat-option>Select</mat-option> <mat-option>Select</mat-option>
<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>
@ -75,33 +82,35 @@
</mat-form-field> </mat-form-field>
<div fxLayout="row" fxLayoutGap="2px" fxLayoutAlign="start none" *ngIf="employmentForm.controls['confirm_salary'].value == 'yes'"> <div fxLayout="row" fxLayoutGap="2px" fxLayoutAlign="start none" *ngIf="employmentForm.controls['confirm_salary'].value == 'yes'">
<mat-form-field fxFlex="50"> <mat-form-field fxFlex="50">
<input matInput placeholder="What is the salary amount confirmed?" formControlName="confirm_salary_amount" (keypress)="keyPress($event)"> <input matInput placeholder="What is the salary amount confirmed?"
<mat-hint align="start" style="font-size:90%" *ngIf="employmentForm.controls['confirm_salary_amount'].value != ''">{{"&#8377;"}} {{employmentForm.controls['confirm_salary_amount'].value | numberToWords}} Only</mat-hint> formControlName="confirm_salary_amount" (keypress)="keyPress($event)">
<mat-hint align="start" style="font-size:90%" *ngIf="employmentForm.controls['confirm_salary_amount'].value != ''">{{"&#8377;"}}
{{employmentForm.controls['confirm_salary_amount'].value | numberToWords}}
Only</mat-hint>
</mat-form-field> </mat-form-field>
<mat-form-field fxFlex="25"> <mat-form-field fxFlex="25">
<input matInput placeholder="Total Work Experience" <input matInput placeholder="Total Work Experience" formControlName="total_business_experience"
formControlName="total_business_experience" OnlyNumber autocomplete="off"> OnlyNumber autocomplete="off">
<mat-error *ngIf="employmentForm.controls['total_business_experience'].value > employmentForm.controls['how_long_year'].value">Higher</mat-error> <mat-error *ngIf="employmentForm.controls['total_business_experience'].value > employmentForm.controls['how_long_year'].value">Higher</mat-error>
</mat-form-field> </mat-form-field>
<!-- *ngIf="employmentForm.controls['how_long_year'].value > employmentForm.controls['total_business_experience'].value" --> <!-- *ngIf="employmentForm.controls['how_long_year'].value > employmentForm.controls['total_business_experience'].value" -->
<mat-form-field fxFlex="25" *ngIf="employmentForm.controls['total_business_experience'].value > employmentForm.controls['how_long_year'].value"> <mat-form-field fxFlex="25" *ngIf="employmentForm.controls['total_business_experience'].value > employmentForm.controls['how_long_year'].value">
<input matInput placeholder="Previous Work Experience Details" <input matInput placeholder="Previous Work Experience Details" formControlName="total_business_previous_experience">
formControlName="total_business_previous_experience">
</mat-form-field> </mat-form-field>
</div> </div>
<mat-form-field *ngIf="pd_cus_segment!='SAL-CHQ'" style="width: 45%"> <mat-form-field *ngIf="pd_cus_segment!='SAL-CHQ'" style="width: 45%">
<mat-select placeholder="Attendance register seen ?" <mat-select placeholder="Attendance register seen ?" formControlName="attendance_seen"
formControlName="attendance_seen" required> required>
<mat-option>Select</mat-option> <mat-option>Select</mat-option>
<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-form-field> </mat-form-field>
<mat-form-field *ngIf="pd_cus_segment!='SAL-CHQ'" style="width: 45%"> <mat-form-field *ngIf="pd_cus_segment!='SAL-CHQ'" style="width: 45%">
<mat-select placeholder="Salary register seen ?" <mat-select placeholder="Salary register seen ?" formControlName="sal_reg_seen"
formControlName="sal_reg_seen" required> required>
<mat-option>Select</mat-option> <mat-option>Select</mat-option>
<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>
@ -115,37 +124,38 @@
<div fxLayout="row wrap"> <div fxLayout="row wrap">
<div fxFlex="100"> <div fxFlex="100">
<mat-form-field style="width: 33%"> <mat-form-field style="width: 33%">
<input matInput placeholder="From Date of Salary" formControlName="from_date_the_salary_is_rcv" OnlyNumber type="number" min='1' max='31'> <input matInput placeholder="From Date of Salary" formControlName="from_date_the_salary_is_rcv"
OnlyNumber type="number" min='1' max='31'>
</mat-form-field> </mat-form-field>
<mat-form-field style="width: 33%"> <mat-form-field style="width: 33%">
<input matInput placeholder="To Date of Salary" formControlName="to_date_the_salary_is_rcv" OnlyNumber type="number" min='1' max='31'> <input matInput placeholder="To Date of Salary" formControlName="to_date_the_salary_is_rcv"
OnlyNumber type="number" min='1' max='31'>
</mat-form-field> </mat-form-field>
<mat-form-field style="width: 33%"> <mat-form-field style="width: 33%">
<input matInput placeholder="Gross Monthly Salary" formControlName="gross_monthly_salary" (keypress)="keyPress($event)" required> <input matInput placeholder="Gross Monthly Salary" formControlName="gross_monthly_salary"
(keypress)="keyPress($event)" required>
</mat-form-field> </mat-form-field>
<mat-form-field style="width:33%"> <mat-form-field style="width:33%">
<input matInput placeholder="Net Monthly Salary" <input matInput placeholder="Net Monthly Salary" formControlName="net_monthly_salary"
formControlName="net_monthly_salary" (keypress)="keyPress($event)" required> (keypress)="keyPress($event)" required>
<!-- <input matInput placeholder="Net Take Home" <!-- <input matInput placeholder="Net Take Home"
formControlName="net_take_home"> --> formControlName="net_take_home"> -->
</mat-form-field> </mat-form-field>
<mat-form-field style="width: 33%"> <mat-form-field style="width: 33%">
<input matInput placeholder="Bonus or Incentive" <input matInput placeholder="Bonus or Incentive" formControlName="bonus_incentive"
formControlName="bonus_incentive" (keypress)="keyPress($event)" required> (keypress)="keyPress($event)" required>
</mat-form-field> </mat-form-field>
<mat-form-field style="width: 33%"> <mat-form-field style="width: 33%">
<mat-select placeholder="Amount paid in Cash ?" <mat-select placeholder="Amount paid in Cash ?" formControlName="amount_paid_in_cash">
formControlName="amount_paid_in_cash">
<mat-option>Select</mat-option> <mat-option>Select</mat-option>
<mat-option value="validated">Validated</mat-option> <mat-option value="validated">Validated</mat-option>
<mat-option value="not validated">Not Validated</mat-option> <mat-option value="not validated">Not Validated</mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<mat-form-field style="width: 33%;" *ngIf="employmentForm.controls['amount_paid_in_cash'].value == 'validated'"> <mat-form-field style="width: 33%;" *ngIf="employmentForm.controls['amount_paid_in_cash'].value == 'validated'">
<input matInput placeholder="How was it Validated" <input matInput placeholder="How was it Validated" formControlName="how_was_it_validated">
formControlName="how_was_it_validated">
</mat-form-field> </mat-form-field>
<mat-form-field style="width: 33%;" *ngIf="employmentForm.controls['amount_paid_in_cash'].value == 'not validated'"> <mat-form-field style="width: 33%;" *ngIf="employmentForm.controls['amount_paid_in_cash'].value == 'not validated'">
<input matInput placeholder="Why was it not Validated" <input matInput placeholder="Why was it not Validated"
@ -158,16 +168,17 @@
<mat-form-field style="width: 33%" *ngIf="employmentForm.controls['bonus_incentive'].value != '' && employmentForm.controls['bonus_incentive'].value != '0' "> <mat-form-field style="width: 33%" *ngIf="employmentForm.controls['bonus_incentive'].value != '' && employmentForm.controls['bonus_incentive'].value != '0' ">
<mat-select placeholder="Bonus Frequency" formControlName="bonus_frequency"> <mat-select placeholder="Bonus Frequency" formControlName="bonus_frequency">
<mat-option>Select</mat-option> <mat-option>Select</mat-option>
<mat-option *ngFor="let fd of frequency_data" [value]="fd.frequency_id">{{ fd.name }}</mat-option> <mat-option *ngFor="let fd of frequency_data" [value]="fd.frequency_id">{{
fd.name }}</mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<mat-form-field style="width: 33%" *ngIf="employmentForm.controls['bonus_incentive'].value != '' && employmentForm.controls['bonus_incentive'].value != '0' "> <mat-form-field style="width: 33%" *ngIf="employmentForm.controls['bonus_incentive'].value != '' && employmentForm.controls['bonus_incentive'].value != '0' ">
<mat-select placeholder="Type of Bonus" <mat-select placeholder="Type of Bonus" formControlName="bonus_type">
formControlName="bonus_type">
<mat-option>Select</mat-option> <mat-option>Select</mat-option>
<mat-option value="fixed">Fixed</mat-option> <mat-option value="fixed">Fixed</mat-option>
<mat-option value="variable depending on performance">Variable depending on performance</mat-option> <mat-option value="variable depending on performance">Variable
depending on performance</mat-option>
<mat-option value="others">Others</mat-option> <mat-option value="others">Others</mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
@ -175,8 +186,7 @@
<input matInput placeholder="Bonus Type Others" formControlName="bonus_type_other"> <input matInput placeholder="Bonus Type Others" formControlName="bonus_type_other">
</mat-form-field> </mat-form-field>
<mat-form-field style="width: 33%"> <mat-form-field style="width: 33%">
<mat-select placeholder="Any Delays" <mat-select placeholder="Any Delays" formControlName="any_delays">
formControlName="any_delays">
<mat-option>Select</mat-option> <mat-option>Select</mat-option>
<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>
@ -244,43 +254,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>
@ -301,7 +359,9 @@
<div fxFlex="40" align="end"> <div fxFlex="40" align="end">
<!-- <button type="submit" mat-raised-button mat-icon-button type="submit" matTooltip="Submit" matTooltipPosition="above" (click)="submitFamily()"><mat-icon>save</mat-icon></button> --> <!-- <button type="submit" mat-raised-button mat-icon-button type="submit" matTooltip="Submit" matTooltipPosition="above" (click)="submitFamily()"><mat-icon>save</mat-icon></button> -->
<button type="submit" class="mr-1 mb-1 hover-icon" mat-raised-button mat-icon-button matTooltip="Submit" matTooltipPosition="above" (click)="submitDetails()"><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)="submitDetails()">
<mat-icon>save</mat-icon>
</button> </button>
</div> </div>

View File

@ -83,20 +83,20 @@ export class EmploymentInfoComponent implements OnInit {
} }
}; };
ngOnInit() { ngOnInit() {
console.log('clear');
console.clear(); console.clear();
this.pd_cus_segment = this.pd_all_details.pdmaster_details.customer_segment_abbr.toUpperCase(); this.pd_cus_segment = this.pd_all_details.pdmaster_details.customer_segment_abbr.toUpperCase();
this.initemploymentForm(); this.initemploymentForm();
let params: any = {}; let params: any = {};
params.pd_id = this.pdid; params.pd_id = this.pdid;
params.pd_form_id = this.form_id; params.pd_form_id = this.form_id;
console.log('abcd');
let param: any = {}; let param: any = {};
param.pd_id = this.pdid; param.pd_id = this.pdid;
param.pd_form_id = '18'; param.pd_form_id = '18';
this._pd.retriveForm(param).subscribe(data => { this._pd.retriveForm(param).subscribe(data => {
if (data.dataStatus) { if (data.dataStatus) {
console.log(data.records);
this.company_list = data.records.companies.filter(com => com.is_active == true); this.company_list = data.records.companies.filter(com => com.is_active == true);
this.person_met_list = data.records.individuals.filter(app => app.is_person_met == true && app.is_active == true); this.person_met_list = data.records.individuals.filter(app => app.is_person_met == true && app.is_active == true);
this.company_related_applicants_list = data.records.company_with_relationships; this.company_related_applicants_list = data.records.company_with_relationships;

View File

@ -4,8 +4,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" <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Close"
mat-dialog-close><mat-icon>close</mat-icon></button> matTooltipPosition="right" mat-dialog-close>
<mat-icon>close</mat-icon>
</button>
</div> </div>
</h2> </h2>
<form *ngIf="noRecordsFound" class="address" [formGroup]="familyForm"> <form *ngIf="noRecordsFound" class="address" [formGroup]="familyForm">
@ -16,12 +18,14 @@
<div fxLayout="row wrap"> <div fxLayout="row wrap">
<div fxFlex="100"> <div fxFlex="100">
<div formArrayName="family_details"> <div formArrayName="family_details">
<mat-card *ngFor="let sup of familyForm.controls.family_details['controls']; let ix=index" [formGroupName]="ix"> <mat-card *ngFor="let sup of familyForm.controls.family_details['controls']; let ix=index"
[formGroupName]="ix">
<mat-card-content> <mat-card-content>
<div> <div>
<mat-form-field style="width:45%;"> <mat-form-field style="width:45%;">
<mat-select placeholder="Select a person" formControlName="selected_person" (selectionChange)="selectedPerson($event.value,ix)" required> <mat-select placeholder="Select a person" formControlName="selected_person"
(selectionChange)="selectedPerson($event.value,ix)" required>
<mat-option>Select</mat-option> <mat-option>Select</mat-option>
<mat-option value="{{person.pd_co_applicant_id}}" *ngFor="let person of selectPerson"> <mat-option value="{{person.pd_co_applicant_id}}" *ngFor="let person of selectPerson">
{{person.applicant_name}} {{person.applicant_name}}
@ -33,7 +37,8 @@
<div> <div>
<h5>Residence Details of {{FamilyMemberAsLabel[ix]}}</h5> <h5>Residence Details of {{FamilyMemberAsLabel[ix]}}</h5>
<mat-form-field style="width:45%;"> <mat-form-field style="width:45%;">
<mat-select matInput placeholder="State" formControlName="residence_state" required (selectionChange)="getCity($event.value,ix)" > <mat-select matInput placeholder="State" formControlName="residence_state"
required (selectionChange)="getCity($event.value,ix)">
<mat-option>Select</mat-option> <mat-option>Select</mat-option>
<mat-option value="{{s.state_id}}" *ngFor="let s of stateData"> <mat-option value="{{s.state_id}}" *ngFor="let s of stateData">
{{s.name}} {{s.name}}
@ -41,7 +46,8 @@
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<mat-form-field style="width:45%;"> <mat-form-field style="width:45%;">
<mat-select matInput placeholder="City" formControlName="residence_city" required> <mat-select matInput placeholder="City" formControlName="residence_city"
required>
<mat-option>Select</mat-option> <mat-option>Select</mat-option>
<mat-option *ngFor="let c of cityData[ix]" [value]="c.city_id"> <mat-option *ngFor="let c of cityData[ix]" [value]="c.city_id">
{{c.city_name}} {{c.city_name}}
@ -49,10 +55,12 @@
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<mat-form-field style="width:45%;"> <mat-form-field style="width:45%;">
<input matInput placeholder="Place" formControlName="residence_place" required> <input matInput placeholder="Place" formControlName="residence_place"
required>
</mat-form-field> </mat-form-field>
<mat-form-field style="width:45%;"> <mat-form-field style="width:45%;">
<mat-select matInput placeholder="Pin" formControlName="residence_pin" required> <mat-select matInput placeholder="Pin" formControlName="residence_pin"
required>
<mat-option>Select</mat-option> <mat-option>Select</mat-option>
<mat-option *ngFor="let p of pincodeData[ix]" [value]="p.pincode_id"> <mat-option *ngFor="let p of pincodeData[ix]" [value]="p.pincode_id">
{{p.pincode}} {{p.pincode}}
@ -74,11 +82,13 @@
</mat-form-field> --> </mat-form-field> -->
<mat-form-field> <mat-form-field>
<input matInput placeholder="Number of yrs" formControlName="residence_No_of_years" OnlyNumber type="text" required> <input matInput placeholder="Number of yrs" formControlName="residence_No_of_years"
OnlyNumber type="text" required>
</mat-form-field> </mat-form-field>
<mat-form-field> <mat-form-field>
<mat-select placeholder="Ownership" formControlName="residence_ownership" required> <mat-select placeholder="Ownership" formControlName="residence_ownership"
required>
<mat-option>Select</mat-option> <mat-option>Select</mat-option>
<mat-option value="{{ownerShip.id}}" *ngFor="let ownerShip of ownerShipData"> <mat-option value="{{ownerShip.id}}" *ngFor="let ownerShip of ownerShipData">
{{ownerShip.name}} {{ownerShip.name}}
@ -91,8 +101,10 @@
</mat-form-field> </mat-form-field>
<mat-form-field *ngIf="sup.get('residence_ownership').value == 3" style="width:43%;"> <mat-form-field *ngIf="sup.get('residence_ownership').value == 3" style="width:43%;">
<input matInput placeholder="Rent Amount" formControlName="rent" OnlyNumber type="text" (keyup)="inWords($event,1,i)"> <input matInput placeholder="Rent Amount" formControlName="rent"
<mat-hint align="start" style="font-size:90%" *ngIf="sup.get('rent').value != ''">{{"&#8377;"}} {{RentAmount[i]}} Only</mat-hint> OnlyNumber type="text" (keyup)="inWords($event,1,i)">
<mat-hint align="start" style="font-size:90%" *ngIf="sup.get('rent').value != ''">{{"&#8377;"}}
{{RentAmount[i]}} Only</mat-hint>
</mat-form-field> </mat-form-field>
</div> </div>
<!-- <div> <!-- <div>
@ -104,17 +116,21 @@
<div> <div>
<div formArrayName="family_members_details"> <div formArrayName="family_members_details">
<div *ngFor="let item of sup.controls.family_members_details['controls']; let i=index; let last=last " [formGroupName]="i"> <div *ngFor="let item of sup.controls.family_members_details['controls']; let i=index; let last=last "
[formGroupName]="i">
<mat-card> <mat-card>
<h5>Family Details of {{FamilyMemberAsLabel[ix]}}</h5> <h5>Family Details of {{FamilyMemberAsLabel[ix]}}</h5>
<div> <div>
<mat-form-field> <mat-form-field>
<input matInput placeholder="Name" formControlName="family_member_name" required> <input matInput placeholder="Name" formControlName="family_member_name"
required>
</mat-form-field> </mat-form-field>
<mat-form-field> <mat-form-field>
<mat-select placeholder="Relationship" formControlName="family_member_relationship" required> <mat-select placeholder="Relationship" formControlName="family_member_relationship"
required>
<mat-option>Select</mat-option> <mat-option>Select</mat-option>
<mat-option value="{{relation.relationship_id}}" *ngFor="let relation of relationData"> <mat-option value="{{relation.relationship_id}}"
*ngFor="let relation of relationData">
{{relation.name}} {{relation.name}}
</mat-option> </mat-option>
</mat-select> </mat-select>
@ -125,7 +141,9 @@
</div> </div>
<div> <div>
<mat-form-field> <mat-form-field>
<mat-select placeholder="Earning Status" formControlName="family_member_earning_status" required> <mat-select placeholder="Earning Status"
formControlName="family_member_earning_status"
required>
<mat-option>Select</mat-option> <mat-option>Select</mat-option>
<mat-option value="{{earnings.id}}" *ngFor="let earnings of earningStatus"> <mat-option value="{{earnings.id}}" *ngFor="let earnings of earningStatus">
{{earnings.type}} {{earnings.type}}
@ -135,52 +153,69 @@
</div> </div>
<div *ngIf="item.get('family_member_earning_status').value == 1"> <div *ngIf="item.get('family_member_earning_status').value == 1">
<mat-form-field style="width:45%;"> <mat-form-field style="width:45%;">
<mat-select placeholder="Segment" formControlName="earning_segment" required> <mat-select placeholder="Segment" formControlName="earning_segment"
required>
<mat-option>Select</mat-option> <mat-option>Select</mat-option>
<mat-option value="{{earn.earning_member_status_id}}" *ngFor="let earn of earningData"> <mat-option value="{{earn.earning_member_status_id}}"
*ngFor="let earn of earningData">
{{earn.earning_member_status}} {{earn.earning_member_status}}
</mat-option> </mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<mat-form-field style="width:45%;" *ngIf="item.get('earning_segment').value==1"> <mat-form-field style="width:45%;" *ngIf="item.get('earning_segment').value==1">
<input matInput placeholder="Specify Others" formControlName="earning_if_others_segment"> <input matInput placeholder="Specify Others"
formControlName="earning_if_others_segment">
</mat-form-field> </mat-form-field>
<mat-form-field style="width:45%;"> <mat-form-field style="width:45%;">
<input matInput placeholder="Income Per Month" formControlName="earning_gross_income_per_month" OnlyNumber type="text" (keyup)="inWords($event,2,i)"> <input matInput placeholder="Income Per Month"
<mat-hint align="start" style="font-size:90%" *ngIf="item.get('earning_gross_income_per_month').value != ''">{{"&#8377;"}} {{IncomePerMonth[i]}} Only</mat-hint> formControlName="earning_gross_income_per_month"
OnlyNumber type="text" (keyup)="inWords($event,2,i)">
<mat-hint align="start" style="font-size:90%" *ngIf="item.get('earning_gross_income_per_month').value != ''">{{"&#8377;"}}
{{IncomePerMonth[i]}} Only</mat-hint>
</mat-form-field> </mat-form-field>
<mat-form-field style="width:45%;"> <mat-form-field style="width:45%;">
<input matInput [placeholder]="item.get('earning_segment').value != 5 ? 'Name of the Employer/Business' : 'Pension Received From'" formControlName="earning_name_of_the_employer_or_business" required> <input matInput [placeholder]="item.get('earning_segment').value != 5 ? 'Name of the Employer/Business' : 'Pension Received From'"
formControlName="earning_name_of_the_employer_or_business"
required>
</mat-form-field> </mat-form-field>
<mat-form-field style="width:45%;"> <mat-form-field style="width:45%;">
<input matInput placeholder="No. of years in Employment/Business" formControlName="earning_number_of_years_in_employment_or_business" <input matInput placeholder="No. of years in Employment/Business"
formControlName="earning_number_of_years_in_employment_or_business"
required> required>
</mat-form-field> </mat-form-field>
</div> </div>
<div *ngIf="item.get('family_member_earning_status').value == 2"> <div *ngIf="item.get('family_member_earning_status').value == 2">
<mat-form-field> <mat-form-field>
<mat-select placeholder="Occupation" formControlName="non_earning_occupation" required> <mat-select placeholder="Occupation" formControlName="non_earning_occupation"
required>
<mat-option>Select</mat-option> <mat-option>Select</mat-option>
<mat-option value="{{occupation.occupation_non_earning_member_id}}" *ngFor="let occupation of occupationData"> <mat-option value="{{occupation.occupation_non_earning_member_id}}"
*ngFor="let occupation of occupationData">
{{occupation.name}} {{occupation.name}}
</mat-option> </mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<mat-form-field *ngIf="item.get('non_earning_occupation').value==1"> <mat-form-field *ngIf="item.get('non_earning_occupation').value==1">
<input matInput placeholder="Specify Others" formControlName="non_earning_if_others"> <input matInput placeholder="Specify Others"
formControlName="non_earning_if_others">
</mat-form-field> </mat-form-field>
<mat-form-field *ngIf="item.get('non_earning_occupation').value==2" style="width:30%"> <mat-form-field *ngIf="item.get('non_earning_occupation').value==2"
<input matInput placeholder="Specify School/College Name" formControlName="non_earning_if_schoolorcollege"> style="width:30%">
<input matInput placeholder="Specify School/College Name"
formControlName="non_earning_if_schoolorcollege">
</mat-form-field> </mat-form-field>
<mat-form-field *ngIf="item.get('non_earning_occupation').value==3"> <mat-form-field *ngIf="item.get('non_earning_occupation').value==3">
<!-- <input matInput placeholder="Retired From" formControlName="non_earning_if_retired_from" type="date" required> --> <!-- <input matInput placeholder="Retired From" formControlName="non_earning_if_retired_from" type="date" required> -->
<input matInput placeholder="Retired From" formControlName="non_earning_if_retired_from"> <input matInput placeholder="Retired From"
formControlName="non_earning_if_retired_from">
</mat-form-field> </mat-form-field>
</div> </div>
<mat-card-actions> <mat-card-actions>
<div align="right"> <div align="right">
<button type="button" mat-raised-button mat-icon-button (click)="removeFamilyMembers(ix,i)" <button type="button" mat-raised-button mat-icon-button
matTooltip="Delete Family Members" matTooltipPosition="above" class="mr-1 mb-1 hover-icon" *ngIf="sup.controls.family_members_details.controls.length>0"> (click)="removeFamilyMembers(ix,i)" matTooltip="Delete Family Members"
matTooltipPosition="above" class="mr-1 mb-1 hover-icon"
*ngIf="sup.controls.family_members_details.controls.length>0">
<mat-icon>delete</mat-icon> <mat-icon>delete</mat-icon>
</button> </button>
</div> </div>
@ -201,7 +236,8 @@
<span *ngIf="sup.controls.family_members_details['controls'].length == 0;else another;"> <span *ngIf="sup.controls.family_members_details['controls'].length == 0;else another;">
<strong>Add Family Members Of {{FamilyMemberAsLabel[ix]}}</strong> <strong>Add Family Members Of {{FamilyMemberAsLabel[ix]}}</strong>
</span> </span>
<ng-template #another><strong>Add More Family Members Of {{FamilyMemberAsLabel[ix]}}</strong></ng-template> <ng-template #another><strong>Add More Family Members Of
{{FamilyMemberAsLabel[ix]}}</strong></ng-template>
<!-- <strong> </strong> --> <!-- <strong> </strong> -->
</button> </button>
</div> </div>
@ -212,7 +248,8 @@
<mat-card-actions> <mat-card-actions>
<span align="right"> <span align="right">
<button type="button" mat-raised-button mat-icon-button (click)="removeOtherFamilyMembers(ix)" <button type="button" mat-raised-button mat-icon-button (click)="removeOtherFamilyMembers(ix)"
matTooltip="Delete Family Details of Other Applicant" matTooltipPosition="above" class="mr-1 mb-1 hover-icon" *ngIf="familyForm.controls.family_details.controls.length>1"> matTooltip="Delete Family Details of Other Applicant"
matTooltipPosition="above" class="mr-1 mb-1 hover-icon" *ngIf="familyForm.controls.family_details.controls.length>1">
<mat-icon>delete</mat-icon> <mat-icon>delete</mat-icon>
</button> </button>
</span> </span>
@ -275,55 +312,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" fxFlex.xl="20">
<a href="http://www.google.com"> <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> <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" fxFlex.xl="20">
<a href="http://www.google.com"> <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> <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" fxFlex.xl="20">
<a href="http://www.google.com"> <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> <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" fxFlex.xl="20">
<a href="http://www.google.com"> <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> <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" fxFlex.xl="20">
<a href="http://www.google.com"> <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> <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" fxFlex.xl="20">
<a href="http://www.google.com"> <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> <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" fxFlex.xl="25">
<a href="http://www.google.com"> <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> <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" fxFlex.xl="25">
<a href="http://www.google.com"> <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> <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" fxFlex.xl="25">
<a href="http://www.google.com"> <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> <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" fxFlex.xl="25">
<a href="http://www.google.com"> <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> <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" fxFlex.xl="20">
<a href="http://www.google.com"> <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> <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" fxFlex.xl="20">
<a href="http://www.google.com"> <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> <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>
@ -348,11 +421,14 @@
</div> </div>
<div fxFlex="40" align="end"> <div fxFlex="40" align="end">
<button type="button" mat-flat-button (click)="addMoreApplicantFamilyDetails($event); false" <button type="button" mat-flat-button (click)="addMoreApplicantFamilyDetails($event); false" matTooltip="Add More"
matTooltip="Add More" matTooltipPosition="left" color="primary"> matTooltipPosition="left" color="primary">
<strong>Add Family Details of Other Applicant </strong> <strong>Add Family Details of Other Applicant </strong>
</button> &nbsp;&nbsp; </button> &nbsp;&nbsp;
<button type="submit" mat-raised-button mat-icon-button type="submit" matTooltip="Submit" matTooltipPosition="above" (click)="submitFamily()"><mat-icon>save</mat-icon></button> <button type="submit" mat-raised-button mat-icon-button type="submit" matTooltip="Submit"
matTooltipPosition="above" (click)="submitFamily()">
<mat-icon>save</mat-icon>
</button>
</div> </div>
</mat-dialog-actions> </mat-dialog-actions>

View File

@ -93,12 +93,14 @@ export class FamilyDetailsComponent implements OnInit {
}); });
let datas = familyMembersGeneralForm.map(element => { let datas = familyMembersGeneralForm.map(element => {
return {id:element.pd_co_applicant_id.toString(), return {
id: element.pd_co_applicant_id.toString(),
name: element.applicant_name, name: element.applicant_name,
relationship: element.relationship, relationship: element.relationship,
relation_to: element.relation_to, relation_to: element.relation_to,
age: element.age, age: element.age,
data_gets_from:'GeneralForm'}; data_gets_from: 'GeneralForm'
};
}); });
Temparr.push(datas); Temparr.push(datas);
@ -110,12 +112,14 @@ export class FamilyDetailsComponent implements OnInit {
return data.record.from_business_form[key]; return data.record.from_business_form[key];
}); });
let datas = familyMembersBusinessForm.map(element => { let datas = familyMembersBusinessForm.map(element => {
return {id:element.other_family_relationship_id.toString(), return {
id: element.other_family_relationship_id.toString(),
name: element.family_member_name, name: element.family_member_name,
relationship: element.other_family_relationship_id, relationship: element.other_family_relationship_id,
relation_to: element.relation_to_id, relation_to: element.relation_to_id,
age: '', age: '',
data_gets_from:'BusinessForm'}; data_gets_from: 'BusinessForm'
};
}); });
Temparr.push(datas); Temparr.push(datas);
@ -364,23 +368,20 @@ export class FamilyDetailsComponent implements OnInit {
currFamilyMembersCtrlLength: number = 0; currFamilyMembersCtrlLength: number = 0;
selectedPerson(e, inx) { selectedPerson(e, inx) {
console.log('familyMembersControlLength',this. prevFamilyMembersCtrlLength,this.currFamilyMembersCtrlLength);
this.FamilyMemberAsLabel[inx] = this.selectPerson.filter(item => item.pd_co_applicant_id == e)[0].applicant_name; this.FamilyMemberAsLabel[inx] = this.selectPerson.filter(item => item.pd_co_applicant_id == e)[0].applicant_name;
const control = <FormArray>this.familyForm.controls['family_details']['controls'][inx].controls.family_members_details; const control = <FormArray>this.familyForm.controls['family_details']['controls'][inx].controls.family_members_details;
// console.log('current control length',control.length);
this.currFamilyMembersCtrlLength = control.length; this.currFamilyMembersCtrlLength = control.length;
let i: number = 0; let i: number = 0;
for (i; i < this.prevFamilyMembersCtrlLength; i++) { for (i; i < this.prevFamilyMembersCtrlLength; i++) {
console.log(i,this.prevFamilyMembersCtrlLength);
control.removeAt(i); control.removeAt(i);
} }
// while(index < this.prevFamilyMembersCtrlLength) // while(index < this.prevFamilyMembersCtrlLength){}
// {
// }
this.prevFamilyMembersCtrlLength = this.currFamilyMembersCtrlLength; this.prevFamilyMembersCtrlLength = this.currFamilyMembersCtrlLength;
console.log('familyMembersControlLength',this. prevFamilyMembersCtrlLength,this.currFamilyMembersCtrlLength);
if (this.apiFamilyMembers.length > 0) { if (this.apiFamilyMembers.length > 0) {
@ -389,7 +390,6 @@ export class FamilyDetailsComponent implements OnInit {
if (data.length > 0) { if (data.length > 0) {
this.prevFamilyMembersCtrlLength = data.length; this.prevFamilyMembersCtrlLength = data.length;
console.log('familyMembersControlLength',this. prevFamilyMembersCtrlLength,this.currFamilyMembersCtrlLength);
data.forEach((val, inx) => { data.forEach((val, inx) => {
// if(val.age){ // if(val.age){
@ -417,13 +417,11 @@ export class FamilyDetailsComponent implements OnInit {
} }
else { else {
this.prevFamilyMembersCtrlLength = 1; this.prevFamilyMembersCtrlLength = 1;
console.log('familyMembersControlLength',this. prevFamilyMembersCtrlLength,this.currFamilyMembersCtrlLength);
control.push(this.generateFamilyMembersDetailsGet()); control.push(this.generateFamilyMembersDetailsGet());
} }
} }
else { else {
this.prevFamilyMembersCtrlLength = 1; this.prevFamilyMembersCtrlLength = 1;
console.log('familyMembersControlLength',this. prevFamilyMembersCtrlLength,this.currFamilyMembersCtrlLength);
control.push(this.generateFamilyMembersDetailsGet()); control.push(this.generateFamilyMembersDetailsGet());
} }
} }

View File

@ -4,8 +4,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" <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Close"
mat-dialog-close><mat-icon>close</mat-icon></button> matTooltipPosition="right" mat-dialog-close>
<mat-icon>close</mat-icon>
</button>
</div> </div>
</h2> </h2>
<div *ngIf="noRecordsFound" style="max-width: 100vw !important;width: 100% !important;height: 95% !important;"> <div *ngIf="noRecordsFound" style="max-width: 100vw !important;width: 100% !important;height: 95% !important;">
@ -15,7 +17,8 @@
<mat-form-field style="width:50%;"> <mat-form-field style="width:50%;">
<mat-select placeholder="Customer Behaviour" formControlName="final_custormer_remark_type"> <mat-select placeholder="Customer Behaviour" formControlName="final_custormer_remark_type">
<mat-option>Select</mat-option> <mat-option>Select</mat-option>
<mat-option *ngFor="let pm of m_remarkTypeCustomerBehaviour" [value]="pm.customer_behaviour_id">{{ pm.description }}</mat-option> <mat-option *ngFor="let pm of m_remarkTypeCustomerBehaviour" [value]="pm.customer_behaviour_id">{{
pm.description }}</mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<mat-form-field style="width:40%;" *ngIf="_finalRemarkForm.controls['final_custormer_remark_type'].value == 1"> <mat-form-field style="width:40%;" *ngIf="_finalRemarkForm.controls['final_custormer_remark_type'].value == 1">
@ -37,9 +40,11 @@
</mat-card> </mat-card>
<br> <br>
<mat-form-field style="width:50%;"> <mat-form-field style="width:50%;">
<mat-select placeholder="PD Officers Recommendation" formControlName="pd_officers_recommendation" required><!--(selectionChange)="RecommendationChange($event.value)"--> <mat-select placeholder="PD Officers Recommendation" formControlName="pd_officers_recommendation"
required (selectionChange)="RecommendationChange($event.value)">
<mat-option>Select</mat-option> <mat-option>Select</mat-option>
<mat-option *ngFor="let list of m_recommendationList" [value]="list.pdofficer_recommendation_id">{{ list.pdofficer_recommendation }}</mat-option> <mat-option *ngFor="let list of m_recommendationList" [value]="list.pdofficer_recommendation_id">{{
list.pdofficer_recommendation }}</mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<mat-form-field style="width:40%;" *ngIf="_finalRemarkForm.controls['pd_officers_recommendation'].value == 1"> <mat-form-field style="width:40%;" *ngIf="_finalRemarkForm.controls['pd_officers_recommendation'].value == 1">
@ -50,15 +55,18 @@
<div formArrayName="recommendation_positive"> <div formArrayName="recommendation_positive">
<div *ngFor="let details of _finalRemarkForm.get('recommendation_positive').controls; let i=index; let last=last" <div *ngFor="let details of _finalRemarkForm.get('recommendation_positive').controls; let i=index; let last=last"
[formGroupName]="i"> [formGroupName]="i">
<mat-form-field style="width:40%;"> <mat-form-field style="width:85%;">
<input matInput autocomplete="off" placeholder="Reasons for marking PD status as Positive" formControlName="reason_for_positive"> <input matInput autocomplete="off" placeholder="Reasons for marking PD status as Positive"
formControlName="reason_for_positive">
</mat-form-field> </mat-form-field>
<button type="button" class="mr-1 mb-1 hover-icon" mat-raised-button mat-icon-button matTooltip="Delete" matTooltipPosition="above" (click)="deleteRecommendationPositive(i)" <button type="button" class="mr-1 mb-1 hover-icon" mat-raised-button mat-icon-button
*ngIf="last"> matTooltip="Delete" matTooltipPosition="above" (click)="deleteRecommendationPositive(i)"
*ngIf="_finalRemarkForm.get('recommendation_positive').controls.length > 1">
<mat-icon>delete</mat-icon> <mat-icon>delete</mat-icon>
</button> </button>
<button type="button" class="mr-1 mb-1 hover-icon" mat-raised-button mat-icon-button matTooltip="Add More Postive Reasons" matTooltipPosition="above" color="primary" (click)="addRecommendationPositive()" <button type="button" class="mr-1 mb-1 hover-icon" mat-raised-button mat-icon-button
*ngIf="last"> matTooltip="Add More Postive Reasons" matTooltipPosition="above" color="primary"
(click)="addRecommendationPositive()" *ngIf="last">
<mat-icon>add</mat-icon> <mat-icon>add</mat-icon>
</button> </button>
</div> </div>
@ -68,24 +76,20 @@
<div formArrayName="recommendation_negative"> <div formArrayName="recommendation_negative">
<div *ngFor="let details of _finalRemarkForm.get('recommendation_negative').controls; let i=index; let last=last" <div *ngFor="let details of _finalRemarkForm.get('recommendation_negative').controls; let i=index; let last=last"
[formGroupName]="i"> [formGroupName]="i">
<mat-form-field style="width:40%;"> <mat-form-field style="width:85%;">
<input matInput autocomplete="off" placeholder="Reasons for marking PD status as Negative" formControlName="reason_for_negative"> <input matInput autocomplete="off" placeholder="Reasons for marking PD status as Negative"
formControlName="reason_for_negative">
</mat-form-field> </mat-form-field>
<button type="button" class="mr-1 mb-1 hover-icon" mat-raised-button mat-icon-button
<mat-card-actions> matTooltip="Delete" matTooltipPosition="above" (click)="deleteRecommendationNegative(i)"
<!-- <div align="right"> *ngIf="_finalRemarkForm.get('recommendation_negative').controls.length > 1">
<button *ngIf="currentLoanForm.controls.loan_details.controls.length > 1" type="button" class="mr-1 mb-1 hover-icon" mat-raised-button mat-icon-button matTooltip="Delete" matTooltipPosition="above" (click)="deleteLoanDetails(i)">
<mat-icon>delete</mat-icon> <mat-icon>delete</mat-icon>
</button> </button>
</div> <button type="button" class="mr-1 mb-1 hover-icon" mat-raised-button mat-icon-button
<div align="center"> matTooltip="Add More Negative Reasons" matTooltipPosition="above" color="primary"
<button type="button" mat-flat-button (click)="addLoanDetails()" (click)="addRecommendationNegative()" *ngIf="last">
matTooltip="Add More" matTooltipPosition="left" color="primary" *ngIf="last"> <mat-icon>add</mat-icon>
<strong>Add More Loan Details </strong>
</button> </button>
</div> -->
</mat-card-actions>
</div> </div>
</div> </div>
</span> </span>
@ -93,36 +97,21 @@
<div formArrayName="recommendation_refer_to_credit"> <div formArrayName="recommendation_refer_to_credit">
<div *ngFor="let details of _finalRemarkForm.get('recommendation_refer_to_credit').controls; let i=index; let last=last" <div *ngFor="let details of _finalRemarkForm.get('recommendation_refer_to_credit').controls; let i=index; let last=last"
[formGroupName]="i"> [formGroupName]="i">
<mat-form-field style="width:85%;">
<input matInput autocomplete="off" placeholder="Reasons for marking PD status as Refer to Credit"
<mat-card-content> formControlName="reason_for_refer_to_credit">
<mat-form-field style="width:45%;">
<input matInput autocomplete="off" placeholder="Reasons for marking PD status as Refer to Credit" formControlName="reason_for_refer_to_credit">
</mat-form-field> </mat-form-field>
<!-- <button type="button" class="mr-1 mb-1 hover-icon" mat-raised-button mat-icon-button matTooltip="Delete" matTooltipPosition="above" (click)="deleteLoanDetails(i)" <button type="button" class="mr-1 mb-1 hover-icon" mat-raised-button mat-icon-button
*ngIf="i>0"> matTooltip="Delete" matTooltipPosition="above" (click)="deleteaddRecommendationReferToCredit(i)"
*ngIf="_finalRemarkForm.get('recommendation_refer_to_credit').controls.length > 1">
<mat-icon>delete</mat-icon> <mat-icon>delete</mat-icon>
</button> </button>
<button type="button" class="mr-1 mb-1 hover-icon" mat-raised-button mat-icon-button matTooltip="Add More Loan Details" matTooltipPosition="above" color="primary" (click)="addLoanDetails()" <button type="button" class="mr-1 mb-1 hover-icon" mat-raised-button mat-icon-button
*ngIf="last"> matTooltip="Add More Refer To Credit Reasons" matTooltipPosition="above" color="primary"
s <mat-icon>add</mat-icon> (click)="addRecommendationReferToCredit()" *ngIf="last">
</button> --> <mat-icon>add</mat-icon>
</mat-card-content>
<mat-card-actions>
<!-- <div align="right">
<button *ngIf="currentLoanForm.controls.loan_details.controls.length > 1" type="button" class="mr-1 mb-1 hover-icon" mat-raised-button mat-icon-button matTooltip="Delete" matTooltipPosition="above" (click)="deleteLoanDetails(i)">
<mat-icon>delete</mat-icon>
</button> </button>
</div> </div>
<div align="center">
<button type="button" mat-flat-button (click)="addLoanDetails()"
matTooltip="Add More" matTooltipPosition="left" color="primary" *ngIf="last">
<strong>Add More Loan Details </strong>
</button>
</div> -->
</mat-card-actions>
</div>
</div> </div>
</span> </span>
<!-- <mat-form-field style="width:40%;" *ngIf="_finalRemarkForm.controls['pd_officers_recommendation'].value == 1"> <!-- <mat-form-field style="width:40%;" *ngIf="_finalRemarkForm.controls['pd_officers_recommendation'].value == 1">
@ -147,7 +136,10 @@
</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" 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

@ -73,13 +73,13 @@ export class FinalRemarksComponent implements OnInit {
// reason_for_negative:[''], // reason_for_negative:[''],
// reason_for_refer_to_credit:[''], // reason_for_refer_to_credit:[''],
recommendation_positive: this._formBuilder.array([ recommendation_positive: this._formBuilder.array([
this.CreateRecommendationPositive(null), // this.CreateRecommendationPositive(null),
]), ]),
recommendation_negative: this._formBuilder.array([ recommendation_negative: this._formBuilder.array([
this.CreateRecommendationNegative(null), // this.CreateRecommendationNegative(null),
]), ]),
recommendation_refer_to_credit: this._formBuilder.array([ recommendation_refer_to_credit: this._formBuilder.array([
this.CreateRecommendationReferToCredit(null), // this.CreateRecommendationReferToCredit(null),
]), ]),
final_form_remarks: [''] final_form_remarks: ['']
}); });
@ -152,7 +152,9 @@ deleteRecommendationReferToCredit(index) {
ngOnInit() { ngOnInit() {
this.pdTrigerService.getPDFormDetailsWithID(this.pdid, '20').subscribe(data => { this.pdTrigerService.getPDFormDetailsWithID(this.pdid, '20').subscribe(data => {
if (data.dataStatus) { if (data.dataStatus) {
// this.RecommendationChange(data.records.pd_officers_recommendation); // console.log('data',data);
// console.log('data',data.records);
this.RecommendationChange(data.records.pd_officers_recommendation);
this._finalRemarkForm.controls.final_custormer_remark_type.setValue(data.records.final_custormer_remark_type); this._finalRemarkForm.controls.final_custormer_remark_type.setValue(data.records.final_custormer_remark_type);
this._finalRemarkForm.controls.final_other_customer_behaviour.setValue(data.records.final_other_customer_behaviour); this._finalRemarkForm.controls.final_other_customer_behaviour.setValue(data.records.final_other_customer_behaviour);
@ -161,11 +163,41 @@ deleteRecommendationReferToCredit(index) {
// this._finalRemarkForm.controls.reason_for_positive.setValue(data.records.reason_for_positive); // this._finalRemarkForm.controls.reason_for_positive.setValue(data.records.reason_for_positive);
// this._finalRemarkForm.controls.reason_for_negative.setValue(data.records.reason_for_negative); // this._finalRemarkForm.controls.reason_for_negative.setValue(data.records.reason_for_negative);
// this._finalRemarkForm.controls.reason_for_refer_to_credit.setValue(data.records.reason_for_refer_to_credit); // this._finalRemarkForm.controls.reason_for_refer_to_credit.setValue(data.records.reason_for_refer_to_credit);
if (data.records.recommendation_positive.length > 0) {
let recommendationPositiveCtrl: any = this._finalRemarkForm.get('recommendation_positive') as FormArray;
data.records.recommendation_positive.forEach((val, index) => {
let objs = { 'reason_for_positive': val.reason_for_positive }
recommendationPositiveCtrl.push(this.CreateRecommendationPositive(objs));
});
}
if (data.records.recommendation_refer_to_credit.length > 0) {
let recommendationReferToCredit: any = this._finalRemarkForm.get('recommendation_refer_to_credit') as FormArray;
data.records.recommendation_refer_to_credit.forEach((val, index) => {
let objs = { 'reason_for_refer_to_credit': val.reason_for_refer_to_credit }
recommendationReferToCredit.push(this.CreateRecommendationReferToCredit(objs));
});
}
if (data.records.recommendation_negative.length > 0) {
let recommendationNegativeCtrl: any = this._finalRemarkForm.get('recommendation_negative') as FormArray;
data.records.recommendation_negative.forEach((val, index) => {
let objs = { 'reason_for_negative': val.reason_for_negative }
recommendationNegativeCtrl.push(this.CreateRecommendationNegative(objs));
});
}
this._finalRemarkForm.controls.is_service_provided.setValue(data.records.is_service_provided); this._finalRemarkForm.controls.is_service_provided.setValue(data.records.is_service_provided);
this._finalRemarkForm.controls.final_form_remarks.setValue(data.records.final_form_remarks); this._finalRemarkForm.controls.final_form_remarks.setValue(data.records.final_form_remarks);
this.noRecordsFound = true; this.noRecordsFound = true;
} else { } else {
let recommendationPositiveCtrl: any = this._finalRemarkForm.get('recommendation_positive') as FormArray;
recommendationPositiveCtrl.push(this.CreateRecommendationPositive(null));
let recommendationNegativeCtrl: any = this._finalRemarkForm.get('recommendation_negative') as FormArray;
recommendationNegativeCtrl.push(this.CreateRecommendationNegative(null));
let recommendationReferToCredit: any = this._finalRemarkForm.get('recommendation_refer_to_credit') as FormArray;
recommendationReferToCredit.push(this.CreateRecommendationReferToCredit(null));
this.noRecordsFound = true; this.noRecordsFound = true;
} }
}, err => { }, err => {
@ -255,78 +287,264 @@ deleteRecommendationReferToCredit(index) {
} }
} }
// RecommendationChange(e){ RecommendationChange(e) {
// // if(this._finalRemarkForm.controls.pd_officers_recommendation.value == 1){ // console.log('Event',e);
let recommendationPositiveCtrl: any = this._finalRemarkForm.get('recommendation_positive') as FormArray;
let recommendationNegativeCtrl: any = this._finalRemarkForm.get('recommendation_negative') as FormArray;
let recommendationReferToCredit: any = this._finalRemarkForm.get('recommendation_refer_to_credit') as FormArray;
// // } if (e == 1) {
// // if(this._finalRemarkForm.controls.pd_officers_recommendation.value == 3){
// // } this._finalRemarkForm.controls['others_pd_officers_recommendation'].setValidators([Validators.required]);
// // if(this._finalRemarkForm.controls.pd_officers_recommendation.value == 4){ this._finalRemarkForm.controls['others_pd_officers_recommendation'].updateValueAndValidity();
// // } if (recommendationNegativeCtrl.controls.length > 0) {
let i: number = 0;
for (i; i < recommendationNegativeCtrl.controls.length; i++) {
// if(e==1){ recommendationNegativeCtrl.removeAt(i + 1);
// this._finalRemarkForm.controls['others_pd_officers_recommendation'].setValidators([Validators.required]); recommendationNegativeCtrl = recommendationNegativeCtrl.controls[0];
// this._finalRemarkForm.controls['reason_for_refer_to_credit'].clearValidators(); recommendationNegativeCtrl.controls['reason_for_negative'].setValue('');
// this._finalRemarkForm.controls['reason_for_refer_to_credit'].setValue(''); recommendationNegativeCtrl.controls['reason_for_negative'].clearValidators();
recommendationNegativeCtrl.controls['reason_for_negative'].updateValueAndValidity();
// this._finalRemarkForm.controls['reason_for_positive'].clearValidators();
// this._finalRemarkForm.controls['reason_for_positive'].setValue(''); }
}
// this._finalRemarkForm.controls['reason_for_negative'].clearValidators();
// this._finalRemarkForm.controls['reason_for_negative'].setValue(''); if (recommendationPositiveCtrl.controls.length > 0) {
let i: number = 0;
// } for (i; i < recommendationPositiveCtrl.controls.length; i++) {
// if(e==2){ recommendationPositiveCtrl.removeAt(i + 1);
recommendationPositiveCtrl = recommendationPositiveCtrl.controls[0];
// this._finalRemarkForm.controls['others_pd_officers_recommendation'].clearValidators(); recommendationPositiveCtrl.controls['reason_for_positive'].clearValidators();
// this._finalRemarkForm.controls['others_pd_officers_recommendation'].setValue(''); recommendationPositiveCtrl.controls['reason_for_positive'].setValue('');
recommendationPositiveCtrl.controls['reason_for_positive'].updateValueAndValidity();
// this._finalRemarkForm.controls['reason_for_refer_to_credit'].clearValidators(); }
// this._finalRemarkForm.controls['reason_for_refer_to_credit'].setValue(''); }
// this._finalRemarkForm.controls['reason_for_positive'].setValidators([Validators.required]); if (recommendationReferToCredit.controls.length > 0) {
let i: number = 0;
// this._finalRemarkForm.controls['reason_for_negative'].clearValidators(); for (i; i < recommendationReferToCredit.controls.length; i++) {
// this._finalRemarkForm.controls['reason_for_negative'].setValue(''); recommendationReferToCredit.removeAt(i + 1);
recommendationReferToCredit = recommendationReferToCredit.controls[0];
// }
// if(e==3){ recommendationReferToCredit.controls['reason_for_refer_to_credit'].setValue('');
recommendationReferToCredit.controls['reason_for_refer_to_credit'].clearValidators();
// this._finalRemarkForm.controls['others_pd_officers_recommendation'].setValue(''); recommendationReferToCredit.controls['reason_for_refer_to_credit'].updateValueAndValidity();
// this._finalRemarkForm.controls['others_pd_officers_recommendation'].updateValueAndValidity(); }
}
// this._finalRemarkForm.controls['reason_for_refer_to_credit'].setValue('');
// this._finalRemarkForm.controls['reason_for_refer_to_credit'].clearValidators(); }
if (e == 2) {
// this._finalRemarkForm.controls['reason_for_positive'].clearValidators();
// this._finalRemarkForm.controls['reason_for_positive'].setValue(''); this._finalRemarkForm.controls['others_pd_officers_recommendation'].clearValidators();
this._finalRemarkForm.controls['others_pd_officers_recommendation'].setValue('');
// this._finalRemarkForm.controls['reason_for_negative'].setValidators([Validators.required]); this._finalRemarkForm.controls['others_pd_officers_recommendation'].updateValueAndValidity();
// } if (recommendationReferToCredit.controls.length > 0) {
// if(e==4){ let i: number = 0;
for (i; i < recommendationReferToCredit.controls.length; i++) {
// this._finalRemarkForm.controls['others_pd_officers_recommendation'].setValue(''); recommendationReferToCredit.removeAt(i + 1);
// this._finalRemarkForm.controls['others_pd_officers_recommendation'].clearValidators();
recommendationReferToCredit = recommendationReferToCredit.controls[0];
// this._finalRemarkForm.controls['reason_for_refer_to_credit'].setValidators([Validators.required]);
recommendationReferToCredit.controls['reason_for_refer_to_credit'].setValue('');
// this._finalRemarkForm.controls['reason_for_positive'].clearValidators(); recommendationReferToCredit.controls['reason_for_refer_to_credit'].clearValidators();
// this._finalRemarkForm.controls['reason_for_positive'].setValue(''); recommendationReferToCredit.controls['reason_for_refer_to_credit'].updateValueAndValidity();
// this._finalRemarkForm.controls['reason_for_negative'].setValue(''); }
// this._finalRemarkForm.controls['reason_for_negative'].clearValidators(); }
// } // this._finalRemarkForm.controls['reason_for_positive'].setValidators([Validators.required]);
// this._finalRemarkForm.controls['others_pd_officers_recommendation'].updateValueAndValidity(); if (recommendationPositiveCtrl.controls.length > 0) {
// this._finalRemarkForm.controls['reason_for_refer_to_credit'].updateValueAndValidity(); let i: number = 0;
// this._finalRemarkForm.controls['reason_for_positive'].updateValueAndValidity(); for (i; i < recommendationPositiveCtrl.controls.length; i++) {
// this._finalRemarkForm.controls['reason_for_negative'].updateValueAndValidity(); recommendationPositiveCtrl = recommendationPositiveCtrl.controls[i];
// } recommendationPositiveCtrl.controls['reason_for_positive'].setValidators([Validators.required]);
recommendationPositiveCtrl.controls['reason_for_positive'].updateValueAndValidity();
}
}
if (recommendationNegativeCtrl.controls.length > 0) {
let i: number = 0;
for (i; i < recommendationNegativeCtrl.controls.length; i++) {
recommendationNegativeCtrl.removeAt(i + 1);
recommendationNegativeCtrl = recommendationNegativeCtrl.controls[0];
recommendationNegativeCtrl.controls['reason_for_negative'].setValue('');
recommendationNegativeCtrl.controls['reason_for_negative'].clearValidators();
recommendationNegativeCtrl.controls['reason_for_negative'].updateValueAndValidity();
}
}
}
if (e == 3) {
this._finalRemarkForm.controls['others_pd_officers_recommendation'].setValue('');
this._finalRemarkForm.controls['others_pd_officers_recommendation'].clearValidators();
this._finalRemarkForm.controls['others_pd_officers_recommendation'].updateValueAndValidity();
if (recommendationReferToCredit.controls.length > 0) {
let i: number = 0;
for (i; i < recommendationReferToCredit.controls.length; i++) {
recommendationReferToCredit.removeAt(i + 1);
recommendationReferToCredit = recommendationReferToCredit.controls[0];
recommendationReferToCredit.controls['reason_for_refer_to_credit'].setValue('');
recommendationReferToCredit.controls['reason_for_refer_to_credit'].clearValidators();
recommendationReferToCredit.controls['reason_for_refer_to_credit'].updateValueAndValidity();
}
}
if (recommendationPositiveCtrl.controls.length > 0) {
let i: number = 0;
for (i; i < recommendationPositiveCtrl.controls.length; i++) {
recommendationPositiveCtrl.removeAt(i + 1);
recommendationPositiveCtrl = recommendationPositiveCtrl.controls[0];
recommendationPositiveCtrl.controls['reason_for_positive'].clearValidators();
recommendationPositiveCtrl.controls['reason_for_positive'].setValue('');
recommendationPositiveCtrl.controls['reason_for_positive'].updateValueAndValidity();
}
}
if (recommendationNegativeCtrl.controls.length > 0) {
let i: number = 0;
for (i; i < recommendationNegativeCtrl.controls.length; i++) {
recommendationNegativeCtrl = recommendationNegativeCtrl.controls[i];
recommendationNegativeCtrl.controls['reason_for_negative'].setValidators([Validators.required]);
recommendationNegativeCtrl.controls['reason_for_negative'].updateValueAndValidity();
}
}
// this._finalRemarkForm.controls['reason_for_negative'].setValidators([Validators.required]);
}
if (e == 4) {
this._finalRemarkForm.controls['others_pd_officers_recommendation'].setValue('');
this._finalRemarkForm.controls['others_pd_officers_recommendation'].clearValidators();
this._finalRemarkForm.controls['others_pd_officers_recommendation'].updateValueAndValidity();
if (recommendationReferToCredit.controls.length > 0) {
let i: number = 0;
for (i; i < recommendationReferToCredit.controls.length; i++) {
recommendationReferToCredit = recommendationReferToCredit.controls[i];
recommendationReferToCredit.controls['reason_for_refer_to_credit'].setValidators([Validators.required]);
recommendationReferToCredit.controls['reason_for_refer_to_credit'].updateValueAndValidity();
}
}
if (recommendationNegativeCtrl.controls.length > 0) {
let i: number = 0;
for (i; i < recommendationNegativeCtrl.controls.length; i++) {
recommendationNegativeCtrl.removeAt(i + 1);
recommendationNegativeCtrl = recommendationNegativeCtrl.controls[0];
recommendationNegativeCtrl.controls['reason_for_negative'].setValue('');
recommendationNegativeCtrl.controls['reason_for_negative'].clearValidators();
recommendationNegativeCtrl.controls['reason_for_negative'].updateValueAndValidity();
}
}
if (recommendationPositiveCtrl.controls.length > 0) {
let i: number = 0;
for (i; i < recommendationPositiveCtrl.controls.length; i++) {
recommendationPositiveCtrl.removeAt(i + 1);
recommendationPositiveCtrl = recommendationPositiveCtrl.controls[0];
recommendationPositiveCtrl.controls['reason_for_positive'].clearValidators();
recommendationPositiveCtrl.controls['reason_for_positive'].setValue('');
recommendationPositiveCtrl.controls['reason_for_positive'].updateValueAndValidity();
}
}
}
}
RecommendationChange2(e) {
// if(this._finalRemarkForm.controls.pd_officers_recommendation.value == 1){
// }
// if(this._finalRemarkForm.controls.pd_officers_recommendation.value == 3){
// }
// if(this._finalRemarkForm.controls.pd_officers_recommendation.value == 4){
// }
if (e == 1) {
this._finalRemarkForm.controls['others_pd_officers_recommendation'].setValidators([Validators.required]);
this._finalRemarkForm.controls['reason_for_refer_to_credit'].clearValidators();
this._finalRemarkForm.controls['reason_for_refer_to_credit'].setValue('');
this._finalRemarkForm.controls['reason_for_positive'].clearValidators();
this._finalRemarkForm.controls['reason_for_positive'].setValue('');
this._finalRemarkForm.controls['reason_for_negative'].clearValidators();
this._finalRemarkForm.controls['reason_for_negative'].setValue('');
}
if (e == 2) {
this._finalRemarkForm.controls['others_pd_officers_recommendation'].clearValidators();
this._finalRemarkForm.controls['others_pd_officers_recommendation'].setValue('');
this._finalRemarkForm.controls['reason_for_refer_to_credit'].clearValidators();
this._finalRemarkForm.controls['reason_for_refer_to_credit'].setValue('');
this._finalRemarkForm.controls['reason_for_positive'].setValidators([Validators.required]);
this._finalRemarkForm.controls['reason_for_negative'].clearValidators();
this._finalRemarkForm.controls['reason_for_negative'].setValue('');
}
if (e == 3) {
this._finalRemarkForm.controls['others_pd_officers_recommendation'].setValue('');
this._finalRemarkForm.controls['others_pd_officers_recommendation'].updateValueAndValidity();
this._finalRemarkForm.controls['reason_for_refer_to_credit'].setValue('');
this._finalRemarkForm.controls['reason_for_refer_to_credit'].clearValidators();
this._finalRemarkForm.controls['reason_for_positive'].clearValidators();
this._finalRemarkForm.controls['reason_for_positive'].setValue('');
this._finalRemarkForm.controls['reason_for_negative'].setValidators([Validators.required]);
}
if (e == 4) {
this._finalRemarkForm.controls['others_pd_officers_recommendation'].setValue('');
this._finalRemarkForm.controls['others_pd_officers_recommendation'].clearValidators();
this._finalRemarkForm.controls['reason_for_refer_to_credit'].setValidators([Validators.required]);
this._finalRemarkForm.controls['reason_for_positive'].clearValidators();
this._finalRemarkForm.controls['reason_for_positive'].setValue('');
this._finalRemarkForm.controls['reason_for_negative'].setValue('');
this._finalRemarkForm.controls['reason_for_negative'].clearValidators();
}
this._finalRemarkForm.controls['others_pd_officers_recommendation'].updateValueAndValidity();
this._finalRemarkForm.controls['reason_for_refer_to_credit'].updateValueAndValidity();
this._finalRemarkForm.controls['reason_for_positive'].updateValueAndValidity();
this._finalRemarkForm.controls['reason_for_negative'].updateValueAndValidity();
}
} }

View File

@ -2,7 +2,8 @@
<h2 mat-dialog-title class="paragraph_change"> <h2 mat-dialog-title class="paragraph_change">
<div fxFlex="70" align="left" style="padding: 10px !important;"> <div fxFlex="70" align="left" style="padding: 10px !important;">
<span>{{main_applicant}} ({{lender_applicant_id}}), {{customer_segment_abbr}} <span *ngIf="subproduct_abbr"> - {{subproduct_abbr}} </span> </span><br> <span>{{main_applicant}} ({{lender_applicant_id}}), {{customer_segment_abbr}} <span *ngIf="subproduct_abbr">
- {{subproduct_abbr}} </span> </span><br>
{{pageTitle}} {{pageTitle}}
</div> </div>
<div fxFlex="30" align="end" style="padding: 10px !important;"> <div fxFlex="30" align="end" style="padding: 10px !important;">
@ -100,8 +101,8 @@
<mat-card *ngIf="customer_segment_abbr == 'SE-RI'"> <mat-card *ngIf="customer_segment_abbr == 'SE-RI'">
<mat-card-title>Number of Years for which rental income is being received</mat-card-title> <mat-card-title>Number of Years for which rental income is being received</mat-card-title>
<mat-form-field style="width: 20%;"> <mat-form-field style="width: 20%;">
<input matInput placeholder="Year" formControlName="rental_income_rcv_in_years" <input matInput placeholder="Year" formControlName="rental_income_rcv_in_years" autocomplete="off"
autocomplete="off" OnlyNumber type="text" required> OnlyNumber type="text" required>
<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%;">
@ -133,14 +134,15 @@
</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" <input matInput placeholder="Year" formControlName="business_years" autocomplete="off"
autocomplete="off" OnlyNumber type="text" required> OnlyNumber type="text" required>
<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%;">
@ -183,8 +185,7 @@
<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" <mat-table [dataSource]="relationSource" formArrayName="persons_with_relationships">
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">

View File

@ -625,12 +625,6 @@ export class GeneralInfoComponent implements OnInit {
} }
} }
// console.log(formData.individuals.length);
// console.log(formData.individuals);
if (this._generalForm.invalid) { if (this._generalForm.invalid) {
this.disableAfterSubmit = false; this.disableAfterSubmit = false;
this.validateAllFormFields(this._generalForm); this.validateAllFormFields(this._generalForm);
@ -680,8 +674,6 @@ export class GeneralInfoComponent implements OnInit {
saveRecords.general_remark = formData.general_remark; saveRecords.general_remark = formData.general_remark;
// console.log('saveRecords',saveRecords);
// return;
this._pd.savePDFormDetailsWithID(saveRecords).subscribe( this._pd.savePDFormDetailsWithID(saveRecords).subscribe(
dataresult => { dataresult => {
if (dataresult.status == 200) { if (dataresult.status == 200) {

View File

@ -7,7 +7,10 @@
<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" matTooltip="Show Snack Bar" matTooltipPosition="right" (click)="open()"><mat-icon>person</mat-icon></button> --> <!--<button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Show Snack Bar" matTooltipPosition="right" (click)="open()"><mat-icon>person</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> <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>
@ -34,10 +37,14 @@
<div *ngFor="let details of representativeForm.get('lender_representative_details').controls; let i=index" <div *ngFor="let details of representativeForm.get('lender_representative_details').controls; let i=index"
[formGroupName]="i"> [formGroupName]="i">
<mat-form-field> <mat-form-field>
<input matInput placeholder="What is the name of lender representative who accompanies the PD officer, If any?" formControlName="lender_representative_who_accompanies" required> <input matInput placeholder="What is the name of lender representative who accompanies the PD officer, If any?"
formControlName="lender_representative_who_accompanies"
required>
</mat-form-field> </mat-form-field>
<mat-form-field> <mat-form-field>
<input matInput placeholder="Did the lender representative carry the loan file during PD?" formControlName="lender_representative_carry_loan_files" required> <input matInput placeholder="Did the lender representative carry the loan file during PD?"
formControlName="lender_representative_carry_loan_files"
required>
</mat-form-field> </mat-form-field>
</div> </div>
</div> </div>
@ -104,43 +111,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>
@ -163,7 +218,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" type="button" [disabled]="disableAfterSubmit===true" (click)="submitLRForm()"><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" type="button" [disabled]="disableAfterSubmit===true" (click)="submitLRForm()">
<mat-icon>save</mat-icon>
</button> </button>
</div> </div>
</mat-dialog-actions> </mat-dialog-actions>

View File

@ -31,14 +31,15 @@
</mat-form-field> </mat-form-field>
<mat-form-field style="width: 28%"> <mat-form-field style="width: 28%">
<mat-label>Loan Tenure applied for?</mat-label> <mat-label>Loan Tenure applied for?</mat-label>
<input matInput placeholder="No of months" formControlName="loan_tenure" OnlyNumber type="text" <input matInput placeholder="No of months" formControlName="loan_tenure"
autocomplete="off"> OnlyNumber type="text" autocomplete="off">
</mat-form-field> </mat-form-field>
<mat-form-field style="width:64%"> <mat-form-field style="width:64%">
<mat-select placeholder="Sub Product" <mat-select placeholder="Sub Product" formControlName="sub_product"
formControlName="sub_product" (selectionChange)="onChangeSubProduct($event.value)"> (selectionChange)="onChangeSubProduct($event.value)">
<mat-option>Select</mat-option> <mat-option>Select</mat-option>
<mat-option *ngFor="let list of m_endUseofLoad" [value]="list.subproduct_id"> {{list.name }} ( {{list.abbr}} ) </mat-option> <mat-option *ngFor="let list of m_endUseofLoad" [value]="list.subproduct_id">
{{list.name }} ( {{list.abbr}} ) </mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
@ -105,16 +106,16 @@
</mat-form-field> </mat-form-field>
<mat-form-field *ngIf="loanDetailsForm.controls['end_use_topup'].value == 1" <mat-form-field *ngIf="loanDetailsForm.controls['end_use_topup'].value == 1"
style="width: 28%"> style="width: 28%">
<input matInput placeholder="Specify End Use of Top Up *" formControlName="other_end_use_topup" <input matInput placeholder="Specify End Use of Top Up *"
autocomplete="off"> 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" <input matInput placeholder="Amount of Own Contribution"
formControlName="own_contribution" OnlyNumber type="text" formControlName="own_contribution" OnlyNumber type="text" (keyup)="inWords($event,4)"
(keyup)="inWords($event,4)" autocomplete="off"> autocomplete="off">
<mat-hint align="start" style="font-size:90%" *ngIf="loanDetailsForm.controls['own_contribution'].value != ''">{{"&#8377;"}} <mat-hint align="start" style="font-size:90%" *ngIf="loanDetailsForm.controls['own_contribution'].value != ''">{{"&#8377;"}}
{{ownContributionInWords}} Only</mat-hint> {{ownContributionInWords}} Only</mat-hint>
</mat-form-field> </mat-form-field>
@ -211,8 +212,8 @@
<mat-form-field style="width:46%"> <mat-form-field style="width:46%">
<input matInput placeholder="Estimate Market Value as Per Customer" <input matInput placeholder="Estimate Market Value as Per Customer"
formControlName="emv_per_customer" OnlyNumber type="text" formControlName="emv_per_customer" OnlyNumber type="text" (keyup)="inWords($event,7)"
(keyup)="inWords($event,7)" autocomplete="off"> autocomplete="off">
<mat-hint align="start" style="font-size:90%" *ngIf="loanDetailsForm.controls['emv_per_customer'].value != ''">{{"&#8377;"}} <mat-hint align="start" style="font-size:90%" *ngIf="loanDetailsForm.controls['emv_per_customer'].value != ''">{{"&#8377;"}}
{{emvAmtInWords}} Only</mat-hint> {{emvAmtInWords}} Only</mat-hint>
</mat-form-field> </mat-form-field>

View File

@ -101,7 +101,6 @@ export class LoanDetailsComponent implements OnInit {
this.productAbbr = this.pd_all_details.pdmaster_details.product_abbr; this.productAbbr = this.pd_all_details.pdmaster_details.product_abbr;
this.productID = this.pd_all_details.pdmaster_details.fk_product_id; this.productID = this.pd_all_details.pdmaster_details.fk_product_id;
this.subProductName = this.pd_all_details.pdmaster_details.subproduct_name; this.subProductName = this.pd_all_details.pdmaster_details.subproduct_name;
console.log('this.pd_all_details.pdmaster_details',this.pd_all_details.pdmaster_details);
this.exist_loan_amt = this.pd_all_details.pdmaster_details.loan_amount != '' ? this.pd_all_details.pdmaster_details.loan_amount : ''; this.exist_loan_amt = this.pd_all_details.pdmaster_details.loan_amount != '' ? this.pd_all_details.pdmaster_details.loan_amount : '';
this.loanAmtInWords = this._pd.convertNumberToWords(this.exist_loan_amt); this.loanAmtInWords = this._pd.convertNumberToWords(this.exist_loan_amt);
this.form_id = 10; this.form_id = 10;

View File

@ -2,11 +2,15 @@
<h2 mat-dialog-title class="paragraph_change"> <h2 mat-dialog-title class="paragraph_change">
<div fxFlex="70" align="left" style="padding: 10px !important;"> <div fxFlex="70" align="left" style="padding: 10px !important;">
<span>{{main_applicant}} ({{lender_applicant_id}}), {{customer_segment_abbr}} <span *ngIf="subproduct_abbr">- {{subproduct_abbr}} </span></span><br> <span>{{main_applicant}} ({{lender_applicant_id}}), {{customer_segment_abbr}} <span *ngIf="subproduct_abbr">-
{{subproduct_abbr}} </span></span><br>
{{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>
@ -33,14 +37,17 @@
</mat-card> </mat-card>
<mat-card *ngIf="otherIncomeForm.controls.other_income.value == 'Yes'"> <mat-card *ngIf="otherIncomeForm.controls.other_income.value == 'Yes'">
<mat-card-header><mat-card-title><p>Income Details</p></mat-card-title></mat-card-header> <mat-card-header>
<mat-card-title>
<p>Income Details</p>
</mat-card-title>
</mat-card-header>
<div formArrayName="income_details"> <div formArrayName="income_details">
<div *ngFor="let details of otherIncomeForm.get('income_details').controls; let i=index; let last=last;" <div *ngFor="let details of otherIncomeForm.get('income_details').controls; let i=index; let last=last;"
[formGroupName]="i"> [formGroupName]="i">
<mat-card-content class="matcard"> <mat-card-content class="matcard">
<mat-form-field style="width:45%"> <mat-form-field style="width:45%">
<mat-select placeholder="Source" <mat-select placeholder="Source" formControlName="source">
formControlName="source">
<mat-option>Select</mat-option> <mat-option>Select</mat-option>
<mat-option value="{{src.id}}" *ngFor="let src of sourceData">{{src.name}}</mat-option> <mat-option value="{{src.id}}" *ngFor="let src of sourceData">{{src.name}}</mat-option>
<!-- <mat-option value="rental_income">Rental Income</mat-option> <!-- <mat-option value="rental_income">Rental Income</mat-option>
@ -86,8 +93,10 @@
</mat-form-field> </mat-form-field>
<mat-form-field style="width:45%"> <mat-form-field style="width:45%">
<input matInput autocomplete="off" placeholder="Amount" formControlName="amount" OnlyNumber type="text" (keyup)="inWords($event,i)"> <input matInput autocomplete="off" placeholder="Amount" formControlName="amount"
<mat-hint align="start" style="font-size:90%" *ngIf="details.get('amount').value != ''">{{"&#8377;"}} {{amtInwords[i]}} Only</mat-hint> OnlyNumber type="text" (keyup)="inWords($event,i)">
<mat-hint align="start" style="font-size:90%" *ngIf="details.get('amount').value != ''">{{"&#8377;"}}
{{amtInwords[i]}} Only</mat-hint>
</mat-form-field> </mat-form-field>
<mat-form-field style="width:45%"> <mat-form-field style="width:45%">
@ -115,13 +124,15 @@
<mat-card-actions> <mat-card-actions>
<div align="center"> <div align="center">
<button type="button" mat-flat-button (click)="addIncomeDetails()" <button type="button" mat-flat-button (click)="addIncomeDetails()"
matTooltip="Add More" matTooltipPosition="left" color="primary" *ngIf="last"> matTooltip="Add More" matTooltipPosition="left" color="primary"
*ngIf="last">
<strong>Add More Income Details </strong> <strong>Add More Income Details </strong>
</button> </button>
</div> </div>
<div align="right"> <div align="right">
<button type="button" matTooltip="Delete" class="mr-1 mb-1 hover-icon" matTooltipPosition="above" mat-raised-button mat-icon-button (click)="deleteIncomeDetails(i)" <button type="button" matTooltip="Delete" class="mr-1 mb-1 hover-icon"
*ngIf="!last"> matTooltipPosition="above" mat-raised-button mat-icon-button
(click)="deleteIncomeDetails(i)" *ngIf="!last">
<mat-icon>delete</mat-icon> <mat-icon>delete</mat-icon>
</button> </button>
</div> </div>
@ -189,43 +200,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>
@ -247,7 +306,10 @@
</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="submit" matTooltip="Save" matTooltipPosition="above" (click)="submitCurrentDetails()"><mat-icon>save</mat-icon></button> <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="submit" matTooltip="Save"
matTooltipPosition="above" (click)="submitCurrentDetails()">
<mat-icon>save</mat-icon>
</button>
</div> </div>
</mat-dialog-actions> </mat-dialog-actions>

View File

@ -65,8 +65,7 @@ export class OtherIncomeComponent implements OnInit {
private _pd: PdTrigerService, private _pd: PdTrigerService,
private dialog: MatDialog, private dialog: MatDialog,
private dialogRef: MatDialogRef<OtherIncomeComponent>, private dialogRef: MatDialogRef<OtherIncomeComponent>,
@Inject(MAT_DIALOG_DATA) public pd_all_details: any) @Inject(MAT_DIALOG_DATA) public pd_all_details: any) {
{
this.pdid = this.pd_all_details.pdmaster_details.pd_id; this.pdid = this.pd_all_details.pdmaster_details.pd_id;
this.form_id = 9; this.form_id = 9;
this.notifier = notifier; this.notifier = notifier;
@ -312,14 +311,14 @@ public viewerOptions: any = {
} }
getOtherIncomeEarnedBy(value, i) { getOtherIncomeEarnedBy(value, i) {
// console.log('value',value,'I',i);
let Ctrls = <FormArray>this.otherIncomeForm.controls['income_details']; let Ctrls = <FormArray>this.otherIncomeForm.controls['income_details'];
// console.log('ParCtrls',Ctrls);
let ChdCtrls: any = <FormArray>Ctrls.controls[i]; let ChdCtrls: any = <FormArray>Ctrls.controls[i];
// console.log('ChdCtrls',ChdCtrls);
let Avaliablity = 1; let Avaliablity = 1;
console.log('val',value);
if (value.length > 0) { if (value.length > 0) {
value.forEach(option => { value.forEach(option => {
if (option.id == 0 && option.group_id == 2) { if (option.id == 0 && option.group_id == 2) {
@ -328,16 +327,15 @@ public viewerOptions: any = {
}); });
} }
if (Avaliablity == 0) { if (Avaliablity == 0) {
// console.log('if Avaliablity',Avaliablity);
ChdCtrls.controls.others_income_earned_by.setValidators([Validators.required]); ChdCtrls.controls.others_income_earned_by.setValidators([Validators.required]);
this.isIncomeEarnedBy[i] = true; this.isIncomeEarnedBy[i] = true;
} else if (Avaliablity == 1) { } else if (Avaliablity == 1) {
// console.log('else Avaliablity',Avaliablity);
// console.log('esle this.isIncomeEarnedBy[ParInx]',this.isIncomeEarnedBy[i]);
ChdCtrls.controls.others_income_earned_by.setValue(''); ChdCtrls.controls.others_income_earned_by.setValue('');
ChdCtrls.controls.others_income_earned_by.clearValidators(); ChdCtrls.controls.others_income_earned_by.clearValidators();
this.isIncomeEarnedBy[i] = false; this.isIncomeEarnedBy[i] = false;
// console.log('else this.isIncomeEarnedBy[ParInx]',this.isIncomeEarnedBy[i]);
} }
ChdCtrls.controls.others_income_earned_by.updateValueAndValidity(); ChdCtrls.controls.others_income_earned_by.updateValueAndValidity();

View File

@ -60,7 +60,7 @@ export class RentalVerificationComponent implements OnInit {
} }
}; };
constructor(notifier: NotifierService, private _pd: PdTrigerService ,private _fb: FormBuilder, @Inject(MAT_DIALOG_DATA) public data: any,private dialogRef: MatDialogRef<RentalVerificationComponent>) { constructor(notifier: NotifierService, private _pd: PdTrigerService ,private _fb: FormBuilder, @Inject(MAT_DIALOG_DATA) public data: any,private dialogRef: MatDialogRef<RentalVerificationComponent>) {
console.log('data',data);
this.pdid = this.data.pdmaster_details.pd_id; this.pdid = this.data.pdmaster_details.pd_id;
this.notifier = notifier; this.notifier = notifier;
this.form_id = 17; this.form_id = 17;

View File

@ -4,7 +4,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,17 +22,22 @@
<mat-card *ngIf="manufacturingForm"> <mat-card *ngIf="manufacturingForm">
<h5 class="highlight" style="margin: 12px;">Manufacturing Stock Details</h5> <h5 class="highlight" style="margin: 12px;">Manufacturing Stock Details</h5>
<div formArrayName="manufacturing_details"> <div formArrayName="manufacturing_details">
<div *ngFor="let md of stockForms.controls.manufacturing_details['controls']; let i=index" [formGroupName]="i"> <div *ngFor="let md of stockForms.controls.manufacturing_details['controls']; let i=index"
[formGroupName]="i">
<span formArrayName="manufacturing_raw_materials"> <span formArrayName="manufacturing_raw_materials">
<div *ngFor="let mrm of md.controls.manufacturing_raw_materials['controls']; let a=index; let last=last" [formGroupName]="a"> <div *ngFor="let mrm of md.controls.manufacturing_raw_materials['controls']; let a=index; let last=last"
[formGroupName]="a">
<mat-card style="margin: 12px;"> <mat-card style="margin: 12px;">
<mat-label class="highlight"> <i>Raw Material #{{a+1}} </i> </mat-label> <mat-label class="highlight"> <i>Raw Material #{{a+1}} </i>
</mat-label>
<mat-card-content class="matcard"> <mat-card-content class="matcard">
<mat-form-field style="width:30%"> <mat-form-field style="width:30%">
<input matInput autocomplete="off" placeholder="Name" formControlName="raw_name" > <input matInput autocomplete="off" placeholder="Name"
formControlName="raw_name">
</mat-form-field> </mat-form-field>
<mat-form-field style="width:30%"> <mat-form-field style="width:30%">
<mat-select placeholder="Stock" formControlName="stock_observed" (selectionChange)="checkComments($event.value,1,a)"> <mat-select placeholder="Stock" formControlName="stock_observed"
(selectionChange)="checkComments($event.value,1,a)">
<mat-option>Select</mat-option> <mat-option>Select</mat-option>
<mat-option value="yes">Add Stock Details</mat-option> <mat-option value="yes">Add Stock Details</mat-option>
<mat-option value="no">No Stock Observed</mat-option> <mat-option value="no">No Stock Observed</mat-option>
@ -37,7 +45,8 @@
</mat-form-field> </mat-form-field>
<span *ngIf="mrm.get('stock_observed').value == 'yes'"> <span *ngIf="mrm.get('stock_observed').value == 'yes'">
<mat-form-field style="width:30%"> <mat-form-field style="width:30%">
<input matInput autocomplete="off" placeholder="Estimated Quantity" formControlName="raw_quantity" OnlyNumber type="text"> <input matInput autocomplete="off" placeholder="Estimated Quantity"
formControlName="raw_quantity" OnlyNumber type="text">
</mat-form-field> </mat-form-field>
<mat-form-field style="width:30%"> <mat-form-field style="width:30%">
<mat-select placeholder="Unit of Measurement" <mat-select placeholder="Unit of Measurement"
@ -46,25 +55,33 @@
<mat-option value="{{uom.uom_id}}" *ngFor="let uom of uomData">{{uom.name}}</mat-option> <mat-option value="{{uom.uom_id}}" *ngFor="let uom of uomData">{{uom.name}}</mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<mat-form-field *ngIf="mrm.get('raw_uom').value == 1" style="width:28%"> <mat-form-field *ngIf="mrm.get('raw_uom').value == 1"
<input matInput autocomplete="off" placeholder="Specify UOM" formControlName="other_uom" > style="width:28%">
<input matInput autocomplete="off" placeholder="Specify UOM"
formControlName="other_uom">
</mat-form-field> </mat-form-field>
<mat-form-field style="width:90%"> <mat-form-field style="width:90%">
<input matInput autocomplete="off" placeholder="Estimated Value of Stock Observed" formControlName="raw_value" OnlyNumber type="text"> <input matInput autocomplete="off" placeholder="Estimated Value of Stock Observed"
<mat-hint align="start" style="font-size:70%" *ngIf="mrm.get('raw_value').value != ''">{{"&#8377;"}} {{mrm.get('raw_value').value | numberToWords}} Only</mat-hint> formControlName="raw_value" OnlyNumber type="text">
<mat-hint align="start" style="font-size:70%" *ngIf="mrm.get('raw_value').value != ''">{{"&#8377;"}}
{{mrm.get('raw_value').value | numberToWords}}
Only</mat-hint>
</mat-form-field> </mat-form-field>
</span> </span>
</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 (click)="deleteRawMaterials(a,1)" <button type="button" mat-raised-button mat-icon-button
matTooltip="Delete Raw Materials" matTooltipPosition="above" class="mr-1 mb-1 hover-icon" *ngIf="md.controls.manufacturing_raw_materials.controls.length>1"> (click)="deleteRawMaterials(a,1)" matTooltip="Delete Raw Materials"
matTooltipPosition="above" class="mr-1 mb-1 hover-icon"
*ngIf="md.controls.manufacturing_raw_materials.controls.length>1">
<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)="addRawMaterials(1)" <button type="button" mat-flat-button (click)="addRawMaterials(1)"
matTooltip="Add More" matTooltipPosition="left" color="primary" *ngIf="last"> matTooltip="Add More" matTooltipPosition="left"
color="primary" *ngIf="last">
<strong>Add More Raw Materials </strong> <strong>Add More Raw Materials </strong>
</button> </button>
</div> </div>
@ -75,29 +92,36 @@
</span> </span>
<span *ngIf="RMCommentCard"> <span *ngIf="RMCommentCard">
<mat-form-field style="width:90%"> <mat-form-field style="width:90%">
<mat-select placeholder="Is the stock of Raw Materials observed, sufficient considering the size of operations" formControlName="is_sufficiant_raw"> <mat-select placeholder="Is the stock of Raw Materials observed, sufficient considering the size of operations"
formControlName="is_sufficiant_raw">
<mat-option>Select</mat-option> <mat-option>Select</mat-option>
<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-form-field> </mat-form-field>
<mat-form-field appearance="outline" style="width: 90%" *ngIf="md.get('is_sufficiant_raw').value == 'no'"> <mat-form-field appearance="outline" style="width: 90%" *ngIf="md.get('is_sufficiant_raw').value == 'no'">
<mat-label> <i>Please comment on the stock level observed?</i> </mat-label> <mat-label> <i>Please comment on the stock level observed?</i>
<textarea matInput autocomplete="off" placeholder="Please comment on the stock level observed" formControlName="rawmaterial_remarks"></textarea> </mat-label>
<textarea matInput autocomplete="off" placeholder="Please comment on the stock level observed"
formControlName="rawmaterial_remarks"></textarea>
</mat-form-field> </mat-form-field>
</span> </span>
<div formArrayName="manufacturing_finished_goods"> <div formArrayName="manufacturing_finished_goods">
<div *ngFor="let mfg of md.controls.manufacturing_finished_goods['controls']; let b=index;let last=last" [formGroupName]="b"> <div *ngFor="let mfg of md.controls.manufacturing_finished_goods['controls']; let b=index;let last=last"
[formGroupName]="b">
<mat-card style="margin: 12px;"> <mat-card style="margin: 12px;">
<mat-label class="highlight"> <i>Finished Goods #{{b+1}} </i> </mat-label> <mat-label class="highlight"> <i>Finished Goods #{{b+1}} </i>
</mat-label>
<mat-card-content class="matcard"> <mat-card-content class="matcard">
<mat-form-field style="width:30%"> <mat-form-field style="width:30%">
<input matInput autocomplete="off" placeholder="Name" formControlName="goods_name" > <input matInput autocomplete="off" placeholder="Name"
formControlName="goods_name">
</mat-form-field> </mat-form-field>
<mat-form-field style="width:30%"> <mat-form-field style="width:30%">
<mat-select placeholder="Stock" formControlName="goods_observed" (selectionChange)="checkComments($event.value,2,b)"> <mat-select placeholder="Stock" formControlName="goods_observed"
(selectionChange)="checkComments($event.value,2,b)">
<mat-option>Select</mat-option> <mat-option>Select</mat-option>
<mat-option value="yes">Add Stock Details</mat-option> <mat-option value="yes">Add Stock Details</mat-option>
<mat-option value="no">No Stock Observed</mat-option> <mat-option value="no">No Stock Observed</mat-option>
@ -105,7 +129,9 @@
</mat-form-field> </mat-form-field>
<span *ngIf="mfg.get('goods_observed').value == 'yes'"> <span *ngIf="mfg.get('goods_observed').value == 'yes'">
<mat-form-field style="width:30%"> <mat-form-field style="width:30%">
<input matInput autocomplete="off" placeholder="Estimated Quantity" formControlName="goods_quantity" OnlyNumber type="text"> <input matInput autocomplete="off" placeholder="Estimated Quantity"
formControlName="goods_quantity" OnlyNumber
type="text">
</mat-form-field> </mat-form-field>
<mat-form-field style="width:30%"> <mat-form-field style="width:30%">
<mat-select placeholder="Unit of Measurement" <mat-select placeholder="Unit of Measurement"
@ -114,25 +140,33 @@
<mat-option value="{{uom.uom_id}}" *ngFor="let uom of uomData">{{uom.name}}</mat-option> <mat-option value="{{uom.uom_id}}" *ngFor="let uom of uomData">{{uom.name}}</mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<mat-form-field *ngIf="mfg.get('goods_uom').value == 1" style="width:28%"> <mat-form-field *ngIf="mfg.get('goods_uom').value == 1"
<input matInput autocomplete="off" placeholder="Specify UOM" formControlName="goods_other_uom" > style="width:28%">
<input matInput autocomplete="off" placeholder="Specify UOM"
formControlName="goods_other_uom">
</mat-form-field> </mat-form-field>
<mat-form-field style="width:90%"> <mat-form-field style="width:90%">
<input matInput autocomplete="off" placeholder="Estimated Value of Stock Observed" formControlName="goods_value" OnlyNumber type="text"> <input matInput autocomplete="off" placeholder="Estimated Value of Stock Observed"
<mat-hint align="start" style="font-size:70%" *ngIf="mfg.get('goods_value').value != ''">{{"&#8377;"}} {{mfg.get('goods_value').value | numberToWords}} Only</mat-hint> formControlName="goods_value" OnlyNumber type="text">
<mat-hint align="start" style="font-size:70%" *ngIf="mfg.get('goods_value').value != ''">{{"&#8377;"}}
{{mfg.get('goods_value').value |
numberToWords}} Only</mat-hint>
</mat-form-field> </mat-form-field>
</span> </span>
</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 (click)="deleteGoods(b,1)" <button type="button" mat-raised-button mat-icon-button
matTooltip="Delete" matTooltipPosition="above" class="mr-1 mb-1 hover-icon" *ngIf="md.controls.manufacturing_finished_goods.controls.length>1"> (click)="deleteGoods(b,1)" matTooltip="Delete"
matTooltipPosition="above" class="mr-1 mb-1 hover-icon"
*ngIf="md.controls.manufacturing_finished_goods.controls.length>1">
<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)="addGoods(1)" <button type="button" mat-flat-button (click)="addGoods(1)"
matTooltip="Add More" matTooltipPosition="left" color="primary" *ngIf="last"> matTooltip="Add More" matTooltipPosition="left"
color="primary" *ngIf="last">
<strong>Add More Finished Goods </strong> <strong>Add More Finished Goods </strong>
</button> </button>
</div> </div>
@ -147,17 +181,22 @@
<mat-card *ngIf="retailForm"> <mat-card *ngIf="retailForm">
<h5 class="highlight" style="margin: 12px;">Retail Trading Details</h5> <h5 class="highlight" style="margin: 12px;">Retail Trading Details</h5>
<div formArrayName="retail_details"> <div formArrayName="retail_details">
<div *ngFor="let rd of stockForms.controls.retail_details['controls']; let j=index" [formGroupName]="j"> <div *ngFor="let rd of stockForms.controls.retail_details['controls']; let j=index"
[formGroupName]="j">
<div formArrayName="retail_traded_goods"> <div formArrayName="retail_traded_goods">
<div *ngFor="let item of rd.controls.retail_traded_goods['controls']; let e=index;let last =last" [formGroupName]="e"> <div *ngFor="let item of rd.controls.retail_traded_goods['controls']; let e=index;let last =last"
[formGroupName]="e">
<mat-card style="margin: 12px;"> <mat-card style="margin: 12px;">
<mat-label class="highlight"> <i>Traded Goods #{{e+1}} </i> </mat-label> <mat-label class="highlight"> <i>Traded Goods #{{e+1}} </i>
</mat-label>
<mat-card-content class="matcard"> <mat-card-content class="matcard">
<mat-form-field style="width:30%"> <mat-form-field style="width:30%">
<input matInput autocomplete="off" placeholder="Name" formControlName="traded_goods_name" > <input matInput autocomplete="off" placeholder="Name"
formControlName="traded_goods_name">
</mat-form-field> </mat-form-field>
<mat-form-field style="width:30%"> <mat-form-field style="width:30%">
<mat-select placeholder="Stock" formControlName="traded_goods_observed" (selectionChange)="checkComments($event.value,3,e)"> <mat-select placeholder="Stock" formControlName="traded_goods_observed"
(selectionChange)="checkComments($event.value,3,e)">
<mat-option>Select</mat-option> <mat-option>Select</mat-option>
<mat-option value="yes">Add Stock Details</mat-option> <mat-option value="yes">Add Stock Details</mat-option>
<mat-option value="no">No Stock Observed</mat-option> <mat-option value="no">No Stock Observed</mat-option>
@ -165,7 +204,9 @@
</mat-form-field> </mat-form-field>
<span *ngIf="item.get('traded_goods_observed').value == 'yes'"> <span *ngIf="item.get('traded_goods_observed').value == 'yes'">
<mat-form-field style="width:30%"> <mat-form-field style="width:30%">
<input matInput autocomplete="off" placeholder="Estimated Quantity" formControlName="traded_goods_quantity" OnlyNumber type="text"> <input matInput autocomplete="off" placeholder="Estimated Quantity"
formControlName="traded_goods_quantity"
OnlyNumber type="text">
</mat-form-field> </mat-form-field>
<mat-form-field style="width:30%"> <mat-form-field style="width:30%">
<mat-select placeholder="Unit of Measurement" <mat-select placeholder="Unit of Measurement"
@ -174,25 +215,34 @@
<mat-option value="{{uom.uom_id}}" *ngFor="let uom of uomData">{{uom.name}}</mat-option> <mat-option value="{{uom.uom_id}}" *ngFor="let uom of uomData">{{uom.name}}</mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<mat-form-field *ngIf="item.get('traded_goods_uom').value == 1" style="width:28%"> <mat-form-field *ngIf="item.get('traded_goods_uom').value == 1"
<input matInput autocomplete="off" placeholder="Specify UOM" formControlName="traded_goods_other_uom" > style="width:28%">
<input matInput autocomplete="off" placeholder="Specify UOM"
formControlName="traded_goods_other_uom">
</mat-form-field> </mat-form-field>
<mat-form-field style="width:90%"> <mat-form-field style="width:90%">
<input matInput autocomplete="off" placeholder="Estimated Value of Stock Observed" formControlName="estimated_traded_goods_value" OnlyNumber type="text"> <input matInput autocomplete="off" placeholder="Estimated Value of Stock Observed"
<mat-hint align="start" style="font-size:70%" *ngIf="item.get('estimated_traded_goods_value').value != ''">{{"&#8377;"}} {{item.get('estimated_traded_goods_value').value | numberToWords}} Only</mat-hint> formControlName="estimated_traded_goods_value"
OnlyNumber type="text">
<mat-hint align="start" style="font-size:70%" *ngIf="item.get('estimated_traded_goods_value').value != ''">{{"&#8377;"}}
{{item.get('estimated_traded_goods_value').value
| numberToWords}} Only</mat-hint>
</mat-form-field> </mat-form-field>
</span> </span>
</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 (click)="deleteTradedGoods(e,1)" <button type="button" mat-raised-button mat-icon-button
matTooltip="Delete Traded Goods" matTooltipPosition="above" class="mr-1 mb-1 hover-icon" *ngIf="rd.controls.retail_traded_goods.controls.length>1"> (click)="deleteTradedGoods(e,1)" matTooltip="Delete Traded Goods"
matTooltipPosition="above" class="mr-1 mb-1 hover-icon"
*ngIf="rd.controls.retail_traded_goods.controls.length>1">
<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)="addTradedGoods(1)" <button type="button" mat-flat-button (click)="addTradedGoods(1)"
matTooltip="Add More" matTooltipPosition="left" color="primary" *ngIf="last"> matTooltip="Add More" matTooltipPosition="left"
color="primary" *ngIf="last">
<strong>Add More Traded Goods </strong> <strong>Add More Traded Goods </strong>
</button> </button>
</div> </div>
@ -208,18 +258,23 @@
<mat-card *ngIf="tradingForm"> <mat-card *ngIf="tradingForm">
<h5 class="highlight" style="margin: 12px;">Wholesale Trading Details</h5> <h5 class="highlight" style="margin: 12px;">Wholesale Trading Details</h5>
<div formArrayName="trade_details"> <div formArrayName="trade_details">
<div *ngFor="let td of stockForms.controls.trade_details['controls']; let k=index" [formGroupName]="k"> <div *ngFor="let td of stockForms.controls.trade_details['controls']; let k=index"
[formGroupName]="k">
<div formArrayName="trading_traded_goods"> <div formArrayName="trading_traded_goods">
<div *ngFor="let tradetg of td.controls.trading_traded_goods['controls']; let g=index;let last = last" [formGroupName]="g"> <div *ngFor="let tradetg of td.controls.trading_traded_goods['controls']; let g=index;let last = last"
[formGroupName]="g">
<mat-card style="margin: 12px;"> <mat-card style="margin: 12px;">
<mat-label class="highlight"> <i>Traded Goods #{{g+1}} </i> </mat-label> <mat-label class="highlight"> <i>Traded Goods #{{g+1}} </i>
</mat-label>
<mat-card-content class="matcard"> <mat-card-content class="matcard">
<mat-form-field style="width:30%"> <mat-form-field style="width:30%">
<input matInput autocomplete="off" placeholder="Name" formControlName="traded_goods_name" > <input matInput autocomplete="off" placeholder="Name"
formControlName="traded_goods_name">
</mat-form-field> </mat-form-field>
<mat-form-field style="width:30%"> <mat-form-field style="width:30%">
<mat-select placeholder="Stock" formControlName="traded_goods_observed" (selectionChange)="checkComments($event.value,4,g)"> <mat-select placeholder="Stock" formControlName="traded_goods_observed"
(selectionChange)="checkComments($event.value,4,g)">
<mat-option>Select</mat-option> <mat-option>Select</mat-option>
<mat-option value="yes">Add Stock Details</mat-option> <mat-option value="yes">Add Stock Details</mat-option>
<mat-option value="no">No stock observed</mat-option> <mat-option value="no">No stock observed</mat-option>
@ -227,7 +282,9 @@
</mat-form-field> </mat-form-field>
<span *ngIf="tradetg.get('traded_goods_observed').value == 'yes'"> <span *ngIf="tradetg.get('traded_goods_observed').value == 'yes'">
<mat-form-field style="width:30%"> <mat-form-field style="width:30%">
<input matInput autocomplete="off" placeholder="Estimated Quantity" formControlName="traded_goods_quantity" OnlyNumber type="text"> <input matInput autocomplete="off" placeholder="Estimated Quantity"
formControlName="traded_goods_quantity"
OnlyNumber type="text">
</mat-form-field> </mat-form-field>
<mat-form-field style="width:30%"> <mat-form-field style="width:30%">
<mat-select placeholder="Unit of Measurement" <mat-select placeholder="Unit of Measurement"
@ -236,25 +293,34 @@
<mat-option value="{{uom.uom_id}}" *ngFor="let uom of uomData">{{uom.name}}</mat-option> <mat-option value="{{uom.uom_id}}" *ngFor="let uom of uomData">{{uom.name}}</mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<mat-form-field *ngIf="tradetg.get('traded_goods_uom').value == 1" style="width:28%"> <mat-form-field *ngIf="tradetg.get('traded_goods_uom').value == 1"
<input matInput autocomplete="off" placeholder="Specify UOM" formControlName="traded_goods_other_uom" > style="width:28%">
<input matInput autocomplete="off" placeholder="Specify UOM"
formControlName="traded_goods_other_uom">
</mat-form-field> </mat-form-field>
<mat-form-field style="width:90%"> <mat-form-field style="width:90%">
<input matInput autocomplete="off" placeholder="Estimated Value of Stock Observed" formControlName="estimated_traded_goods_value" OnlyNumber type="text"> <input matInput autocomplete="off" placeholder="Estimated Value of Stock Observed"
<mat-hint align="start" style="font-size:70%" *ngIf="tradetg.get('estimated_traded_goods_value').value != ''">{{"&#8377;"}} {{tradetg.get('estimated_traded_goods_value').value | numberToWords}} Only</mat-hint> formControlName="estimated_traded_goods_value"
OnlyNumber type="text">
<mat-hint align="start" style="font-size:70%" *ngIf="tradetg.get('estimated_traded_goods_value').value != ''">{{"&#8377;"}}
{{tradetg.get('estimated_traded_goods_value').value
| numberToWords}} Only</mat-hint>
</mat-form-field> </mat-form-field>
</span> </span>
</mat-card-content> </mat-card-content>
<mat-card-actions> <mat-card-actions>
<div align="center"> <div align="center">
<button type="button" mat-flat-button (click)="addTradedGoods(2)" <button type="button" mat-flat-button (click)="addTradedGoods(2)"
matTooltip="Add More" matTooltipPosition="left" color="primary" *ngIf="last"> matTooltip="Add More" matTooltipPosition="left"
color="primary" *ngIf="last">
<strong>Add More Traded Goods </strong> <strong>Add More Traded Goods </strong>
</button> </button>
</div> </div>
<div align="right"> <div align="right">
<button type="button" mat-raised-button mat-icon-button (click)="deleteTradedGoods(g,2)" <button type="button" mat-raised-button mat-icon-button
matTooltip="Delete Traded Goods" matTooltipPosition="above" class="mr-1 mb-1 hover-icon" *ngIf="td.controls.trading_traded_goods.controls.length>1"> (click)="deleteTradedGoods(g,2)" matTooltip="Delete Traded Goods"
matTooltipPosition="above" class="mr-1 mb-1 hover-icon"
*ngIf="td.controls.trading_traded_goods.controls.length>1">
<mat-icon>delete</mat-icon> <mat-icon>delete</mat-icon>
</button> </button>
</div> </div>
@ -270,7 +336,8 @@
<div *ngIf="TGCommentCard"> <div *ngIf="TGCommentCard">
<br> <br>
<mat-form-field style="width:90%"> <mat-form-field style="width:90%">
<mat-select placeholder="Is the stock of finished / traded goods observed, sufficient considering the size of operations" formControlName="is_sufficiant_finished_and_traded_goods"> <mat-select placeholder="Is the stock of finished / traded goods observed, sufficient considering the size of operations"
formControlName="is_sufficiant_finished_and_traded_goods">
<mat-option>Select</mat-option> <mat-option>Select</mat-option>
<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>
@ -278,7 +345,8 @@
</mat-form-field> </mat-form-field>
<mat-form-field appearance="outline" style="width: 90%" *ngIf="this.stockForms.controls.is_sufficiant_finished_and_traded_goods.value == 'no'"> <mat-form-field appearance="outline" style="width: 90%" *ngIf="this.stockForms.controls.is_sufficiant_finished_and_traded_goods.value == 'no'">
<mat-label> <i>Please comment on the stock level observed?</i> </mat-label> <mat-label> <i>Please comment on the stock level observed?</i> </mat-label>
<textarea matInput autocomplete="off" placeholder="Please comment on the stock level observed" formControlName="finished_and_traded_goods_remarks"></textarea> <textarea matInput autocomplete="off" placeholder="Please comment on the stock level observed"
formControlName="finished_and_traded_goods_remarks"></textarea>
</mat-form-field> </mat-form-field>
</div> </div>
@ -287,7 +355,8 @@
<p>Service Provider</p> <p>Service Provider</p>
</mat-card-header> --> </mat-card-header> -->
<h5 class="highlight" style="margin: 12px;">Service Provider</h5> <h5 class="highlight" style="margin: 12px;">Service Provider</h5>
<div style="text-align: center; margin: 12px;">Service Provider Details Not applicable here !!</div> <div style="text-align: center; margin: 12px;">Service Provider Details Not
applicable here !!</div>
</mat-card> </mat-card>
@ -305,42 +374,48 @@
<div fxFlex="20" class="m-gap p-gap"> <div fxFlex="20" class="m-gap p-gap">
<div class="p-list-main mb-2" style="width: 60%;height: auto;"> <div class="p-list-main mb-2" style="width: 60%;height: auto;">
<div class="p-list"> <div class="p-list">
<div class="top"> <img src="https://picsum.photos/2000/1500/?random=1" alt="Image 1"></div> <div class="top"> <img src="https://picsum.photos/2000/1500/?random=1"
alt="Image 1"></div>
</div> </div>
</div> </div>
</div> </div>
<div fxFlex="20" class="m-gap p-gap"> <div fxFlex="20" class="m-gap p-gap">
<div class="p-list-main mb-2" style="width: 60%;height: auto;"> <div class="p-list-main mb-2" style="width: 60%;height: auto;">
<div class="p-list"> <div class="p-list">
<div class="top"> <img src="https://picsum.photos/2000/1500/?random=2" alt="Image 2"></div> <div class="top"> <img src="https://picsum.photos/2000/1500/?random=2"
alt="Image 2"></div>
</div> </div>
</div> </div>
</div> </div>
<div fxFlex="20" class="m-gap p-gap"> <div fxFlex="20" class="m-gap p-gap">
<div class="p-list-main mb-2" style="width: 60%;height: auto;"> <div class="p-list-main mb-2" style="width: 60%;height: auto;">
<div class="p-list"> <div class="p-list">
<div class="top"><img src="https://picsum.photos/2000/1500/?random=3" alt="Image 3"></div> <div class="top"><img src="https://picsum.photos/2000/1500/?random=3"
alt="Image 3"></div>
</div> </div>
</div> </div>
</div> </div>
<div fxFlex="20" class="m-gap p-gap"> <div fxFlex="20" class="m-gap p-gap">
<div class="p-list-main mb-2" style="width: 60%;height: auto;"> <div class="p-list-main mb-2" style="width: 60%;height: auto;">
<div class="p-list"> <div class="p-list">
<div class="top"> <img src="https://picsum.photos/2000/1500/?random=2" alt="Image 2"></div> <div class="top"> <img src="https://picsum.photos/2000/1500/?random=2"
alt="Image 2"></div>
</div> </div>
</div> </div>
</div> </div>
<div fxFlex="20" class="m-gap p-gap"> <div fxFlex="20" class="m-gap p-gap">
<div class="p-list-main mb-2" style="width: 60%;height: auto;"> <div class="p-list-main mb-2" style="width: 60%;height: auto;">
<div class="p-list"> <div class="p-list">
<div class="top"><img src="https://picsum.photos/2000/1500/?random=3" alt="Image 3"></div> <div class="top"><img src="https://picsum.photos/2000/1500/?random=3"
alt="Image 3"></div>
</div> </div>
</div> </div>
</div> </div>
<div fxFlex="20" class="m-gap p-gap"> <div fxFlex="20" class="m-gap p-gap">
<div class="p-list-main mb-2" style="width: 60%;height: auto;"> <div class="p-list-main mb-2" style="width: 60%;height: auto;">
<div class="p-list"> <div class="p-list">
<div class="top"> <img src="https://picsum.photos/2000/1500/?random=1" alt="Image 1"></div> <div class="top"> <img src="https://picsum.photos/2000/1500/?random=1"
alt="Image 1"></div>
</div> </div>
</div> </div>
</div> </div>
@ -348,43 +423,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>
@ -405,7 +528,10 @@
</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" 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>
@ -413,5 +539,6 @@
</div> </div>
{{ errorMessage }} {{ errorMessage }}
<!-- <div *ngIf="!noRecordsFound"> <i> {{ errorMessage }} </i> </div> --> <!-- <div *ngIf="!noRecordsFound"> <i> {{ errorMessage }} </i> </div> -->
<div *ngIf="!noRecordsFound" align="center"> <i> Fill Business Form First! / No Company Found at this ID {{company_id}}! .... </i> </div> <div *ngIf="!noRecordsFound" align="center"> <i> Fill Business Form First! / No Company Found at this ID
{{company_id}}! .... </i> </div>
<notifier-container></notifier-container> <notifier-container></notifier-container>

View File

@ -98,8 +98,7 @@ export class StockComponent implements OnInit {
if (data.dataStatus == true) { if (data.dataStatus == true) {
this.initstockForms(data.record); this.initstockForms(data.record);
} }
else if(data.dataStatus == false) else if (data.dataStatus == false) {
{
this.notifier.notify('warning', 'Fill Business Form First! / No Company Found at this ID ' + this.company_id); this.notifier.notify('warning', 'Fill Business Form First! / No Company Found at this ID ' + this.company_id);
this.noRecordsFound = false; this.noRecordsFound = false;
this.errorMessage = 'Fill Business Form First! / No Company Found at this ID' + this.company_id + '! ....'; this.errorMessage = 'Fill Business Form First! / No Company Found at this ID' + this.company_id + '! ....';
@ -122,17 +121,12 @@ export class StockComponent implements OnInit {
} }
public initstockForms(record) { public initstockForms(record) {
// console.log('record.from_business',record.from_business);
let api = Object.keys(record.from_business).map(function (key) { let api = Object.keys(record.from_business).map(function (key) {
return record.from_business[key]; return record.from_business[key];
}); });
// console.log(api);
let type2 = record.from_business.filter(data => data.type_of_activity_id == 2); let type2 = record.from_business.filter(data => data.type_of_activity_id == 2);
// console.log('type2[0].hasOwnProperty("products")',type2[0].hasOwnProperty("products"));
// console.log('type2',type2);
// console.log('type2 0 index',type2[0]);
// console.log('type2 product',type2[0].product);
// console.log('type2 length',type2[0].product.length);
let type2length = type2[0].hasOwnProperty("products") ? type2[0].products.length : 0; let type2length = type2[0].hasOwnProperty("products") ? type2[0].products.length : 0;
let type3 = record.from_business.filter(data => data.type_of_activity_id == 3); let type3 = record.from_business.filter(data => data.type_of_activity_id == 3);
@ -140,13 +134,6 @@ export class StockComponent implements OnInit {
let type4 = record.from_business.filter(data => data.type_of_activity_id == 4); let type4 = record.from_business.filter(data => data.type_of_activity_id == 4);
let type4length = type4[0].hasOwnProperty("products") ? type4[0].products.length : 0; let type4length = type4[0].hasOwnProperty("products") ? type4[0].products.length : 0;
// console.log(type2);
// console.log(type2length);
// console.log(type3);
// console.log(type3length);
// console.log(type4);
// console.log(type4length);
let rm_api = record.from_supplier; let rm_api = record.from_supplier;
let params: any = {}; let params: any = {};
@ -311,9 +298,6 @@ export class StockComponent implements OnInit {
let arrlength = arr[0].hasOwnProperty("products") ? arr[0].products.length : 0; let arrlength = arr[0].hasOwnProperty("products") ? arr[0].products.length : 0;
let rm_arr = record.from_supplier; let rm_arr = record.from_supplier;
// console.log('manu arr',arr);
// console.log('rm_arr',rm_arr);
// let rm_arr = 0;
if (arrlength > 0) { if (arrlength > 0) {
this.manufacturingForm = true; this.manufacturingForm = true;
return this.fb.group({ return this.fb.group({
@ -330,7 +314,6 @@ export class StockComponent implements OnInit {
retailForm: Boolean = false; retailForm: Boolean = false;
retailFormCreation(val) { retailFormCreation(val) {
// console.log(val);
// let arr = val.filter(data => data.type_of_activity_id == 3); // let arr = val.filter(data => data.type_of_activity_id == 3);
if (val > 0) { if (val > 0) {
this.retailForm = true; this.retailForm = true;
@ -367,12 +350,14 @@ tradingFormCreation(val) {
if (this.suppliers_raw_materials.length > 0) { if (this.suppliers_raw_materials.length > 0) {
this.suppliers_raw_materials.forEach(val => { this.suppliers_raw_materials.forEach(val => {
let Ref_RawMaterials : any = {'raw_name': val, let Ref_RawMaterials: any = {
'raw_name': val,
'stock_observed': '', 'stock_observed': '',
'raw_quantity': '', 'raw_quantity': '',
'raw_uom': '', 'raw_uom': '',
'other_uom': '', 'other_uom': '',
'raw_value': ''}; 'raw_value': ''
};
rawMaterial.push(this.createRawmaterial(Ref_RawMaterials)); rawMaterial.push(this.createRawmaterial(Ref_RawMaterials));
}); });
} }
@ -383,7 +368,8 @@ tradingFormCreation(val) {
if (this.suppliers_finished_goods.length > 0) { if (this.suppliers_finished_goods.length > 0) {
// for (let val of this.suppliers_finished_goods) { // for (let val of this.suppliers_finished_goods) {
this.suppliers_finished_goods.forEach(val => { this.suppliers_finished_goods.forEach(val => {
let Ref_Finished_Goods : any = {'goods_name': val, let Ref_Finished_Goods: any = {
'goods_name': val,
'goods_observed': '', 'goods_observed': '',
'goods_quantity': '', 'goods_quantity': '',
'goods_uom': '', 'goods_uom': '',
@ -468,7 +454,8 @@ tradingFormCreation(val) {
'traded_goods_quantity': '', 'traded_goods_quantity': '',
'traded_goods_uom': '', 'traded_goods_uom': '',
'traded_goods_other_uom': '', 'traded_goods_other_uom': '',
'estimated_traded_goods_value': ''} 'estimated_traded_goods_value': ''
}
tradedGoods.push(this.createTradedGoods(Ref_Trade_Goods)); tradedGoods.push(this.createTradedGoods(Ref_Trade_Goods));
}); });
} }
@ -556,7 +543,8 @@ tradingFormCreation(val) {
'traded_goods_quantity': '', 'traded_goods_quantity': '',
'traded_goods_uom': '', 'traded_goods_uom': '',
'traded_goods_other_uom': '', 'traded_goods_other_uom': '',
'estimated_traded_goods_value': ''} 'estimated_traded_goods_value': ''
}
tradedGoods.push(this.createTradedGoods(Ref_Trade_Goods)); tradedGoods.push(this.createTradedGoods(Ref_Trade_Goods));
}); });
@ -566,8 +554,7 @@ tradingFormCreation(val) {
} }
} else { } else {
if(datas.trading_traded_goods !==undefined) if (datas.trading_traded_goods !== undefined) {
{
// for (let val of datas.trading_traded_goods) { // for (let val of datas.trading_traded_goods) {
datas.trading_traded_goods.forEach((val, index) => { datas.trading_traded_goods.forEach((val, index) => {
this.checkComments(val.traded_goods_observed, 4, index); this.checkComments(val.traded_goods_observed, 4, index);
@ -760,7 +747,7 @@ RetailCounterArray: any = [];
WholeSaleCounterArray: any = []; WholeSaleCounterArray: any = [];
checkComments(value, flag, index) { checkComments(value, flag, index) {
// console.log(value,flag,index);
if (flag == 1) { if (flag == 1) {
this.ManufacturingCounterArray[index] = value == "yes" ? 1 : 0 this.ManufacturingCounterArray[index] = value == "yes" ? 1 : 0
let RMOverallCount = this.ManufacturingCounterArray.reduce((sum, val) => sum + +val, 0); let RMOverallCount = this.ManufacturingCounterArray.reduce((sum, val) => sum + +val, 0);

View File

@ -4,8 +4,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" <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Close"
mat-dialog-close><mat-icon>close</mat-icon></button> matTooltipPosition="right" mat-dialog-close>
<mat-icon>close</mat-icon>
</button>
</div> </div>
</h2> </h2>
<div *ngIf="noRecordsFound" style="max-width: 100vw !important;width: 100% !important;height: 95% !important;"> <div *ngIf="noRecordsFound" style="max-width: 100vw !important;width: 100% !important;height: 95% !important;">
@ -14,9 +16,11 @@
<mat-card *ngIf="manufacturingForm"> <mat-card *ngIf="manufacturingForm">
<h5 style="margin: 12px;padding:10px !important;">Manufacturing Product Details</h5> <h5 style="margin: 12px;padding:10px !important;">Manufacturing Product Details</h5>
<div formArrayName="manufacturing_details"> <div formArrayName="manufacturing_details">
<div *ngFor="let item of _supplierQuesFrom.controls.manufacturing_details['controls']; let i=index" [formGroupName]="i"> <div *ngFor="let item of _supplierQuesFrom.controls.manufacturing_details['controls']; let i=index"
[formGroupName]="i">
<div formArrayName="main_raw_materials"> <div formArrayName="main_raw_materials">
<div *ngFor="let items of item.controls.main_raw_materials['controls']; let l=index" [formGroupName]="l"> <div *ngFor="let items of item.controls.main_raw_materials['controls']; let l=index"
[formGroupName]="l">
<mat-card style="margin: 12px;"> <mat-card style="margin: 12px;">
<h6 style="margin: 12px;padding:10px !important;">Raw Material #{{l+1}}</h6> <h6 style="margin: 12px;padding:10px !important;">Raw Material #{{l+1}}</h6>
<div fxLayout="row nowrap" fxLayoutGap="2px" fxLayoutAlign="start none"> <div fxLayout="row nowrap" fxLayoutGap="2px" fxLayoutAlign="start none">
@ -41,7 +45,8 @@
<input matInput placeholder="Contact Person Name" formControlName="manufacturing_contact_person_name"> <input matInput placeholder="Contact Person Name" formControlName="manufacturing_contact_person_name">
</mat-form-field> </mat-form-field>
<mat-form-field style="width: 35%"> <mat-form-field style="width: 35%">
<mat-select placeholder="Contact Person Designation" formControlName="person_designation" (selectionChange)="selectedPersonDesignation(items,$event.value,1)"> <mat-select placeholder="Contact Person Designation" formControlName="person_designation"
(selectionChange)="selectedPersonDesignation(items,$event.value,1)">
<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}} {{comrelShip.name}}
@ -55,15 +60,19 @@
</div> </div>
<div fxLayout="row nowrap" fxLayoutGap="2px" fxLayoutAlign="start none"> <div fxLayout="row nowrap" fxLayoutGap="2px" fxLayoutAlign="start none">
<mat-form-field style="width: 35%"> <mat-form-field style="width: 35%">
<input matInput placeholder="Contact Person Mobile Number" autocomplete="off" formControlName="manufacturing_contact_person_mobile_number" OnlyNumber type="text" maxlength="10"> <input matInput placeholder="Contact Person Mobile Number" autocomplete="off"
formControlName="manufacturing_contact_person_mobile_number" OnlyNumber
type="text" maxlength="10">
<mat-error>Enter Valid Mobile Number.</mat-error> <mat-error>Enter Valid Mobile Number.</mat-error>
</mat-form-field> </mat-form-field>
<mat-form-field style="width: 15%"> <mat-form-field style="width: 15%">
<input matInput autocomplete="off" placeholder="STD Code" formControlName="person_stdcode" type="text" OnlyNumber type="text"> <input matInput autocomplete="off" placeholder="STD Code" formControlName="person_stdcode"
type="text" OnlyNumber type="text">
<mat-error>Enter Valid STD Code Number.</mat-error> <mat-error>Enter Valid STD Code Number.</mat-error>
</mat-form-field> &nbsp; - &nbsp; </mat-form-field> &nbsp; - &nbsp;
<mat-form-field style="width: 35%"> <mat-form-field style="width: 35%">
<input matInput autocomplete="off" placeholder="Contact Person Landline Number" formControlName="person_landline" type="text" OnlyNumber type="text"> <input matInput autocomplete="off" placeholder="Contact Person Landline Number"
formControlName="person_landline" type="text" OnlyNumber type="text">
<mat-error>Enter Valid LandLine Number.</mat-error> <mat-error>Enter Valid LandLine Number.</mat-error>
</mat-form-field> </mat-form-field>
</div> </div>
@ -74,9 +83,11 @@
<mat-option *ngFor="let pm of m_paymentModeType" [value]="pm.id">{{ pm.name }}</mat-option> <mat-option *ngFor="let pm of m_paymentModeType" [value]="pm.id">{{ pm.name }}</mat-option>
</mat-select> </mat-select>
</mat-form-field> --> </mat-form-field> -->
<mat-select placeholder="Payment Terms" formControlName="manufacturing_payment_type" (selectionChange)="selectedPaymentTerms(items,$event.value,1);checkCard($event.value,1,l);"> <mat-select placeholder="Payment Terms" formControlName="manufacturing_payment_type"
(selectionChange)="selectedPaymentTerms(items,$event.value,1);checkCard($event.value,1,l);">
<mat-option>Select</mat-option> <mat-option>Select</mat-option>
<mat-option *ngFor="let pm of m_paymentType" [value]="pm.id">{{ pm.name }}</mat-option> <mat-option *ngFor="let pm of m_paymentType" [value]="pm.id">{{ pm.name
}}</mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
@ -84,7 +95,8 @@
<mat-select placeholder="Payment Mode" formControlName="manufacturing_payment_mode"> <mat-select placeholder="Payment Mode" formControlName="manufacturing_payment_mode">
<mat-option>Select</mat-option> <mat-option>Select</mat-option>
<mat-option value="Payment made in Cash.">Payment made in Cash.</mat-option> <mat-option value="Payment made in Cash.">Payment made in Cash.</mat-option>
<mat-option value="Payment made through Banking channels.">Payment made through Banking channels.</mat-option> <mat-option value="Payment made through Banking channels.">Payment made
through Banking channels.</mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
@ -93,16 +105,21 @@
<div fxLayout="row nowrap" style="padding-left: 2%;" *ngIf="items.get('manufacturing_payment_type').value == 3"> <div fxLayout="row nowrap" style="padding-left: 2%;" *ngIf="items.get('manufacturing_payment_type').value == 3">
<mat-label>No.of days of Credit Provided by Supplier </mat-label> <mat-label>No.of days of Credit Provided by Supplier </mat-label>
<mat-form-field style="width: 25%"> <mat-form-field style="width: 25%">
<input matInput placeholder="Days From" formControlName="manufacturing_credit_days_from" type="number"> <input matInput placeholder="Days From" formControlName="manufacturing_credit_days_from"
type="number">
</mat-form-field> </mat-form-field>
<mat-form-field style="width: 25%"> <mat-form-field style="width: 25%">
<input matInput placeholder="Days To" formControlName="manufacturing_credit_days_to" type="number"> <input matInput placeholder="Days To" formControlName="manufacturing_credit_days_to"
type="number">
</mat-form-field> </mat-form-field>
</div> </div>
<div align="end"> <div align="end">
<span *ngIf="item.controls.main_raw_materials.controls.length > 1" (click)="removeRawMaterials(l)"> <span *ngIf="item.controls.main_raw_materials.controls.length > 1" (click)="removeRawMaterials(l)">
<button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" color="primary" matTooltip="Delete" matTooltipPosition="above"><mat-icon>delete</mat-icon></button> <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon"
color="primary" matTooltip="Delete" matTooltipPosition="above">
<mat-icon>delete</mat-icon>
</button>
</span> </span>
</div> </div>
</mat-card> </mat-card>
@ -110,14 +127,16 @@
</div> </div>
<div fxLayout="row"> <div fxLayout="row">
<div fxFlex="100" align="center"> <div fxFlex="100" align="center">
<button color="primary" mat-flat-button matTooltip="Add More" matTooltipPosition="above" type="button" <button color="primary" mat-flat-button matTooltip="Add More" matTooltipPosition="above"
class="mr-1 mb-1 hover-icon" (click)="addMoreRawMaterials($event); false"><strong>Add More Supplier</strong></button> type="button" class="mr-1 mb-1 hover-icon" (click)="addMoreRawMaterials($event); false"><strong>Add
More Supplier</strong></button>
</div> </div>
</div> </div>
<div fxLayout="row" *ngIf="mfgCreditCardFlag"> <div fxLayout="row" *ngIf="mfgCreditCardFlag">
<mat-form-field style="width: 100%"> <mat-form-field style="width: 100%">
<input matInput placeholder="What % of Total Purchase is Done on Credit?" formControlName="main_raw_materials_total_payments_percent_on_credit" <input matInput placeholder="What % of Total Purchase is Done on Credit?"
type="number" autocomplete="off" OnlyNumber type="text" maxlength="3"> formControlName="main_raw_materials_total_payments_percent_on_credit" type="number"
autocomplete="off" OnlyNumber type="text" maxlength="3">
</mat-form-field> </mat-form-field>
</div> </div>
@ -127,9 +146,11 @@
<mat-card *ngIf="tradingForm"> <mat-card *ngIf="tradingForm">
<h5 style="margin: 12px;padding:10px !important;">Trading Product Details</h5> <h5 style="margin: 12px;padding:10px !important;">Trading Product Details</h5>
<div formArrayName="trade_details"> <div formArrayName="trade_details">
<div *ngFor="let item of _supplierQuesFrom.controls.trade_details['controls']; let i=index" [formGroupName]="i"> <div *ngFor="let item of _supplierQuesFrom.controls.trade_details['controls']; let i=index"
[formGroupName]="i">
<div formArrayName="trading_products"> <div formArrayName="trading_products">
<div *ngFor="let items of item.controls.trading_products['controls']; let l=index" [formGroupName]="l"> <div *ngFor="let items of item.controls.trading_products['controls']; let l=index"
[formGroupName]="l">
<mat-card style="margin: 12px;"> <mat-card style="margin: 12px;">
<h6 style="margin: 12px;padding:10px !important;">Trading Product #{{l+1}}</h6> <h6 style="margin: 12px;padding:10px !important;">Trading Product #{{l+1}}</h6>
<div fxLayout="row nowrap" fxLayoutGap="2px" fxLayoutAlign="start none"> <div fxLayout="row nowrap" fxLayoutGap="2px" fxLayoutAlign="start none">
@ -138,7 +159,8 @@
</mat-form-field> --> </mat-form-field> -->
<mat-form-field style="width: 45%"> <mat-form-field style="width: 45%">
<mat-select placeholder="Trading Product Name" formControlName="trade_product_name"> <mat-select placeholder="Trading Product Name" formControlName="trade_product_name">
<mat-option *ngFor="let pm of m_tradingProducts" [value]="pm.name">{{ pm.name }}</mat-option> <mat-option *ngFor="let pm of m_tradingProducts" [value]="pm.name">{{
pm.name }}</mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<mat-form-field style="width: 45%"> <mat-form-field style="width: 45%">
@ -155,10 +177,12 @@
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<mat-form-field style="width: 35%"> <mat-form-field style="width: 35%">
<input matInput placeholder="Contact Person Name" formControlName="trade_product_contact_person_name" maxlength="10"> <input matInput placeholder="Contact Person Name" formControlName="trade_product_contact_person_name"
maxlength="10">
</mat-form-field> </mat-form-field>
<mat-form-field style="width: 35%"> <mat-form-field style="width: 35%">
<mat-select placeholder="Contact Person Designation" formControlName="person_designation" (selectionChange)="selectedPersonDesignation(items,$event.value,2)"> <mat-select placeholder="Contact Person Designation" formControlName="person_designation"
(selectionChange)="selectedPersonDesignation(items,$event.value,2)">
<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}} {{comrelShip.name}}
@ -172,16 +196,20 @@
</div> </div>
<div fxLayout="row nowrap" fxLayoutGap="2px" fxLayoutAlign="start none"> <div fxLayout="row nowrap" fxLayoutGap="2px" fxLayoutAlign="start none">
<mat-form-field style="width: 35%"> <mat-form-field style="width: 35%">
<input matInput placeholder="Contact Person Mobile Number" autocomplete="off" formControlName="trade_product_contact_person_mobile_number" OnlyNumber type="text" maxlength="10"> <input matInput placeholder="Contact Person Mobile Number" autocomplete="off"
formControlName="trade_product_contact_person_mobile_number" OnlyNumber
type="text" maxlength="10">
<mat-error>Enter Valid Mobile Number.</mat-error> <mat-error>Enter Valid Mobile Number.</mat-error>
</mat-form-field> </mat-form-field>
<mat-form-field style="width: 15%"> <mat-form-field style="width: 15%">
<input matInput autocomplete="off" placeholder="STD Code" formControlName="person_stdcode" type="text" OnlyNumber type="text"> <input matInput autocomplete="off" placeholder="STD Code" formControlName="person_stdcode"
type="text" OnlyNumber type="text">
<mat-error>Enter Valid STD Code Number.</mat-error> <mat-error>Enter Valid STD Code Number.</mat-error>
</mat-form-field> &nbsp; - &nbsp; </mat-form-field> &nbsp; - &nbsp;
<mat-form-field style="width: 35%"> <mat-form-field style="width: 35%">
<input matInput autocomplete="off" placeholder="Contact Person Landline Number" formControlName="person_landline" type="text" OnlyNumber type="text"> <input matInput autocomplete="off" placeholder="Contact Person Landline Number"
formControlName="person_landline" type="text" OnlyNumber type="text">
<mat-error>Enter Valid LandLine Number.</mat-error> <mat-error>Enter Valid LandLine Number.</mat-error>
</mat-form-field> </mat-form-field>
</div> </div>
@ -190,16 +218,19 @@
<!-- <mat-select (selectionChange)="selectedPM($event)" placeholder="Payment Type" formControlName="trade_product_payment_type"> <!-- <mat-select (selectionChange)="selectedPM($event)" placeholder="Payment Type" formControlName="trade_product_payment_type">
<mat-option *ngFor="let pm of m_paymentModeType" [value]="pm.id">{{ pm.name }}</mat-option> <mat-option *ngFor="let pm of m_paymentModeType" [value]="pm.id">{{ pm.name }}</mat-option>
</mat-select> --> </mat-select> -->
<mat-select placeholder="Payment Terms" formControlName="trade_product_payment_type" (selectionChange)="selectedPaymentTerms(items,$event.value,2);checkCard($event.value,2,l);"> <mat-select placeholder="Payment Terms" formControlName="trade_product_payment_type"
(selectionChange)="selectedPaymentTerms(items,$event.value,2);checkCard($event.value,2,l);">
<mat-option>Select</mat-option> <mat-option>Select</mat-option>
<mat-option *ngFor="let pm of m_paymentType" [value]="pm.id">{{ pm.name }}</mat-option> <mat-option *ngFor="let pm of m_paymentType" [value]="pm.id">{{ pm.name
}}</mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<mat-form-field style="width: 45%"> <mat-form-field style="width: 45%">
<mat-select placeholder="Payment Mode" formControlName="trade_product_payment_mode"> <mat-select placeholder="Payment Mode" formControlName="trade_product_payment_mode">
<mat-option>Select</mat-option> <mat-option>Select</mat-option>
<mat-option value="Payment made in Cash.">Payment made in Cash.</mat-option> <mat-option value="Payment made in Cash.">Payment made in Cash.</mat-option>
<mat-option value="Payment made through Banking channels.">Payment made through Banking channels.</mat-option> <mat-option value="Payment made through Banking channels.">Payment made
through Banking channels.</mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
@ -210,16 +241,21 @@
<div fxLayout="row nowrap" style="padding-left: 2%;display: none !important;" *ngIf="items.get('trade_product_payment_type').value == 3"> <div fxLayout="row nowrap" style="padding-left: 2%;display: none !important;" *ngIf="items.get('trade_product_payment_type').value == 3">
<mat-label>No.of days of Credit Provided by Supplier </mat-label> <mat-label>No.of days of Credit Provided by Supplier </mat-label>
<mat-form-field style="width: 25%"> <mat-form-field style="width: 25%">
<input matInput placeholder="Days From" formControlName="trade_product_credit_days_from" type="number"> <input matInput placeholder="Days From" formControlName="trade_product_credit_days_from"
type="number">
</mat-form-field> </mat-form-field>
<mat-form-field style="width: 25%"> <mat-form-field style="width: 25%">
<input matInput placeholder="Days To" formControlName="trade_product_credit_days_to" type="number"> <input matInput placeholder="Days To" formControlName="trade_product_credit_days_to"
type="number">
</mat-form-field> </mat-form-field>
</div> </div>
<div align="end"> <div align="end">
<span *ngIf="item.controls.trading_products.controls.length > 1" (click)="removeTradingProduct(l)"> <span *ngIf="item.controls.trading_products.controls.length > 1" (click)="removeTradingProduct(l)">
<button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" color="primary" matTooltip="Delete" matTooltipPosition="above"><mat-icon>delete</mat-icon></button> <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon"
color="primary" matTooltip="Delete" matTooltipPosition="above">
<mat-icon>delete</mat-icon>
</button>
</span> </span>
</div> </div>
</mat-card> </mat-card>
@ -227,14 +263,16 @@
</div> </div>
<div fxlayout="row"> <div fxlayout="row">
<div fxFlex="100" align="center"> <div fxFlex="100" align="center">
<button mat-flat-button color="primary" matTooltip="Add More" matTooltipPosition="above" type="button" <button mat-flat-button color="primary" matTooltip="Add More" matTooltipPosition="above"
class="mr-1 mb-1 hover-icon" (click)="addMoretradeProduct($event); false"><strong>Add More Supplier</strong></button> type="button" class="mr-1 mb-1 hover-icon" (click)="addMoretradeProduct($event); false"><strong>Add
More Supplier</strong></button>
</div> </div>
</div> </div>
<div fxlayout="row" *ngIf="trdCreditCardFlag"> <div fxlayout="row" *ngIf="trdCreditCardFlag">
<mat-form-field style="width: 90%"> <mat-form-field style="width: 90%">
<input matInput placeholder="What % of Total Purchase is done on Credit?" formControlName="trading_products_total_payments_percent_on_credit" <input matInput placeholder="What % of Total Purchase is done on Credit?"
type="number" autocomplete="off"> formControlName="trading_products_total_payments_percent_on_credit" type="number"
autocomplete="off">
</mat-form-field> </mat-form-field>
</div> </div>
@ -254,7 +292,10 @@
</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" 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

@ -1,25 +1,11 @@
/** Common Imports */ /** Common Imports */
import { import { Component,OnInit,Inject,Output, Input } from '@angular/core';
Component,
OnInit,
Inject,
Output, Input
} from '@angular/core';
import { import { FormBuilder,FormGroup,Validators,FormArray } from '@angular/forms';
FormBuilder,
FormGroup,
Validators,
FormArray,
} from '@angular/forms';
import { NotifierService } from 'angular-notifier'; import { NotifierService } from 'angular-notifier';
import { import { MatDialog,MatDialogRef,MAT_DIALOG_DATA } from '@angular/material';
MatDialog,
MatDialogRef,
MAT_DIALOG_DATA
} from '@angular/material';
/** Service */ /** Service */
import { PdTrigerService } from '../../../../../pd-service/pd-triger.service'; import { PdTrigerService } from '../../../../../pd-service/pd-triger.service';
@ -571,7 +557,8 @@ export class SupplierInfoComponent implements OnInit {
items.controls['trade_product_credit_days_to'].updateValueAndValidity(); items.controls['trade_product_credit_days_to'].updateValueAndValidity();
} }
else if (flag == 1) { else if (flag == 1) {
if(e==3){ items.controls['manufacturing_credit_days_from'].setValidators([Validators.required]); if (e == 3) {
items.controls['manufacturing_credit_days_from'].setValidators([Validators.required]);
items.controls['manufacturing_credit_days_to'].setValidators([Validators.required]); items.controls['manufacturing_credit_days_to'].setValidators([Validators.required]);
} }
else { else {