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 4385d2676..14a32ed82 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 @@ -20,67 +20,91 @@
-

Data as Per Financial Statements

+

Data as Per Financial Statements

 - - - Please provide Correct Year Format. Format Should Be (YYYY) + + Starting Financial Year + + Invalid year format + - - + + -
+
+ - - - - - - - - - - - - Net Profit - Net Loss - - - - - - - - - - - - - - - - - - - - - - - - - {{details.get('variation').value <= 0 ? 'Decreases ' : 'Increases '}} in Sales in FY Over Sales in FY is % - - - - +
+ + + + {{details.get('financial_year').value}} +
+ + + + + {{"₹"}} {{FY_annualSalesInwords2[i]}} Only + + + + + + +
+
+ + + + Net Profit + Net Loss + + + + + + {{"₹"}} {{FY_netProfitAmtInwords[i]}} Only + + + + + + + + + {{"₹"}} {{FY_netLossAmtInwords2[i]}} Only + + + + + +
+ + + + + + No differents in Profit in FY {{details.get('financial_year').value}} over sales in FY {{details.get('financial_year').value}} + + + {{details.get('financial_variation').value >= 0 ? 'Increase in Profit in FY ' : 'Decrease in Profit in FY'}} {{details.get('financial_year').value}} over Profit in FY {{details.get('financial_year').value}} {{details.get('financial_variation').value}} % + + + + + + - + @@ -104,27 +128,32 @@ -

Actual Values as per Customer

+

Actual Values as per Customer

 - + + Yes No +
- - +
+ - - + + + {{"₹"}} {{AV_annualSalesInwords2[i]}} Only - +
+
+ Net Profit @@ -132,21 +161,30 @@ - - + + + {{"₹"}} {{AV_netProfitAmtInwords2[i]}} Only - - + + + - - + + + {{"₹"}} {{AV_netLossAmtInwords2[i]}} Only - - + + + +
+ + + + {{details.controls['estimate_variation'].value}} {{details.controls['estimate_year'].value}} @@ -313,7 +351,7 @@ - + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.scss index 2205220f8..17598312d 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.scss @@ -17,6 +17,11 @@ // background: #62B013; // color: white; // } + +.underline input { + border: none; +} + .highlight { color: red; } diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.ts index 515fb19be..04973a09e 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.ts @@ -22,6 +22,7 @@ import { /** Service */ import { PdTrigerService } from '../../../../../pd-service/pd-triger.service'; import {ActivatedRoute, Router} from '@angular/router'; +import { Alert } from 'selenium-webdriver'; @Component({ selector: 'app-financial-info', @@ -39,6 +40,13 @@ export class FinancialInfoComponent implements OnInit { placeholderName : any = []; setmargin: AbstractControl; customerCommentsFlag :boolean; + FY_annualSalesInwords2 : any = []; + FY_netProfitAmtInwords : any = []; + FY_netLossAmtInwords2 : any = []; + AV_annualSalesInwords2 : any = []; + AV_netProfitAmtInwords2 : any = []; + AV_netLossAmtInwords2 : any = []; + constructor(notifier: NotifierService, private fb: FormBuilder, private route: ActivatedRoute, @@ -147,6 +155,7 @@ export class FinancialInfoComponent implements OnInit { financial_margin_of_profit: [''], financial_margin_of_loss: [''], financial_variation: [''], + financial_annualsales_variation : [''], financial_reason: [''], }); } @@ -161,6 +170,7 @@ export class FinancialInfoComponent implements OnInit { estimate_margin_of_profit: [''], estimate_margin_of_loss: [''], estimate_variation: [''], + estimate_annualsales_variation : [''], // estimate_reason: [''], }); } @@ -176,6 +186,7 @@ export class FinancialInfoComponent implements OnInit { estimate_margin_of_profit: [value.estimate_margin_of_profit], estimate_margin_of_loss: [value.estimate_margin_of_loss], estimate_variation: [value.estimate_variation], + estimate_annualsales_variation : [value.estimate_annualsales_variation], // estimate_reason: [''], }); } @@ -251,6 +262,7 @@ export class FinancialInfoComponent implements OnInit { estimate_margin_of_profit: val.financial_margin_of_profit, estimate_margin_of_loss: val.financial_margin_of_loss, estimate_variation: val.financial_variation, + estimate_annualsales_variation : val.financial_annualsales_variation }; control.push(this.createValuewithData(vals)); } @@ -299,31 +311,46 @@ export class FinancialInfoComponent implements OnInit { // // detail.controls.financial_variation.disable() // } // } + calFinAnnualSale(index,detail){ + let annual_sale = detail.value.financial_annual_sale; + if (index != 0) { + let array = this.financialForm.controls['date_per_financial']; + let prev_annual_sale = array.value[index-1].financial_annual_sale; + let annual_sale_variation = (( annual_sale - prev_annual_sale)/prev_annual_sale) * 100 ; + detail.controls.financial_annualsales_variation.setValue(annual_sale_variation.toFixed(2)+'%'); + console.log('annual sales variation in %',annual_sale_variation); + } + } + calYearVariation(index, detail) { - + + let annual_sale = detail.value.financial_annual_sale; let profit = detail.value.financial_net_profit; let loss = detail.value.financial_net_loss; - let curr_year = detail.value.financial_year; + this.SalesStatement[0] = 0.00; if ( (profit != '' || loss != '') && index != 0) { let array = this.financialForm.controls['date_per_financial']; + console.log(array.value[index - 1].financial_net_profit); let prev_profit = array.value[index - 1].financial_net_profit != '' ? array.value[index - 1].financial_net_profit : 0; let prev_loss = array.value[index - 1].financial_net_loss !='' ? array.value[index - 1].financial_net_loss : 0 ; - let prev_year = array.value[index - 1].financial_year; + let prev_annual_sale = array.value[index-1].financial_annual_sale; let variation = (((profit != '' ? profit : loss ) - ( prev_profit != '' ? prev_profit : prev_loss ))/ (prev_profit != '' ? prev_profit : prev_loss)) * 100; +// let annual_sale_variation = (annual_sale - prev_annual_sale) * 100 ; detail.controls.financial_variation.setValue(variation.toFixed(2)); - + //Increase in Sales in FY 2017-18 over sales in FY 2016-17 is 11.11% - console.log('variation',variation); - this.SalesStatement[index] = ( variation <= 0 ? 'Decreases ' : 'Increases ' ) + 'in Sales in FY ' + curr_year + ' Over Sales in FY '+ prev_year + ' is ' + variation.toFixed(2) + '%'; - console.log('this.SlesStatement',this.SalesStatement); + console.log('variation in %',variation); + + // this.SalesStatement[index] = ( variation <= 0 ? 'Decreases ' : 'Increases ' ) + 'in Sales in FY ' + curr_year + ' Over Sales in FY '+ prev_year + ' is ' + variation.toFixed(2) + '%'; + // console.log('this.SlesStatement',this.SalesStatement); } @@ -360,17 +387,32 @@ export class FinancialInfoComponent implements OnInit { // // detail.controls.financial_margin.disable() // } // } + calMargin(index, detail) { console.log('detail', detail); +// let array = this.financialForm.controls['date_per_financial']; let salary = detail.value.financial_annual_sale; + // let prev_annual_sale = array.value[index-1].financial_annual_sale; + // let annual_sale_variation = ((prev_annual_sale - salary)/salary ) * 100 ; + if(detail.value.finanical_profit_or_loss == 1){ - let profit = detail.value.financial_net_profit; + let profit = detail.value.financial_net_profit; if (salary != '' && profit != '') { - let margin = (profit / salary) * 100; - detail.controls.financial_margin_of_profit.setValue(margin.toFixed(2)) + if(salary < profit){ + alert('if condition salary = '+salary); + alert('if condition Profit = '+profit); + detail.controls.financial_margin_of_profit.setValue(''); + } + else{ + alert('else condition salary = '+salary); + alert('else condition Profit = '+profit); + let margin = (profit / salary) * 100; + alert(' '+margin); + detail.controls.financial_margin_of_profit.setValue(margin.toFixed(2)+'%') + } // detail.controls.financial_margin.disable() } @@ -380,11 +422,14 @@ export class FinancialInfoComponent implements OnInit { let loss = detail.value.financial_net_loss; if (salary != '' && loss != '') { + alert('if condition salary = '+salary); + alert('if condition loss = '+loss); let margin = (loss / salary) * 100; detail.controls.financial_margin_of_loss.setValue(margin.toFixed(2)); // detail.controls.financial_margin.disable() } } + //detail.controls.financial_annualsales_variation.setValue(annual_sale_variation.toFixed(2)); } calVariation(index, detail) { // console.log('CalVar In'); @@ -401,7 +446,7 @@ export class FinancialInfoComponent implements OnInit { let profit = detail.value.estimate_net_profit; let loss = detail.value.estimate_net_loss; - let curr_year = detail.value.estimate_year; + //let curr_year = detail.value.estimate_year; if ( (profit != '' || loss != '') && index != 0) { @@ -554,11 +599,46 @@ export class FinancialInfoComponent implements OnInit { /** On Key Press Event For Input Field */ keyPress(event: any) { - const pattern = /[0-9\-\.\ ]/; + const pattern = /[0-9]/; let inputChar = String.fromCharCode(event.charCode); if (event.keyCode != 8 && !pattern.test(inputChar)) { event.preventDefault(); } } + + /** To Convert Amount into Words */ + inWords(e,i,flag:number){ + + // console.log(e); + // console.log(i); + // console.log(flag); + + switch(flag){ + case 1 : + this.FY_annualSalesInwords2[i] = this._pd.convertNumberToWords(e.target.value); + // this.placeholderName[i] = 'Weekly Instalment Amount'; break; + break; + case 2 : + this.FY_netProfitAmtInwords[i] = this._pd.convertNumberToWords(e.target.value); + //alert('Fin net Profit'+this.FY_netProfitAmtInwords[i]); + break; + case 3 : + this.FY_netLossAmtInwords2[i] = this._pd.convertNumberToWords(e.target.value); + // alert('Fin net Loss'+this.FY_netLossAmtInwords2[i]); + break; + case 4 : + this.AV_annualSalesInwords2[i] = this._pd.convertNumberToWords(e.target.value); + break; + case 5 : + this.AV_netProfitAmtInwords2[i] = this._pd.convertNumberToWords(e.target.value); + break; + case 6 : + this.AV_netLossAmtInwords2[i] = this._pd.convertNumberToWords(e.target.value); + break; + default: + break; + } +} + }