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 9dab22634..af2bc494f 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 @@ -13,117 +13,117 @@ - - - -
-
- - -

Data as Per Financial Statements

-
+ + + +
+
+ + +

Data as Per Financial Statements

+
-
- - Enter year from which financials provided - - Invalid year format - +
+ + Enter year from which financials provided + + Invalid year format + - - - -
+ + + +
-
+
-
+
- - Financial Year : {{details.get('financial_year').value}} -
+ + Financial Year : {{details.get('financial_year').value}} +
-
-
+
+
- - - - {{"₹"}} {{FY_annualSalesInwords[i]}} Only - + + + + {{"₹"}} {{FY_annualSalesInwords[i]}} Only + - - - - - - No differents in Sales in FY {{details.get('financial_year').value}} over Sales in FY {{financialForm.controls.date_per_financial['controls'][i-1].get('financial_year').value}} - - - Increase in Sales in FY {{details.get('financial_year').value}} over Sales in FY {{financialForm.controls.date_per_financial['controls'][i-1].get('financial_year').value}} {{details.get('financial_annualsales_variation').value}} % - - - Decrease in Sales in FY {{details.get('financial_year').value}} over Sales in FY {{financialForm.controls.date_per_financial['controls'][i-1].get('financial_year').value}} {{(details.get('financial_annualsales_variation').value).replace('-', '')}} % - - - - + + + + + + No differents in Sales in FY {{details.get('financial_year').value}} over Sales in FY {{financialForm.controls.date_per_financial['controls'][i-1].get('financial_year').value}} + + + Increase in Sales in FY {{details.get('financial_year').value}} over Sales in FY {{financialForm.controls.date_per_financial['controls'][i-1].get('financial_year').value}} {{details.get('financial_annualsales_variation').value}} % + + + Decrease in Sales in FY {{details.get('financial_year').value}} over Sales in FY {{financialForm.controls.date_per_financial['controls'][i-1].get('financial_year').value}} {{(details.get('financial_annualsales_variation').value).replace('-', '')}} % + + + + -
+
-
- +
+ - + - Net Profit - Net Loss - - + Net Profit + Net Loss + + - - - - {{"₹"}} {{FY_netProfitAmtInwords[i]}} Only - - - - - - - - - {{"₹"}} {{FY_netLossAmtInwords[i]}} Only - - - - - -
+ + + + {{"₹"}} {{FY_netProfitAmtInwords[i]}} Only + + + + + - - - - - - No differents in Profit in FY {{details.get('financial_year').value}} over Profit in FY {{financialForm.controls.date_per_financial['controls'][i-1].get('financial_year').value}} - - - Increase in Profit in FY {{details.get('financial_year').value}} over Profit in FY {{financialForm.controls.date_per_financial['controls'][i-1].get('financial_year').value}} {{details.get('financial_variation').value}} % - - - Decrease in Profit in FY {{details.get('financial_year').value}} over Profit in FY {{financialForm.controls.date_per_financial['controls'][i-1].get('financial_year').value}} {{(details.get('financial_variation').value).replace('-', '')}} % - - + + + + {{"₹"}} {{FY_netLossAmtInwords[i]}} Only + + + + + +
+ + + + + + + No differents in Profit in FY {{details.get('financial_year').value}} over Profit in FY {{financialForm.controls.date_per_financial['controls'][i-1].get('financial_year').value}} + + + Increase in Profit in FY {{details.get('financial_year').value}} over Profit in FY {{financialForm.controls.date_per_financial['controls'][i-1].get('financial_year').value}} {{details.get('financial_variation').value}} % + + + Decrease in Profit in FY {{details.get('financial_year').value}} over Profit in FY {{financialForm.controls.date_per_financial['controls'][i-1].get('financial_year').value}} {{(details.get('financial_variation').value).replace('-', '')}} % + + - - + + @@ -135,15 +135,16 @@ matTooltip="Delete" matTooltipPosition="above" class="mr-1 mb-1 hover-icon" *ngIf="i>0"> delete --> -
+
-
-
- +
+
+ - - -
+ + + +
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 0904b395e..af31668e9 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 @@ -90,6 +90,7 @@ export class FinancialInfoComponent implements OnInit { this._pd.retriveForm(params).subscribe(value => { const financial_date = this.financialForm.controls['date_per_financial']; const estimated_val = this.financialForm.controls['estimated_value']; + if (value.status == 200) { let retriveData = value.records; this.isReadOnly = true; @@ -145,6 +146,7 @@ export class FinancialInfoComponent implements OnInit { financial_remarks: [''], staring_financial_year : ['',Validators.compose([Validators.minLength(4),Validators.maxLength(4)])], total_financial_year : [''], + financial_reason: [''], same_as_financial_statements:[''], date_per_financial: this.fb.array([]), estimated_value: this.fb.array([]) @@ -171,7 +173,7 @@ export class FinancialInfoComponent implements OnInit { financial_margin_of_loss: [''], financial_variation: [''], financial_annualsales_variation : [''], - financial_reason: [''], + }); } createValue(date) {