Sineedge/sparqsineedge
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

issues fixes : ps

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2019-04-01 12:35:11 +05:30
parent 662ec38892
commit 26f8e55308
10 changed files with 141 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html
View File

@ -294,7 +294,7 @@
<!--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 == 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" <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:45%"> style="width:45%; height: 105px !important;">
<input matInput placeholder="Approximate Market Value" formControlName="approximate_market_value" <input matInput placeholder="Approximate Market Value" formControlName="approximate_market_value"
OnlyNumber type="text" autocomplete="off"> OnlyNumber type="text" autocomplete="off">
<mat-hint align="start" style="font-size:90%" *ngIf="sup.get('approximate_market_value').value != ''">{{"&#8377;"}} {{sup.get('approximate_market_value').value | numberToWords}} Only</mat-hint> <mat-hint align="start" style="font-size:90%" *ngIf="sup.get('approximate_market_value').value != ''">{{"&#8377;"}} {{sup.get('approximate_market_value').value | numberToWords}} Only</mat-hint>

2
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.scss
View File

@ -17,10 +17,12 @@
.matcard mat-form-field { .matcard mat-form-field {
margin: 0 2%; margin: 0 2%;
height: 105px !important;
} }
mat-form-field { mat-form-field {
margin: 0 2%; margin: 0 2%;
height: 105px !important;
} }
$base-card-box-shadow:1.5px 2.6px 24px 0 rgba(0, 35, 136, 0.08) !important; $base-card-box-shadow:1.5px 2.6px 24px 0 rgba(0, 35, 136, 0.08) !important;

2
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.html
View File

@ -60,7 +60,7 @@
<input matInput autocomplete="off" placeholder="Specify Loan Type" <input matInput autocomplete="off" placeholder="Specify Loan Type"
formControlName="others_loan_type"> formControlName="others_loan_type">
</mat-form-field> </mat-form-field>
<mat-form-field style="width:45%;"> <mat-form-field style="width:45%; height:105px;">
<input matInput autocomplete="off" placeholder="Loan Amount" <input matInput autocomplete="off" placeholder="Loan Amount"
formControlName="loan_amount" OnlyNumber type="text"> formControlName="loan_amount" OnlyNumber type="text">
<mat-hint align="start" style="font-size:90%" *ngIf="details.get('loan_amount').value != ''">{{"&#8377;"}} {{details.get('loan_amount').value | numberToWords}} Only</mat-hint> <mat-hint align="start" style="font-size:90%" *ngIf="details.get('loan_amount').value != ''">{{"&#8377;"}} {{details.get('loan_amount').value | numberToWords}} Only</mat-hint>

8
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.html
View File

@ -38,16 +38,16 @@
<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" <input matInput OnlyNumber type="number" autocomplete="off" placeholder="Year"
formControlName="how_long_year" required min='0'> formControlName="how_long_year" required min='0'>
<mat-error *ngIf="employmentForm.controls.how_long_year.hasError('max')">Higer then business vintage</mat-error> <mat-error *ngIf="employmentForm.controls.how_long_year.hasError('max')">Higer then business vintage</mat-error>
</mat-form-field> </mat-form-field>
<mat-form-field> <mat-form-field>
<input matInput OnlyNumber type="text" autocomplete="off" placeholder="Month" <input matInput OnlyNumber type="number" autocomplete="off" placeholder="Month"
formControlName="how_long_month" min='0' (change)="ConvertMonthintoYear($event.target.value)"> formControlName="how_long_month" min='0' (change)="ConvertMonthintoYear($event.target.value)">
<mat-error *ngIf="employmentForm.controls.how_long_month.hasError('max')">Higer then business vintage</mat-error> <mat-error *ngIf="employmentForm.controls.how_long_month.hasError('max')">Higer then business vintage</mat-error>
</mat-form-field> </mat-form-field>
<mat-form-field style="width: 22%"> <mat-form-field style="width: 30%">
<input matInput placeholder="Total Work Experience" formControlName="total_business_experience" <input matInput placeholder="Total Work Experience" formControlName="total_business_experience"
OnlyNumber autocomplete="off" (change)="checkWorkingExperiences()"> OnlyNumber autocomplete="off" (change)="checkWorkingExperiences()">
<!-- <mat-hint style="color: red;" *ngIf="employmentForm.controls['total_business_experience'].value !=undefined && this.workExperienceErrorFlag"> <!-- <mat-hint style="color: red;" *ngIf="employmentForm.controls['total_business_experience'].value !=undefined && this.workExperienceErrorFlag">
@ -55,7 +55,7 @@
</mat-hint> --> </mat-hint> -->
<mat-error *ngIf="employmentForm.controls.total_business_experience.hasError('min')">Total working Experience is Lower</mat-error> <mat-error *ngIf="employmentForm.controls.total_business_experience.hasError('min')">Total working Experience is Lower</mat-error>
</mat-form-field> </mat-form-field>
<mat-form-field style="width: 34%" *ngIf="workExperienceFlag"> <mat-form-field style="width: 100%" *ngIf="workExperienceFlag">
<input matInput placeholder="Previous Work Experience Details" formControlName="total_business_previous_experience"> <input matInput placeholder="Previous Work Experience Details" formControlName="total_business_previous_experience">
</mat-form-field> </mat-form-field>

26
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.ts
View File

@ -183,8 +183,8 @@ export class EmploymentInfoComponent implements OnInit {
this.employmentForm = this.fb.group({ this.employmentForm = this.fb.group({
employer_name: ['', Validators.compose([Validators.required])], employer_name: ['', Validators.compose([Validators.required])],
employer_in_brief: ['', Validators.compose([Validators.required])], employer_in_brief: ['', Validators.compose([Validators.required])],
how_long_year: ['', Validators.compose([Validators.required]),Validators.max(this.generalExistBusinessYear)], how_long_year: ['',Validators.compose([Validators.required,Validators.max(this.generalExistBusinessYear)])],
how_long_month: [''], how_long_month: ['',Validators.compose([Validators.max(12)])],
total_business_experience: [''], total_business_experience: [''],
total_business_previous_experience: [''], total_business_previous_experience: [''],
was_met: [this.pd_cus_segment == 'SAL-CHQ' ? 'no' : '', Validators.compose([Validators.required])], was_met: [this.pd_cus_segment == 'SAL-CHQ' ? 'no' : '', Validators.compose([Validators.required])],
@ -231,15 +231,15 @@ export class EmploymentInfoComponent implements OnInit {
console.log('this.generalExistBusinessMonth',this.generalExistBusinessMonth); console.log('this.generalExistBusinessMonth',this.generalExistBusinessMonth);
console.log('this.generalExistBusinessYear',this.generalExistBusinessYear); console.log('this.generalExistBusinessYear',this.generalExistBusinessYear);
if(data1.business_month != null && data1.business_month != '' && data1.business_month != undefined){ if(data1.business_month != null && data1.business_month != '' && data1.business_month != undefined){
this.generalExistBusinessMonth = data1.business_month this.generalExistBusinessMonth = data1.business_month
} }
if(data1.business_years){ if(data1.business_years){
this.generalExistBusinessYear = data1.business_years this.generalExistBusinessYear = data1.business_years
} }
this.employmentForm.controls['how_long_year'].setValidators([Validators.max(this.generalExistBusinessYear)]); this.employmentForm.controls['how_long_year'].setValidators(Validators.compose([Validators.max(this.generalExistBusinessYear)]));
this.employmentForm.controls['how_long_year'].updateValueAndValidity(); this.employmentForm.controls['how_long_year'].updateValueAndValidity();
} }
// ConvertMonthintoYear(e) { // ConvertMonthintoYear(e) {
@ -264,23 +264,27 @@ export class EmploymentInfoComponent implements OnInit {
let how_long_year = this.employmentForm.controls.how_long_year.value; let how_long_year = this.employmentForm.controls.how_long_year.value;
this.employmentForm.controls['how_long_month'].clearValidators();
let converted_month: number = +e%12; let converted_month: number = +e%12;
let converted_year: number = e / 12; let converted_year: number = e / 12;
// console.log('e',e%12);
// console.log('e',e);
// console.log('e',e/12);
if (how_long_year > this.generalExistBusinessYear) { if (how_long_year > this.generalExistBusinessYear) {
this.employmentForm.controls['how_long_year'].setValidators([Validators.max(this.generalExistBusinessYear)]);
this.employmentForm.controls['how_long_year'].updateValueAndValidity(); this.employmentForm.controls['how_long_year'].setValidators(Validators.compose([Validators.max(this.generalExistBusinessYear)]));
this.employmentForm.controls['how_long_year'].setValue(''); this.employmentForm.controls['how_long_year'].setValue('');
this.employmentForm.controls['how_long_month'].setValue(''); this.employmentForm.controls['how_long_month'].setValue('');
} }
else { else {
if (how_long_year == this.generalExistBusinessYear && +converted_month > this.generalExistBusinessMonth) { if (how_long_year == this.generalExistBusinessYear && +converted_month > this.generalExistBusinessMonth) {
this.employmentForm.controls['how_long_year'].setValidators([Validators.max(this.generalExistBusinessYear)]); this.employmentForm.controls['how_long_year'].setValidators(Validators.compose([Validators.max(this.generalExistBusinessYear)]));
this.employmentForm.controls['how_long_year'].updateValueAndValidity();
this.employmentForm.controls['how_long_month'].setValidators([Validators.max(this.generalExistBusinessMonth)]); this.employmentForm.controls['how_long_month'].setValidators(Validators.compose([Validators.max(this.generalExistBusinessMonth)]));
this.employmentForm.controls['how_long_month'].updateValueAndValidity();
} else { } else {
@ -289,6 +293,8 @@ export class EmploymentInfoComponent implements OnInit {
} }
} }
this.employmentForm.controls['how_long_year'].updateValueAndValidity();
this.employmentForm.controls['how_long_month'].updateValueAndValidity();
} }
ValidateNetSalary(){ ValidateNetSalary(){

2
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.html
View File

@ -165,7 +165,7 @@
<input matInput placeholder="Specify Others" <input matInput placeholder="Specify Others"
formControlName="earning_if_others_segment"> formControlName="earning_if_others_segment">
</mat-form-field> </mat-form-field>
<mat-form-field style="width:45%;"> <mat-form-field style="width:45%;height: 105px !important;">
<input matInput placeholder="Income Per Month" <input matInput placeholder="Income Per Month"
formControlName="earning_gross_income_per_month" formControlName="earning_gross_income_per_month"
OnlyNumber type="text"> OnlyNumber type="text">

124
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html
View File

@ -35,13 +35,13 @@
<div *ngIf="isDisplay"> <div *ngIf="isDisplay">
<mat-form-field style="width:37%"> <mat-form-field style="width:37%">
<mat-label>Enter year from which financials provided</mat-label> <mat-label>Enter year from which financials provided</mat-label>
<input matInput autocomplete="off" placeholder="YYYY eg.2018" formControlName="financial_starting_year" <input matInput autocomplete="off" placeholder="YYYY eg.2018" formControlName="financial_starting_year" (change)="dynamicalFinYear()"
OnlyNumber type="text" [readonly]="isReadOnly"> OnlyNumber type="text" [readonly]="isReadOnly">
<mat-error> Invalid year format</mat-error> <mat-error *ngIf="financialForm.controls['financial_starting_year'].hasError('minlength')"> Invalid year format</mat-error>
</mat-form-field> </mat-form-field>
<mat-form-field style="width:25%"> <mat-form-field style="width:25%">
<input matInput autocomplete="off" placeholder="Number of Financial Years" <input matInput autocomplete="off" placeholder="Number of Financial Years"
formControlName="financial_no_of_year" (change)="dynamicalFinYear($event)" formControlName="financial_no_of_year" (change)="dynamicalFinYear()"
OnlyNumber type="text" [readonly]="isReadOnly"> OnlyNumber type="text" [readonly]="isReadOnly">
</mat-form-field> </mat-form-field>
</div> </div>
@ -58,13 +58,10 @@
<input matInput autocomplete="off" placeholder="Annual Sale" <input matInput autocomplete="off" placeholder="Annual Sale"
formControlName="financial_annual_sale" (change)="calculationForFinanicalStatement()" formControlName="financial_annual_sale" (change)="calculationForFinanicalStatement()"
OnlyNumber type="text"> OnlyNumber type="text">
<mat-hint align="start" style="font-size:90%" *ngIf="details.get('financial_annual_sale').value != ''">{{"&#8377;"}} {{details.get('financial_annual_sale').value | numberToWords}} Only</mat-hint> <mat-hint align="start" style="font-size:90%" *ngIf="details.get('financial_annual_sale').value != ''">{{"&#8377;"}}
{{details.get('financial_annual_sale').value | numberToWords}}
Only</mat-hint>
<!-- <input matInput autocomplete="off" placeholder="Annual Sale"
formControlName="financial_annual_sale" (change)="calculationForFinanicalStatement()"
OnlyNumber type="text" (keyup)="inWords($event,i,1)">
<mat-hint align="start" style="font-size:70%" *ngIf="details.get('financial_annual_sale').value != ''">{{"&#8377;"}}
{{FY_annualSalesInwords[i]}} Only</mat-hint> -->
</mat-form-field> </mat-form-field>
<span *ngIf="i != 0"> <span *ngIf="i != 0">
<mat-form-field style="width:60%"> <mat-form-field style="width:60%">
@ -116,19 +113,15 @@
<input matInput autocomplete="off" placeholder="Net Profit Amount" <input matInput autocomplete="off" placeholder="Net Profit Amount"
formControlName="financial_net_profit" (change)="calculationForFinanicalStatement()" formControlName="financial_net_profit" (change)="calculationForFinanicalStatement()"
OnlyNumber type="text"> OnlyNumber type="text">
<mat-hint align="start" style="font-size:90%" *ngIf="details.get('financial_net_profit').value != ''">{{"&#8377;"}} {{details.get('financial_net_profit').value | numberToWords}} Only</mat-hint> <mat-hint align="start" style="font-size:90%" *ngIf="details.get('financial_net_profit').value != ''">{{"&#8377;"}}
{{details.get('financial_net_profit').value |
<!-- <input matInput autocomplete="off" placeholder="Net Profit Amount" numberToWords}} Only</mat-hint>
formControlName="financial_net_profit" (change)="calculationForFinanicalStatement()"
OnlyNumber type="text" (keyup)="inWords($event,i,2)">
<mat-hint align="start" style="font-size:70%" *ngIf="details.get('financial_net_profit').value != ''">{{"&#8377;"}}
{{FY_netProfitAmtInwords[i]}} Only</mat-hint> -->
</mat-form-field> </mat-form-field>
<mat-form-field style="width:28%"> <mat-form-field style="width:28%">
<input matInput autocomplete="off" placeholder="Net Profit to Sales in %" <input matInput autocomplete="off" placeholder="Net Profit to Sales in %"
formControlName="financial_margin_of_profit" OnlyNumber type="text" formControlName="financial_margin_of_profit" OnlyNumber
readonly> type="text" readonly>
</mat-form-field> </mat-form-field>
</span> </span>
<span *ngIf="details.get('finanical_profit_or_loss').value == 2 "> <span *ngIf="details.get('finanical_profit_or_loss').value == 2 ">
@ -137,13 +130,11 @@
<input matInput autocomplete="off" placeholder="Net Loss Amount" <input matInput autocomplete="off" placeholder="Net Loss Amount"
formControlName="financial_net_loss" (change)="calculationForFinanicalStatement()" formControlName="financial_net_loss" (change)="calculationForFinanicalStatement()"
OnlyNumber type="text"> OnlyNumber type="text">
<mat-hint align="start" style="font-size:90%" *ngIf="details.get('financial_net_loss').value != ''">{{"&#8377;"}} {{details.get('financial_net_loss').value | numberToWords}} Only</mat-hint> <mat-hint align="start" style="font-size:90%" *ngIf="details.get('financial_net_loss').value != ''">{{"&#8377;"}}
{{details.get('financial_net_loss').value | numberToWords}}
Only</mat-hint>
<!-- <input matInput autocomplete="off" placeholder="Net Loss Amount"
formControlName="financial_net_loss" (change)="calculationForFinanicalStatement()"
OnlyNumber type="text" (keyup)="inWords($event,i,3)">
<mat-hint align="start" style="font-size:70%" *ngIf="details.get('financial_net_loss').value != ''">{{"&#8377;"}}
{{FY_netLossAmtInwords[i]}} Only</mat-hint> -->
</mat-form-field> </mat-form-field>
<mat-form-field style="width:28%"> <mat-form-field style="width:28%">
<input matInput autocomplete="off" placeholder="Net Loss to Sales in %" <input matInput autocomplete="off" placeholder="Net Loss to Sales in %"
@ -190,8 +181,9 @@
</mat-form-field> </mat-form-field>
<mat-form-field style="width:45%"> <mat-form-field style="width:45%">
<input matInput autocomplete="off" [ngClass]="details.get('financial_profit_to_sale_variation').value > 0 ? 'greenhighlight' : 'highlight'" <input matInput autocomplete="off" [ngClass]="details.get('financial_profit_to_sale_variation').value > 0 ? 'greenhighlight' : 'highlight'"
placeholder="Variation of Profit/Loss to Sales % from Previous Year" formControlName="financial_profit_to_sale_variation" placeholder="Variation of Profit/Loss to Sales % from Previous Year"
OnlyNumber type="text" readonly> formControlName="financial_profit_to_sale_variation" OnlyNumber
type="text" readonly>
<mat-hint align="start" style="font-size:70%" *ngIf="i != 0 && details.get('financial_profit_to_sale_variation').value != '' "> <mat-hint align="start" style="font-size:70%" *ngIf="i != 0 && details.get('financial_profit_to_sale_variation').value != '' ">
<span *ngIf="details.get('financial_profit_to_sale_variation').value == 0"> <span *ngIf="details.get('financial_profit_to_sale_variation').value == 0">
No difference in Profit/Loss to sales % in FY <i> No difference in Profit/Loss to sales % in FY <i>
@ -260,7 +252,9 @@
<input matInput autocomplete="off" placeholder="Annual Sales From" <input matInput autocomplete="off" placeholder="Annual Sales From"
formControlName="estimate_sales_from" (change)="calculateSalesAverage(i, details);" formControlName="estimate_sales_from" (change)="calculateSalesAverage(i, details);"
OnlyNumber type="text"> OnlyNumber type="text">
<mat-hint align="start" style="font-size:90%" *ngIf="details.get('estimate_sales_from').value != ''">{{"&#8377;"}} {{details.get('estimate_sales_from').value | numberToWords}} Only</mat-hint> <mat-hint align="start" style="font-size:90%" *ngIf="details.get('estimate_sales_from').value != ''">{{"&#8377;"}}
{{details.get('estimate_sales_from').value | numberToWords}}
Only</mat-hint>
<!-- <input matInput autocomplete="off" placeholder="Annual Sales From" <!-- <input matInput autocomplete="off" placeholder="Annual Sales From"
formControlName="estimate_sales_from" (change)="calculateSalesAverage(i, details);" formControlName="estimate_sales_from" (change)="calculateSalesAverage(i, details);"
@ -273,7 +267,8 @@
<input matInput autocomplete="off" placeholder="Annual Sales To" <input matInput autocomplete="off" placeholder="Annual Sales To"
formControlName="estimate_sales_to" (change)="confirmAlert(i, details);" formControlName="estimate_sales_to" (change)="confirmAlert(i, details);"
OnlyNumber type="text"> OnlyNumber type="text">
<mat-hint align="start" style="font-size:90%" *ngIf="details.get('estimate_sales_to').value != ''">{{"&#8377;"}} {{details.get('estimate_sales_to').value | numberToWords}} Only</mat-hint> <mat-hint align="start" style="font-size:90%" *ngIf="details.get('estimate_sales_to').value != ''">{{"&#8377;"}}
{{details.get('estimate_sales_to').value | numberToWords}} Only</mat-hint>
<!-- <input matInput autocomplete="off" placeholder="Annual Sales To" <!-- <input matInput autocomplete="off" placeholder="Annual Sales To"
formControlName="estimate_sales_to" (change)="confirmAlert(i, details);" formControlName="estimate_sales_to" (change)="confirmAlert(i, details);"
@ -284,7 +279,9 @@
<mat-form-field style="width:25%"> <mat-form-field style="width:25%">
<input matInput autocomplete="off" placeholder="Considered Sales Average" <input matInput autocomplete="off" placeholder="Considered Sales Average"
formControlName="estimate_sales_average" readonly> formControlName="estimate_sales_average" readonly>
<mat-hint align="start" style="font-size:90%" *ngIf="details.get('estimate_sales_average').value != ''">{{"&#8377;"}} {{details.get('estimate_sales_average').value | numberToWords}} Only</mat-hint> <mat-hint align="start" style="font-size:90%" *ngIf="details.get('estimate_sales_average').value != ''">{{"&#8377;"}}
{{details.get('estimate_sales_average').value | numberToWords}}
Only</mat-hint>
<!-- <input matInput autocomplete="off" placeholder="Considered Sales Average" <!-- <input matInput autocomplete="off" placeholder="Considered Sales Average"
formControlName="estimate_sales_average" readonly> formControlName="estimate_sales_average" readonly>
@ -310,8 +307,8 @@
<div style="width:100%" *ngIf="details.get('estimate_profit_or_loss').value == 1 && details.get('estimate_net_margin_availablity').value == 'yes' "> <div style="width:100%" *ngIf="details.get('estimate_profit_or_loss').value == 1 && details.get('estimate_net_margin_availablity').value == 'yes' ">
<mat-form-field style="width:25%"> <mat-form-field style="width:25%">
<input matInput autocomplete="off" placeholder="Net Profit % From" <input matInput autocomplete="off" placeholder="Net Profit % From"
formControlName="estimate_profit_range_from" OnlyNumber type="text" formControlName="estimate_profit_range_from" OnlyNumber
min='0' max='100' (change)="calculateMarginProfit( i, details);"> type="text" min='0' max='100' (change)="calculateMarginProfit( i, details);">
</mat-form-field> </mat-form-field>
<mat-form-field style="width:25%"> <mat-form-field style="width:25%">
<input matInput autocomplete="off" placeholder="Net Profit % To" <input matInput autocomplete="off" placeholder="Net Profit % To"
@ -320,14 +317,16 @@
</mat-form-field> </mat-form-field>
<mat-form-field style="width:25%"> <mat-form-field style="width:25%">
<input matInput autocomplete="off" placeholder="Net Profit % Considered" <input matInput autocomplete="off" placeholder="Net Profit % Considered"
formControlName="estimate_profit_margin_percent" OnlyNumber type="text" formControlName="estimate_profit_margin_percent" OnlyNumber
readonly> type="text" readonly>
<!-- <mat-hint align="start" style="font-size:70%" *ngIf="details.get('estimate_profit_margin').value != ''"> {{"&#8377;"}} {{AV_marginProfitAmtInwords[i]}} Only ( {{"&#8377;"}} {{details.get('estimate_profit_margin').value}} ) </mat-hint> --> <!-- <mat-hint align="start" style="font-size:70%" *ngIf="details.get('estimate_profit_margin').value != ''"> {{"&#8377;"}} {{AV_marginProfitAmtInwords[i]}} Only ( {{"&#8377;"}} {{details.get('estimate_profit_margin').value}} ) </mat-hint> -->
</mat-form-field> </mat-form-field>
<mat-form-field style="width:25%"> <mat-form-field style="width:25%">
<input matInput placeholder="Net Profit Amount Considered" <input matInput placeholder="Net Profit Amount Considered"
formControlName="estimate_profit_margin" readonly> formControlName="estimate_profit_margin" readonly>
<mat-hint align="start" style="font-size:90%" *ngIf="details.get('estimate_profit_margin').value != ''">{{"&#8377;"}} {{details.get('estimate_profit_margin').value | numberToWords}} Only</mat-hint> <mat-hint align="start" style="font-size:90%" *ngIf="details.get('estimate_profit_margin').value != ''">{{"&#8377;"}}
{{details.get('estimate_profit_margin').value |
numberToWords}} Only</mat-hint>
<!-- <input matInput placeholder="Net Profit Amount Considered" <!-- <input matInput placeholder="Net Profit Amount Considered"
formControlName="estimate_profit_margin" readonly> formControlName="estimate_profit_margin" readonly>
@ -341,7 +340,9 @@
<input matInput autocomplete="off" placeholder="Net Profit Amount From" <input matInput autocomplete="off" placeholder="Net Profit Amount From"
formControlName="estimate_net_profit_from" OnlyNumber type="text" formControlName="estimate_net_profit_from" OnlyNumber type="text"
(change)="calculateProfitAmount(i, details);"> (change)="calculateProfitAmount(i, details);">
<mat-hint align="start" style="font-size:90%" *ngIf="details.get('estimate_net_profit_from').value != ''">{{"&#8377;"}} {{details.get('estimate_net_profit_from').value | numberToWords}} Only</mat-hint> <mat-hint align="start" style="font-size:90%" *ngIf="details.get('estimate_net_profit_from').value != ''">{{"&#8377;"}}
{{details.get('estimate_net_profit_from').value |
numberToWords}} Only</mat-hint>
<!-- <input matInput autocomplete="off" placeholder="Net Profit Amount From" <!-- <input matInput autocomplete="off" placeholder="Net Profit Amount From"
formControlName="estimate_net_profit_from" OnlyNumber type="text" formControlName="estimate_net_profit_from" OnlyNumber type="text"
@ -353,7 +354,9 @@
<input matInput autocomplete="off" placeholder="Net Profit Amount To" <input matInput autocomplete="off" placeholder="Net Profit Amount To"
formControlName="estimate_net_profit_to" OnlyNumber type="text" formControlName="estimate_net_profit_to" OnlyNumber type="text"
(change)="calculateProfitAmount(i, details);"> (change)="calculateProfitAmount(i, details);">
<mat-hint align="start" style="font-size:90%" *ngIf="details.get('estimate_net_profit_to').value != ''">{{"&#8377;"}} {{details.get('estimate_net_profit_to').value | numberToWords}} Only</mat-hint> <mat-hint align="start" style="font-size:90%" *ngIf="details.get('estimate_net_profit_to').value != ''">{{"&#8377;"}}
{{details.get('estimate_net_profit_to').value |
numberToWords}} Only</mat-hint>
<!-- <input matInput autocomplete="off" placeholder="Net Profit Amount To" <!-- <input matInput autocomplete="off" placeholder="Net Profit Amount To"
formControlName="estimate_net_profit_to" OnlyNumber type="text" formControlName="estimate_net_profit_to" OnlyNumber type="text"
@ -368,7 +371,9 @@
<mat-form-field style="width:25%"> <mat-form-field style="width:25%">
<input matInput placeholder="Considered Profit Amount" <input matInput placeholder="Considered Profit Amount"
formControlName="estimate_net_profit" readonly> formControlName="estimate_net_profit" readonly>
<mat-hint align="start" style="font-size:90%" *ngIf="details.get('estimate_net_profit').value != ''">{{"&#8377;"}} {{details.get('estimate_net_profit').value | numberToWords}} Only</mat-hint> <mat-hint align="start" style="font-size:90%" *ngIf="details.get('estimate_net_profit').value != ''">{{"&#8377;"}}
{{details.get('estimate_net_profit').value |
numberToWords}} Only</mat-hint>
<!-- <input matInput autocomplete="off" placeholder="Considered Profit Amount" <!-- <input matInput autocomplete="off" placeholder="Considered Profit Amount"
formControlName="estimate_net_profit" OnlyNumber type="text" formControlName="estimate_net_profit" OnlyNumber type="text"
@ -390,13 +395,15 @@
</mat-form-field> </mat-form-field>
<mat-form-field style="width:25%"> <mat-form-field style="width:25%">
<input matInput autocomplete="off" placeholder="Net Loss % Considered" <input matInput autocomplete="off" placeholder="Net Loss % Considered"
formControlName="estimate_loss_margin_percent" OnlyNumber type="text" formControlName="estimate_loss_margin_percent" OnlyNumber
readonly> type="text" readonly>
</mat-form-field> </mat-form-field>
<mat-form-field style="width:25%"> <mat-form-field style="width:25%">
<input matInput placeholder="Net Loss Amount Considered" <input matInput placeholder="Net Loss Amount Considered"
formControlName="estimate_loss_margin" readonly> formControlName="estimate_loss_margin" readonly>
<mat-hint align="start" style="font-size:90%" *ngIf="details.get('estimate_loss_margin').value != ''">{{"&#8377;"}} {{details.get('estimate_loss_margin').value | numberToWords}} Only</mat-hint> <mat-hint align="start" style="font-size:90%" *ngIf="details.get('estimate_loss_margin').value != ''">{{"&#8377;"}}
{{details.get('estimate_loss_margin').value |
numberToWords}} Only</mat-hint>
<!-- <input matInput placeholder="Net Loss Amount Considered" <!-- <input matInput placeholder="Net Loss Amount Considered"
formControlName="estimate_loss_margin" readonly> formControlName="estimate_loss_margin" readonly>
@ -409,26 +416,25 @@
<input matInput autocomplete="off" placeholder="Net Loss Amount From" <input matInput autocomplete="off" placeholder="Net Loss Amount From"
formControlName="estimate_net_loss_from" OnlyNumber type="text" formControlName="estimate_net_loss_from" OnlyNumber type="text"
(change)="calculateLossAmount(i, details);"> (change)="calculateLossAmount(i, details);">
<mat-hint align="start" style="font-size:90%" *ngIf="details.get('financial_annual_sale').value != ''">{{"&#8377;"}} {{details.get('financial_annual_sale').value | numberToWords}} Only</mat-hint> <mat-hint align="start" style="font-size:90%" *ngIf="details.get('financial_annual_sale').value != ''">{{"&#8377;"}}
{{details.get('financial_annual_sale').value |
<input matInput autocomplete="off" placeholder="Net Loss Amount From" numberToWords}} Only</mat-hint>
formControlName="estimate_net_loss_from" OnlyNumber type="text"
(change)="calculateLossAmount(i, details);" (keyup)="inWords($event,i,9)">
<mat-hint align="start" style="font-size:70%" *ngIf="details.get('estimate_net_loss_from').value != ''">{{"&#8377;"}}
{{AV_netLossAmtFrmInwords[i]}} Only </mat-hint>
</mat-form-field> </mat-form-field>
<mat-form-field style="width:25%"> <mat-form-field style="width:25%">
<input matInput autocomplete="off" placeholder="Annual Sale" <input matInput autocomplete="off" placeholder="Net Loss Amount To"
formControlName="financial_annual_sale" (change)="calculationForFinanicalStatement()" formControlName="estimate_net_loss_from" OnlyNumber type="text"
OnlyNumber type="text"> (change)="calculateLossAmount(i, details);">
<mat-hint align="start" style="font-size:90%" *ngIf="details.get('estimate_net_loss_to').value != ''">{{"&#8377;"}} {{details.get('estimate_net_loss_to').value | numberToWords}} Only</mat-hint> <mat-hint align="start" style="font-size:90%" *ngIf="details.get('estimate_net_loss_to').value != ''">{{"&#8377;"}}
{{details.get('estimate_net_loss_to').value |
<!-- <input matInput autocomplete="off" placeholder="Net Loss Amount To" numberToWords}} Only</mat-hint>
formControlName="estimate_net_loss_to" OnlyNumber type="text"
(change)="calculateLossAmount(i, details);" (keyup)="inWords($event,i,10)">
<mat-hint align="start" style="font-size:70%" *ngIf="details.get('estimate_net_loss_to').value != ''">{{"&#8377;"}}
{{AV_netLossAmtToInwords[i]}} Only </mat-hint> -->
</mat-form-field> </mat-form-field>
<!-- <mat-form-field style="width:25%">
<mat-hint align="start" style="font-size:90%" *ngIf="details.get('estimate_net_loss_to').value != ''">{{"&#8377;"}}
{{details.get('estimate_net_loss_to').value |
numberToWords}} Only</mat-hint>
</mat-form-field> -->
<mat-form-field style="width:25%"> <mat-form-field style="width:25%">
<input matInput autocomplete="off" placeholder="Considered Net Loss %" <input matInput autocomplete="off" placeholder="Considered Net Loss %"
formControlName="estimate_net_loss_percent" readonly> formControlName="estimate_net_loss_percent" readonly>
@ -436,7 +442,9 @@
<mat-form-field style="width:25%"> <mat-form-field style="width:25%">
<input matInput autocomplete="off" placeholder="Considered Loss Amount" <input matInput autocomplete="off" placeholder="Considered Loss Amount"
formControlName="estimate_net_loss" OnlyNumber type="text"> formControlName="estimate_net_loss" OnlyNumber type="text">
<mat-hint align="start" style="font-size:90%" *ngIf="details.get('estimate_net_loss').value != ''">{{"&#8377;"}} {{details.get('estimate_net_loss').value | numberToWords}} Only</mat-hint> <mat-hint align="start" style="font-size:90%" *ngIf="details.get('estimate_net_loss').value != ''">{{"&#8377;"}}
{{details.get('estimate_net_loss').value | numberToWords}}
Only</mat-hint>
<!-- <input matInput autocomplete="off" placeholder="Considered Loss Amount" <!-- <input matInput autocomplete="off" placeholder="Considered Loss Amount"
formControlName="estimate_net_loss" OnlyNumber type="text" readonly> formControlName="estimate_net_loss" OnlyNumber type="text" readonly>

1
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.scss
View File

@ -48,6 +48,7 @@
mat-form-field { mat-form-field {
margin: 0 2%; margin: 0 2%;
height: 105px !important;
} }
$base-card-box-shadow:1.5px 2.6px 24px 0 rgba(0, 35, 136, 0.08) !important; $base-card-box-shadow:1.5px 2.6px 24px 0 rgba(0, 35, 136, 0.08) !important;
$product-bg-color-hover: rgba(103, 58, 183, 0.7); $product-bg-color-hover: rgba(103, 58, 183, 0.7);

14
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.ts
View File

@ -357,10 +357,13 @@ export class FinancialInfoComponent implements OnInit {
} }
/** For Auto-generating FinYear */ /** For Auto-generating FinYear */
dynamicalFinYear($event){ dynamicalFinYear(){
let e = $event.target.value; let no_of_year = this.financialForm.controls['financial_no_of_year'].value
if(e == 1){
if(no_of_year != null && no_of_year != ''){
if(no_of_year == 1){
this.customerCommentsFlag = false; this.customerCommentsFlag = false;
} }
else{ else{
@ -375,13 +378,14 @@ export class FinancialInfoComponent implements OnInit {
control.removeAt(0); control.removeAt(0);
} }
if(e > 0 ){ if(no_of_year > 0 ){
for(let i = 1 ; i<= e ; i++ ){ for(let i = 1 ; i<= no_of_year ; i++ ){
let Year = (+startingYear+(i-1)) +'-'+ ((+startingYear)+(+i)); let Year = (+startingYear+(i-1)) +'-'+ ((+startingYear)+(+i));
control.push(this.createDate(Year)); control.push(this.createDate(Year));
} }
} }
} }
}
selectedStatement(e :any):void{ selectedStatement(e :any):void{

4
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html
View File

@ -37,7 +37,7 @@
</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" <mat-select placeholder="Stock" formControlName="stock_observed"
(selectionChange)="checkComments($event.value,1,a)"> (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>
@ -124,7 +124,7 @@
</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" <mat-select placeholder="Stock" formControlName="goods_observed"
(selectionChange)="checkComments($event.value,2,b)"> (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>