From 26f8e55308e93b018f0f64e6d237cc36b9588656 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Mon, 1 Apr 2019 12:35:11 +0530 Subject: [PATCH] issues fixes : ps --- .../assets-info/assets-info.component.html | 2 +- .../business-assets-info.component.scss | 2 + .../current-loan/current-loan.component.html | 2 +- .../employment-info.component.html | 8 +- .../employment-info.component.ts | 30 +-- .../family-details.component.html | 2 +- .../financial-info.component.html | 172 +++++++++--------- .../financial-info.component.scss | 1 + .../financial-info.component.ts | 38 ++-- .../start-pd/forms/stock/stock.component.html | 4 +- 10 files changed, 141 insertions(+), 120 deletions(-) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html index 8237438d9..6eed489c7 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html @@ -294,7 +294,7 @@
+ style="width:45%; height: 105px !important;"> {{"₹"}} {{sup.get('approximate_market_value').value | numberToWords}} Only diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.scss index a1c689d8e..1387488cf 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.scss @@ -17,10 +17,12 @@ .matcard mat-form-field { margin: 0 2%; + height: 105px !important; } mat-form-field { margin: 0 2%; + height: 105px !important; } $base-card-box-shadow:1.5px 2.6px 24px 0 rgba(0, 35, 136, 0.08) !important; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.html index 6bd06ad7e..64f45ff74 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.html @@ -60,7 +60,7 @@ - + {{"₹"}} {{details.get('loan_amount').value | numberToWords}} Only diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.html index 59885fd22..663351abc 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.html @@ -38,16 +38,16 @@
- Higer then business vintage - Higer then business vintage - + Total working Experience is Lower - + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.ts index a0b6ba751..ca0f0ef78 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.ts @@ -183,8 +183,8 @@ export class EmploymentInfoComponent implements OnInit { this.employmentForm = this.fb.group({ employer_name: ['', Validators.compose([Validators.required])], employer_in_brief: ['', Validators.compose([Validators.required])], - how_long_year: ['', Validators.compose([Validators.required]),Validators.max(this.generalExistBusinessYear)], - how_long_month: [''], + how_long_year: ['',Validators.compose([Validators.required,Validators.max(this.generalExistBusinessYear)])], + how_long_month: ['',Validators.compose([Validators.max(12)])], total_business_experience: [''], total_business_previous_experience: [''], 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.generalExistBusinessYear',this.generalExistBusinessYear); + if(data1.business_month != null && data1.business_month != '' && data1.business_month != undefined){ this.generalExistBusinessMonth = data1.business_month } if(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(); - } // ConvertMonthintoYear(e) { @@ -263,24 +263,28 @@ export class EmploymentInfoComponent implements OnInit { ConvertMonthintoYear(e) { 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_year: number = e / 12; - + + // console.log('e',e%12); + // console.log('e',e); + // console.log('e',e/12); + 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_month'].setValue(''); } else { 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'].updateValueAndValidity(); + this.employmentForm.controls['how_long_year'].setValidators(Validators.compose([Validators.max(this.generalExistBusinessYear)])); - this.employmentForm.controls['how_long_month'].setValidators([Validators.max(this.generalExistBusinessMonth)]); - this.employmentForm.controls['how_long_month'].updateValueAndValidity(); + this.employmentForm.controls['how_long_month'].setValidators(Validators.compose([Validators.max(this.generalExistBusinessMonth)])); } 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(){ diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.html index dd0c2a3e9..a4b92aaf1 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.html @@ -165,7 +165,7 @@ - + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html index de32ed394..c8721abcc 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html @@ -35,13 +35,13 @@
Enter year from which financials provided - - Invalid year format + Invalid year format
@@ -56,15 +56,12 @@
- {{"₹"}} {{details.get('financial_annual_sale').value | numberToWords}} Only - - + OnlyNumber type="text"> + {{"₹"}} + {{details.get('financial_annual_sale').value | numberToWords}} + Only + @@ -114,36 +111,30 @@ - {{"₹"}} {{details.get('financial_net_profit').value | numberToWords}} Only - - + OnlyNumber type="text"> + {{"₹"}} + {{details.get('financial_net_profit').value | + numberToWords}} Only + formControlName="financial_margin_of_profit" OnlyNumber + type="text" readonly> - - {{"₹"}} {{details.get('financial_net_loss').value | numberToWords}} Only - - + OnlyNumber type="text"> + {{"₹"}} + {{details.get('financial_net_loss').value | numberToWords}} + Only + + + placeholder="Variation of Profit/Loss to Sales % from Previous Year" + formControlName="financial_profit_to_sale_variation" OnlyNumber + type="text" readonly> No difference in Profit/Loss to sales % in FY {{details.get('financial_year').value}} over - Profit/Loss to sales % in FY + Profit/Loss to sales % in FY {{financialForm.controls.date_per_financial['controls'][i-1].get('financial_year').value}} @@ -204,7 +196,7 @@ class="greenhighlight"> Increase in Profit/Loss to sales % in FY {{details.get('financial_year').value}} over - Profit/Loss to sales % in FY + Profit/Loss to sales % in FY {{financialForm.controls.date_per_financial['controls'][i-1].get('financial_year').value}} {{details.get('financial_profit_to_sale_variation').value}} @@ -214,7 +206,7 @@ class="highlight"> Decrease in Profit/Loss to sales % in FY {{details.get('financial_year').value}} over - Profit/Loss to sales % in FY + Profit/Loss to sales % in FY {{financialForm.controls.date_per_financial['controls'][i-1].get('financial_year').value}} {{(details.get('financial_profit_to_sale_variation').value).replace('-', @@ -258,9 +250,11 @@ - {{"₹"}} {{details.get('estimate_sales_from').value | numberToWords}} Only + formControlName="estimate_sales_from" (change)="calculateSalesAverage(i, details);" + OnlyNumber type="text"> + {{"₹"}} + {{details.get('estimate_sales_from').value | numberToWords}} + Only - {{"₹"}} {{details.get('estimate_profit_margin').value | numberToWords}} Only + formControlName="estimate_profit_margin" readonly> + {{"₹"}} + {{details.get('estimate_profit_margin').value | + numberToWords}} Only + + + {{"₹"}} + {{details.get('estimate_net_loss_to').value | + numberToWords}} Only + + - {{"₹"}} {{details.get('estimate_net_loss').value | numberToWords}} Only - + formControlName="estimate_net_loss" OnlyNumber type="text"> + {{"₹"}} + {{details.get('estimate_net_loss').value | numberToWords}} + Only +