From 3e721b512c8a23145f225b9c0afb9806b1308380 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Thu, 7 Mar 2019 15:45:50 +0530 Subject: [PATCH] AI changes --- .../assessed-income.component.html | 192 ++++-------------- .../assessed-income.component.scss | 99 ++++++--- .../assessed-income.component.ts | 157 +++++++++++--- .../sales-calculation.component.html | 2 +- 4 files changed, 243 insertions(+), 207 deletions(-) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.html index 48ddc273b..f27e3f116 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.html @@ -23,159 +23,51 @@ Complete - - - - - -
-

a) Cost of Goods Sold

-
-
-

{{sumary_details.sales_revenue ? sumary_details.sales_revenue : 0}}

-
- - - -
-

{{subDetails.sales_item}}

-
-
-

{{subDetails.annual_sale_value ? subDetails.annual_sale_value : 0}}

-
- - - + + - - - -
-

b) Purchases

-
-
-

{{sumary_details.purchase ? sumary_details.purchase : 0}}

-
- - - -
-

{{subDetails.purchase_item}}

-
-
-

{{subDetails.annual_purchase_value ? subDetails.annual_purchase_value : 0}}

-
- - - - - - -
-

c) Gross Profit (a-b)

-
-
-

{{sumary_details.gross_profit ? sumary_details.gross_profit : 0}}

-
- - - +
+ - - - -
-

d) Other Income

-
-
-

{{sumary_details.other_business_income ? sumary_details.other_business_income : 0 }}

-
- - - -
-

{{subDetails.business_income_item}}

-
-
-

{{subDetails.annual_income_value ? subDetails.annual_income_value : 0}}

-
+ + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - -
-

e) Other Expenses

-
-
-

{{sumary_details.business_expense ? sumary_details.business_expense : 0}}

-
- - - -
-

{{subDetails.expense_item}}

-
-
-

{{subDetails.annual_expenses_value ? subDetails.annual_expenses_value : 0}}

-
- - - - - - -
-

f) Net Profit (c+d-e)

- -
-
-

{{sumary_details.net_profit ? sumary_details.net_profit : 0}}

-
- - - - - - - -
-

g) Household Expenses

- -
-
-

{{sumary_details.household_expenses ? sumary_details.household_expenses : 0}}

-
- - - -
-

{{subDetails.expense_item}}

-
-
-

{{subDetails.annual_expense_value ? subDetails.annual_expense_value : 0}}

-
- - - - - - -
-

h) Net Disposable Income (f-g)

- - -
-
-

{{sumary_details.net_disable_income_value ? sumary_details.net_disable_income_value : 0}}

-
- - - - - - + + + +
Summary {{element.sno}}{{element.label}} Declared_by_customer {{element.declared_by_customer}} As Derived from Item Wise Sales {{element.derived_item_wise}} As Derived from Kuchha Sales Book/Bills {{element.derived_sales_book}}
+
+ + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.scss index 1cfc15b89..8f0e25006 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.scss @@ -1,7 +1,10 @@ .example-container { - max-height: 500px; - overflow: auto; -} + // height: 400px; + // width: 550px; + max-height: 300px; + overflow: auto; + margin: 1% 2%; + } ::ng-deep .cdk-global-overlay-wrapper{ @@ -13,7 +16,7 @@ } .complete-button button { - margin-top: 10px; + margin: 1% 2%; } .paragraph_change { @@ -104,34 +107,6 @@ } - -// table, th, td { -// border: 1px solid rgba(0, 0, 0, 0.12); -// border-collapse: collapse; -// } -// td { -// padding: 5px; -// text-align: left; -// } -// th { -// padding: 5px; -// text-align: center; -// } - -.row_border { - display: flex; - border:1px solid rgba(0, 0, 0, 0.12); -} - -// mat-list-item:nth-child(3) { -// background-color: #f5f5f5; -// } -// mat-list-item:nth-child(6) { -// background-color: #f5f5f5; -// } -// mat-list-item:nth-child(8) { -// background-color: #f5f5f5; -// } mat-list-item:not(:first-child) { cursor: auto; .sub_item{ @@ -153,5 +128,65 @@ text-align: right; } + table { + width: 100%; + } + th.mat-column-position_2 , th.mat-column-position_3, th.mat-column-position_4 { + //padding-left: 1%; + //padding-left: 1%; + width: 30%; + text-align:center; + white-space: wrap; + + } + td.mat-column-position_2 , td.mat-column-position_3, td.mat-column-position_4 { + // padding-right: 1%; + text-align:center; + white-space: nowrap; + } + th.mat-column-position_1 { + white-space: nowrap; + } + td.mat-column-position_1{ + text-align:left; + white-space: nowrap; + width: 35%; + //color:#e00201; + } + td.mat-column-position_5 { + width: 5%; + padding-right: 8px; + } + + .mat-header-row{ + background-color:whitesmoke; + } + .mat-table-sticky:first-child { + border-right: 1px solid #e0e0e0; + } + + .mat-row:nth-child(3){ + background-color:rgb(253, 221, 160); + } + .mat-row:nth-child(5){ + background-color:rgb(253, 221, 160); + } + .mat-row:nth-child(9){ + background-color:rgb(253, 221, 160); + } + .mat-row:nth-child(10){ + background-color:rgb(253, 221, 160); + } + .mat-row:nth-child(11){ + background-color:rgb(253, 221, 160);; + } + + + + + // .mat-table-sticky:last-child { + // border-left: 1px solid #e0e0e0; + // } + \ No newline at end of file diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.ts index 521e4b88c..99f697a91 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.ts @@ -1,10 +1,6 @@ import {Component,OnInit,Inject,Input, ViewChild } from '@angular/core'; import { NotifierService } from 'angular-notifier'; -import { - MatDialog, - MatDialogRef, - MAT_DIALOG_DATA -} from '@angular/material'; +import {MatDialog,MatDialogRef,MAT_DIALOG_DATA, MatTableDataSource} from '@angular/material'; /** Service */ import { PdTrigerService } from '../../../../../pd-service/pd-triger.service'; import { ActivatedRoute, Router } from "@angular/router"; @@ -15,6 +11,8 @@ import { ConfirmAiDetailsComponent } from "./confirm-ai-details/confirm-ai-detai styleUrls: ['./assessed-income.component.scss'] }) export class AssessedIncomeComponent implements OnInit { + displayedSummaryColumns: any =[]; + summaryItemSource:any = []; customer_segment_abbr: any; subproduct_abbr: any; lender_applicant_id: any; @@ -58,11 +56,6 @@ public getCustomValues:any = { UOMList: this.UOMList,frequencyList: this.frequen this.company_id = this.pd_all_details.company_id; this.notifier = notifier; this.form_id = 16; - this.loadAIDetails(); - this.getAIMaster('UOM',1); - this.getAIMaster('FREQUENCY',2); - this.getAIMaster('BUSINESSEXPENSES',3); - this.getAIMaster('BUSINESSINCOME',4); this.getCustomValues.pdid = this.pd_all_details.pdmaster_details.pd_id; this.getCustomValues.company_id = this.pd_all_details.company_id; this.main_applicant = this.pd_all_details.pdmaster_details.main_applicant; @@ -91,7 +84,11 @@ public viewerOptions: any = { } }; ngOnInit() { - + this.loadAIDetails(); + this.getAIMaster('UOM',1); + this.getAIMaster('FREQUENCY',2); + this.getAIMaster('BUSINESSEXPENSES',3); + this.getAIMaster('BUSINESSINCOME',4); } // load ai details loadAIDetails(): void{ @@ -151,20 +148,132 @@ public viewerOptions: any = { this.otherBusinessIncome = value.records.othre_business_income; } + // set sumary table headers if(value.records.final_data.length >0){ - this.sumary_details.sales_revenue = value.records.final_data[0].sales_revenue; - this.sumary_details.sales_revenue_details = value.records.final_data[0].sales_revenue_details; - this.sumary_details.purchase = value.records.final_data[0].purchase; - this.sumary_details.purchase_details = value.records.final_data[0].purchase_details; - this.sumary_details.gross_profit = value.records.final_data[0].gross_profit; - this.sumary_details.other_business_income= value.records.final_data[0].other_business_income; - this.sumary_details.other_business_income_details = value.records.final_data[0].other_business_income_details; - this.sumary_details.business_expense = value.records.final_data[0].business_expense; - this.sumary_details.business_expense_details = value.records.final_data[0].business_expense_details; - this.sumary_details.net_profit = value.records.final_data[0].net_profit !='' && value.records.final_data[0].net_profit!=null ? value.records.final_data[0].net_profit : 0; - this.sumary_details.household_expenses = value.records.final_data[0].household_expenses; - this.sumary_details.house_hold_expense_details = value.records.final_data[0].house_hold_expense_details !='' && value.records.final_data[0].house_hold_expense_details !=null ? value.records.final_data[0].house_hold_expense_details : 0; - this.sumary_details.net_disable_income_value = Number(this.sumary_details.net_profit) - Number(this.sumary_details.household_expenses); + //set column name + (value.records.final_data[0].sales_declared_by_customer!=null && value.records.final_data[0].sales_calculated_by_itemwise!=null && value.records.final_data[0].sales_calculated_by_monthwise!=null) ? this.displayedSummaryColumns.push("position_1","position_2","position_3","position_4") + : (value.records.final_data[0].sales_declared_by_customer!=null && value.records.final_data[0].sales_calculated_by_itemwise!=null && value.records.final_data[0].sales_calculated_by_monthwise==null) ? this.displayedSummaryColumns.push("position_1","position_2","position_3") + : (value.records.final_data[0].sales_declared_by_customer!=null && value.records.final_data[0].sales_calculated_by_itemwise==null && value.records.final_data[0].sales_calculated_by_monthwise!=null) ? this.displayedSummaryColumns.push("position_1","position_2","position_4") + : (value.records.final_data[0].sales_declared_by_customer==null && value.records.final_data[0].sales_calculated_by_itemwise!=null && value.records.final_data[0].sales_calculated_by_monthwise!=null) ? this.displayedSummaryColumns.push("position_1","position_3","position_4") + : (value.records.final_data[0].sales_declared_by_customer!=null && value.records.final_data[0].sales_calculated_by_itemwise==null && value.records.final_data[0].sales_calculated_by_monthwise==null) ? this.displayedSummaryColumns.push("position_1","position_2") + : (value.records.final_data[0].sales_declared_by_customer==null && value.records.final_data[0].sales_calculated_by_itemwise!=null && value.records.final_data[0].sales_calculated_by_monthwise==null) ? this.displayedSummaryColumns.push("position_1","position_3") + : (value.records.final_data[0].sales_declared_by_customer==null && value.records.final_data[0].sales_calculated_by_itemwise==null && value.records.final_data[0].sales_calculated_by_monthwise!=null) ? this.displayedSummaryColumns.push("position_1","position_4") + :this.displayedSummaryColumns.push("position_1"); + } + else { + this.displayedSummaryColumns.push("position_1"); + } + + if(value.records.final_data.length >0 && (value.records.final_data[0].sales_declared_by_customer && value.records.final_data[0].sales_declared_by_customer.cost_of_goods_sold) || (value.records.final_data[0].sales_calculated_by_itemwise &&value.records.final_data[0].sales_calculated_by_itemwise.cost_of_goods_sold)|| (value.records.final_data[0].sales_calculated_by_monthwise &&value.records.final_data[0].sales_calculated_by_monthwise.cost_of_goods_sold) ){ + let get_sumary: any=[]; + // set sales and revenue + get_sumary.push({"sno":'a. ',"label":'Sales Revenue ',"declared_by_customer":(value.records.final_data[0].sales_declared_by_customer && value.records.final_data[0].sales_declared_by_customer.sales_revenue) ? value.records.final_data[0].sales_declared_by_customer.sales_revenue:0, "derived_item_wise":(value.records.final_data[0].sales_calculated_by_itemwise && value.records.final_data[0].sales_calculated_by_itemwise.sales_revenue) ? value.records.final_data[0].sales_calculated_by_itemwise.sales_revenue:0 ,"derived_sales_book":(value.records.final_data[0].sales_calculated_by_monthwise && value.records.final_data[0].sales_calculated_by_monthwise.sales_revenue) ? value.records.final_data[0].sales_calculated_by_monthwise.sales_revenue:0 }); + //set cost of goods sold + get_sumary.push({"sno":'b. ',"label":'Cost of Goods Sold ',"declared_by_customer":(value.records.final_data[0].sales_declared_by_customer && value.records.final_data[0].sales_declared_by_customer.cost_of_goods_sold) ? value.records.final_data[0].sales_declared_by_customer.cost_of_goods_sold:0, "derived_item_wise":(value.records.final_data[0].sales_calculated_by_itemwise && value.records.final_data[0].sales_calculated_by_itemwise.cost_of_goods_sold) ? value.records.final_data[0].sales_calculated_by_itemwise.cost_of_goods_sold:0 ,"derived_sales_book":(value.records.final_data[0].sales_calculated_by_monthwise && value.records.final_data[0].sales_calculated_by_monthwise.cost_of_goods_sold) ? value.records.final_data[0].sales_calculated_by_monthwise.cost_of_goods_sold:0 }); + //set gross profit + get_sumary.push({"sno":'c. ',"label":'Gross Profit / Loss(a-b) ',"declared_by_customer":(value.records.final_data[0].sales_declared_by_customer && value.records.final_data[0].sales_declared_by_customer.grossprofit) ? value.records.final_data[0].sales_declared_by_customer.grossprofit:0, "derived_item_wise":(value.records.final_data[0].sales_calculated_by_itemwise && value.records.final_data[0].sales_calculated_by_itemwise.grossprofit) ? value.records.final_data[0].sales_calculated_by_itemwise.grossprofit:0 ,"derived_sales_book":(value.records.final_data[0].sales_calculated_by_monthwise && value.records.final_data[0].sales_calculated_by_monthwise.grossprofit) ? value.records.final_data[0].sales_calculated_by_monthwise.grossprofit:0 }); + // set business expense + get_sumary.push({"sno":'d. ',"label":'Business Expenses ',"declared_by_customer":(value.records.final_data[0].sales_declared_by_customer && value.records.final_data[0].sales_declared_by_customer.business_expenses) ? value.records.final_data[0].sales_declared_by_customer.business_expenses:0, "derived_item_wise":(value.records.final_data[0].sales_calculated_by_itemwise && value.records.final_data[0].sales_calculated_by_itemwise.business_expenses) ? value.records.final_data[0].sales_calculated_by_itemwise.business_expenses:0 ,"derived_sales_book":(value.records.final_data[0].sales_calculated_by_monthwise && value.records.final_data[0].sales_calculated_by_monthwise.business_expenses) ? value.records.final_data[0].sales_calculated_by_monthwise.business_expenses:0 }); + // set net profit / loss + get_sumary.push({"sno":'e. ',"label":'Net Profit / Loss(c-d) ',"declared_by_customer":(value.records.final_data[0].sales_declared_by_customer && value.records.final_data[0].sales_declared_by_customer.netprofit) ? value.records.final_data[0].sales_declared_by_customer.netprofit:0, "derived_item_wise":(value.records.final_data[0].sales_calculated_by_itemwise && value.records.final_data[0].sales_calculated_by_itemwise.netprofit) ? value.records.final_data[0].sales_calculated_by_itemwise.netprofit:0 ,"derived_sales_book":(value.records.final_data[0].sales_calculated_by_monthwise && value.records.final_data[0].sales_calculated_by_monthwise.netprofit) ? value.records.final_data[0].sales_calculated_by_monthwise.netprofit:0 }); + // set household expenses + get_sumary.push({"sno":'f. ',"label":'Household Expenses ',"declared_by_customer":(value.records.final_data[0].sales_declared_by_customer && value.records.final_data[0].sales_declared_by_customer.house_hold_expenses) ? value.records.final_data[0].sales_declared_by_customer.house_hold_expenses:0, "derived_item_wise":(value.records.final_data[0].sales_calculated_by_itemwise && value.records.final_data[0].sales_calculated_by_itemwise.house_hold_expenses) ? value.records.final_data[0].sales_calculated_by_itemwise.house_hold_expenses:0 ,"derived_sales_book":(value.records.final_data[0].sales_calculated_by_monthwise && value.records.final_data[0].sales_calculated_by_monthwise.house_hold_expenses) ? value.records.final_data[0].sales_calculated_by_monthwise.house_hold_expenses:0 }); + //set disposable income + get_sumary.push({"sno":'g. ',"label":'Disposable Income ',"declared_by_customer":(value.records.final_data[0].sales_declared_by_customer && value.records.final_data[0].sales_declared_by_customer.disposable_income) ? value.records.final_data[0].sales_declared_by_customer.disposable_income:0, "derived_item_wise":(value.records.final_data[0].sales_calculated_by_itemwise && value.records.final_data[0].sales_calculated_by_itemwise.disposable_income) ? value.records.final_data[0].sales_calculated_by_itemwise.disposable_income:0 ,"derived_sales_book":(value.records.final_data[0].sales_calculated_by_monthwise && value.records.final_data[0].sales_calculated_by_monthwise.disposable_income) ? value.records.final_data[0].sales_calculated_by_monthwise.disposable_income:0 }); + //set net margin + get_sumary.push({"sno":'h. ',"label":'Net Margin',"declared_by_customer":(value.records.final_data[0].sales_declared_by_customer && value.records.final_data[0].sales_declared_by_customer.netmargin) ? value.records.final_data[0].sales_declared_by_customer.netmargin:0, "derived_item_wise":(value.records.final_data[0].sales_calculated_by_itemwise && value.records.final_data[0].sales_calculated_by_itemwise.netmargin) ? value.records.final_data[0].sales_calculated_by_itemwise.netmargin:0 ,"derived_sales_book":(value.records.final_data[0].sales_calculated_by_monthwise && value.records.final_data[0].sales_calculated_by_monthwise.netmargin) ? value.records.final_data[0].sales_calculated_by_monthwise.netmargin:0 }); + + // get conslidate sales / revenue details + (value.records.final_data[0].consolidated_report && value.records.final_data[0].sales_declared_by_customer!=null && value.records.final_data[0].sales_calculated_by_itemwise!=null && value.records.final_data[0].sales_calculated_by_monthwise!=null) ? get_sumary.push({"sno":'',"label":'Considered Sales / Revenue ',"declared_by_customer":value.records.final_data[0].consolidated_report.consolidated_sales_revenue, "derived_item_wise":'' ,"derived_sales_book":'' }) + : (value.records.final_data[0].consolidated_report &&value.records.final_data[0].sales_declared_by_customer!=null && value.records.final_data[0].sales_calculated_by_itemwise!=null && value.records.final_data[0].sales_calculated_by_monthwise==null) ? get_sumary.push({"sno":'',"label":'Considered Sales / Revenue ',"declared_by_customer":value.records.final_data[0].consolidated_report.consolidated_sales_revenue, "derived_item_wise":'' ,"derived_sales_book":'' }) + : (value.records.final_data[0].consolidated_report &&value.records.final_data[0].sales_declared_by_customer!=null && value.records.final_data[0].sales_calculated_by_itemwise==null && value.records.final_data[0].sales_calculated_by_monthwise!=null) ? get_sumary.push({"sno":'',"label":'Considered Sales / Revenue ',"declared_by_customer":value.records.final_data[0].consolidated_report.consolidated_sales_revenue, "derived_item_wise":'' ,"derived_sales_book":'' }) + : (value.records.final_data[0].consolidated_report &&value.records.final_data[0].sales_declared_by_customer==null && value.records.final_data[0].sales_calculated_by_itemwise!=null && value.records.final_data[0].sales_calculated_by_monthwise!=null) ? get_sumary.push({"sno":'',"label":'Considered Sales / Revenue ',"declared_by_customer":'', "derived_item_wise":value.records.final_data[0].consolidated_report.consolidated_sales_revenue ,"derived_sales_book":'' }) + : (value.records.final_data[0].consolidated_report &&value.records.final_data[0].sales_declared_by_customer!=null && value.records.final_data[0].sales_calculated_by_itemwise==null && value.records.final_data[0].sales_calculated_by_monthwise==null) ? get_sumary.push({"sno":'',"label":'Considered Sales / Revenue ',"declared_by_customer":value.records.final_data[0].consolidated_report.consolidated_sales_revenue, "derived_item_wise":'' ,"derived_sales_book":'' }) + : (value.records.final_data[0].consolidated_report &&value.records.final_data[0].sales_declared_by_customer==null && value.records.final_data[0].sales_calculated_by_itemwise!=null && value.records.final_data[0].sales_calculated_by_monthwise==null) ? get_sumary.push({"sno":'',"label":'Considered Sales / Revenue ',"declared_by_customer":'', "derived_item_wise":value.records.final_data[0].consolidated_report.consolidated_sales_revenue ,"derived_sales_book":'' }) + : (value.records.final_data[0].consolidated_report &&value.records.final_data[0].sales_declared_by_customer==null && value.records.final_data[0].sales_calculated_by_itemwise==null && value.records.final_data[0].sales_calculated_by_monthwise!=null) ? get_sumary.push({"sno":'',"label":'Considered Sales / Revenue ',"declared_by_customer":'', "derived_item_wise":'' ,"derived_sales_book":value.records.final_data[0].consolidated_report.consolidated_sales_revenue }) + :''; + // get conslidate net margin details + (value.records.final_data[0].consolidated_report && value.records.final_data[0].sales_declared_by_customer!=null && value.records.final_data[0].sales_calculated_by_itemwise!=null && value.records.final_data[0].sales_calculated_by_monthwise!=null) ? get_sumary.push({"sno":'',"label":'Considered Net Margin % ',"declared_by_customer":value.records.final_data[0].consolidated_report.consolidated_nermagin, "derived_item_wise":'' ,"derived_sales_book":'' }) + : (value.records.final_data[0].consolidated_report &&value.records.final_data[0].sales_declared_by_customer!=null && value.records.final_data[0].sales_calculated_by_itemwise!=null && value.records.final_data[0].sales_calculated_by_monthwise==null) ? get_sumary.push({"sno":'',"label":'Considered Net Margin % ',"declared_by_customer":value.records.final_data[0].consolidated_report.consolidated_nermagin, "derived_item_wise":'' ,"derived_sales_book":'' }) + : (value.records.final_data[0].consolidated_report &&value.records.final_data[0].sales_declared_by_customer!=null && value.records.final_data[0].sales_calculated_by_itemwise==null && value.records.final_data[0].sales_calculated_by_monthwise!=null) ? get_sumary.push({"sno":'',"label":'Considered Net Margin % ',"declared_by_customer":value.records.final_data[0].consolidated_report.consolidated_nermagin, "derived_item_wise":'' ,"derived_sales_book":'' }) + : (value.records.final_data[0].consolidated_report &&value.records.final_data[0].sales_declared_by_customer==null && value.records.final_data[0].sales_calculated_by_itemwise!=null && value.records.final_data[0].sales_calculated_by_monthwise!=null) ? get_sumary.push({"sno":'',"label":'Considered Net Margin % ',"declared_by_customer":'', "derived_item_wise":value.records.final_data[0].consolidated_report.consolidated_nermagin ,"derived_sales_book":'' }) + : (value.records.final_data[0].consolidated_report &&value.records.final_data[0].sales_declared_by_customer!=null && value.records.final_data[0].sales_calculated_by_itemwise==null && value.records.final_data[0].sales_calculated_by_monthwise==null) ? get_sumary.push({"sno":'',"label":'Considered Net Margin % ',"declared_by_customer":value.records.final_data[0].consolidated_report.consolidated_nermagin, "derived_item_wise":'' ,"derived_sales_book":'' }) + : (value.records.final_data[0].consolidated_report &&value.records.final_data[0].sales_declared_by_customer==null && value.records.final_data[0].sales_calculated_by_itemwise!=null && value.records.final_data[0].sales_calculated_by_monthwise==null) ? get_sumary.push({"sno":'',"label":'Considered Net Margin % ',"declared_by_customer":'', "derived_item_wise":value.records.final_data[0].consolidated_report.consolidated_nermagin ,"derived_sales_book":'' }) + : (value.records.final_data[0].consolidated_report &&value.records.final_data[0].sales_declared_by_customer==null && value.records.final_data[0].sales_calculated_by_itemwise==null && value.records.final_data[0].sales_calculated_by_monthwise!=null) ? get_sumary.push({"sno":'',"label":'Considered Net Margin % ',"declared_by_customer":'', "derived_item_wise":'' ,"derived_sales_book":value.records.final_data[0].consolidated_report.consolidated_nermagin }) + :''; + // get conslidate net profit details + (value.records.final_data[0].consolidated_report && value.records.final_data[0].sales_declared_by_customer!=null && value.records.final_data[0].sales_calculated_by_itemwise!=null && value.records.final_data[0].sales_calculated_by_monthwise!=null) ? get_sumary.push({"sno":'',"label":'Considered Net Profit ',"declared_by_customer":value.records.final_data[0].consolidated_report.consolidated_nerprofit, "derived_item_wise":'' ,"derived_sales_book":'' }) + : (value.records.final_data[0].consolidated_report &&value.records.final_data[0].sales_declared_by_customer!=null && value.records.final_data[0].sales_calculated_by_itemwise!=null && value.records.final_data[0].sales_calculated_by_monthwise==null) ? get_sumary.push({"sno":'',"label":'Considered Net Profit ',"declared_by_customer":value.records.final_data[0].consolidated_report.consolidated_nerprofit, "derived_item_wise":'' ,"derived_sales_book":'' }) + : (value.records.final_data[0].consolidated_report &&value.records.final_data[0].sales_declared_by_customer!=null && value.records.final_data[0].sales_calculated_by_itemwise==null && value.records.final_data[0].sales_calculated_by_monthwise!=null) ? get_sumary.push({"sno":'',"label":'Considered Net Profit ',"declared_by_customer":value.records.final_data[0].consolidated_report.consolidated_nerprofit, "derived_item_wise":'' ,"derived_sales_book":'' }) + : (value.records.final_data[0].consolidated_report &&value.records.final_data[0].sales_declared_by_customer==null && value.records.final_data[0].sales_calculated_by_itemwise!=null && value.records.final_data[0].sales_calculated_by_monthwise!=null) ? get_sumary.push({"sno":'',"label":'Considered Net Profit ',"declared_by_customer":'', "derived_item_wise":value.records.final_data[0].consolidated_report.consolidated_nerprofit ,"derived_sales_book":'' }) + : (value.records.final_data[0].consolidated_report &&value.records.final_data[0].sales_declared_by_customer!=null && value.records.final_data[0].sales_calculated_by_itemwise==null && value.records.final_data[0].sales_calculated_by_monthwise==null) ? get_sumary.push({"sno":'',"label":'Considered Net Profit ',"declared_by_customer":value.records.final_data[0].consolidated_report.consolidated_nerprofit, "derived_item_wise":'' ,"derived_sales_book":'' }) + : (value.records.final_data[0].consolidated_report &&value.records.final_data[0].sales_declared_by_customer==null && value.records.final_data[0].sales_calculated_by_itemwise!=null && value.records.final_data[0].sales_calculated_by_monthwise==null) ? get_sumary.push({"sno":'',"label":'Considered Net Profit ',"declared_by_customer":'', "derived_item_wise":value.records.final_data[0].consolidated_report.consolidated_nerprofit ,"derived_sales_book":'' }) + : (value.records.final_data[0].consolidated_report &&value.records.final_data[0].sales_declared_by_customer==null && value.records.final_data[0].sales_calculated_by_itemwise==null && value.records.final_data[0].sales_calculated_by_monthwise!=null) ? get_sumary.push({"sno":'',"label":'Considered Net Profit ',"declared_by_customer":'', "derived_item_wise":'' ,"derived_sales_book":value.records.final_data[0].consolidated_report.consolidated_nerprofit }) + :''; + + this.summaryItemSource=get_sumary; + // this.sumary_details.sales_revenue = value.records.final_data[0].sales_revenue; + // this.sumary_details.sales_revenue_details = value.records.final_data[0].sales_revenue_details; + // this.sumary_details.purchase = value.records.final_data[0].purchase; + // this.sumary_details.purchase_details = value.records.final_data[0].purchase_details; + // this.sumary_details.gross_profit = value.records.final_data[0].gross_profit; + // this.sumary_details.other_business_income= value.records.final_data[0].other_business_income; + // this.sumary_details.other_business_income_details = value.records.final_data[0].other_business_income_details; + // this.sumary_details.business_expense = value.records.final_data[0].business_expense; + // this.sumary_details.business_expense_details = value.records.final_data[0].business_expense_details; + // this.sumary_details.net_profit = value.records.final_data[0].net_profit !='' && value.records.final_data[0].net_profit!=null ? value.records.final_data[0].net_profit : 0; + // this.sumary_details.household_expenses = value.records.final_data[0].household_expenses; + // this.sumary_details.house_hold_expense_details = value.records.final_data[0].house_hold_expense_details !='' && value.records.final_data[0].house_hold_expense_details !=null ? value.records.final_data[0].house_hold_expense_details : 0; + // this.sumary_details.net_disable_income_value = Number(this.sumary_details.net_profit) - Number(this.sumary_details.household_expenses); + } + else if(value.records.final_data.length >0 && (value.records.final_data[0].sales_declared_by_customer && value.records.final_data[0].sales_declared_by_customer.purchases) || (value.records.final_data[0].sales_calculated_by_itemwise &&value.records.final_data[0].sales_calculated_by_itemwise.purchases)|| (value.records.final_data[0].sales_calculated_by_monthwise &&value.records.final_data[0].sales_calculated_by_monthwise.purchases)){ + let get_sumary: any=[]; + // set sales and revenue + get_sumary.push({"sno":'a. ',"label":'Sales Revenue ',"declared_by_customer":(value.records.final_data[0].sales_declared_by_customer && value.records.final_data[0].sales_declared_by_customer.sales_revenue) ? value.records.final_data[0].sales_declared_by_customer.sales_revenue:0, "derived_item_wise":(value.records.final_data[0].sales_calculated_by_itemwise && value.records.final_data[0].sales_calculated_by_itemwise.sales_revenue) ? value.records.final_data[0].sales_calculated_by_itemwise.sales_revenue:0 ,"derived_sales_book":(value.records.final_data[0].sales_calculated_by_monthwise && value.records.final_data[0].sales_calculated_by_monthwise.sales_revenue) ? value.records.final_data[0].sales_calculated_by_monthwise.sales_revenue:0 }); + //set purchase + get_sumary.push({"sno":'b. ',"label":'Purchases ',"declared_by_customer":(value.records.final_data[0].sales_declared_by_customer && value.records.final_data[0].sales_declared_by_customer.purchases) ? value.records.final_data[0].sales_declared_by_customer.purchases:0, "derived_item_wise":(value.records.final_data[0].sales_calculated_by_itemwise && value.records.final_data[0].sales_calculated_by_itemwise.purchases) ? value.records.final_data[0].sales_calculated_by_itemwise.purchases:0 ,"derived_sales_book":(value.records.final_data[0].sales_calculated_by_monthwise && value.records.final_data[0].sales_calculated_by_monthwise.purchases) ? value.records.final_data[0].sales_calculated_by_monthwise.purchases:0 }); + //set gross profit + get_sumary.push({"sno":'c. ',"label":'Gross Profit / Loss(a-b) ',"declared_by_customer":(value.records.final_data[0].sales_declared_by_customer && value.records.final_data[0].sales_declared_by_customer.grossprofit) ? value.records.final_data[0].sales_declared_by_customer.grossprofit:0, "derived_item_wise":(value.records.final_data[0].sales_calculated_by_itemwise && value.records.final_data[0].sales_calculated_by_itemwise.grossprofit) ? value.records.final_data[0].sales_calculated_by_itemwise.grossprofit:0 ,"derived_sales_book":(value.records.final_data[0].sales_calculated_by_monthwise && value.records.final_data[0].sales_calculated_by_monthwise.grossprofit) ? value.records.final_data[0].sales_calculated_by_monthwise.grossprofit:0 }); + // set business expense + get_sumary.push({"sno":'d. ',"label":'Business Expenses ',"declared_by_customer":(value.records.final_data[0].sales_declared_by_customer && value.records.final_data[0].sales_declared_by_customer.business_expenses) ? value.records.final_data[0].sales_declared_by_customer.business_expenses:0, "derived_item_wise":(value.records.final_data[0].sales_calculated_by_itemwise && value.records.final_data[0].sales_calculated_by_itemwise.business_expenses) ? value.records.final_data[0].sales_calculated_by_itemwise.business_expenses:0 ,"derived_sales_book":(value.records.final_data[0].sales_calculated_by_monthwise && value.records.final_data[0].sales_calculated_by_monthwise.business_expenses) ? value.records.final_data[0].sales_calculated_by_monthwise.business_expenses:0 }); + // set net profit / loss + get_sumary.push({"sno":'e. ',"label":'Net Profit / Loss(c-d) ',"declared_by_customer":(value.records.final_data[0].sales_declared_by_customer && value.records.final_data[0].sales_declared_by_customer.netprofit) ? value.records.final_data[0].sales_declared_by_customer.netprofit:0, "derived_item_wise":(value.records.final_data[0].sales_calculated_by_itemwise && value.records.final_data[0].sales_calculated_by_itemwise.netprofit) ? value.records.final_data[0].sales_calculated_by_itemwise.netprofit:0 ,"derived_sales_book":(value.records.final_data[0].sales_calculated_by_monthwise && value.records.final_data[0].sales_calculated_by_monthwise.netprofit) ? value.records.final_data[0].sales_calculated_by_monthwise.netprofit:0 }); + // set household expenses + get_sumary.push({"sno":'f. ',"label":'Household Expenses ',"declared_by_customer":(value.records.final_data[0].sales_declared_by_customer && value.records.final_data[0].sales_declared_by_customer.house_hold_expenses) ? value.records.final_data[0].sales_declared_by_customer.house_hold_expenses:0, "derived_item_wise":(value.records.final_data[0].sales_calculated_by_itemwise && value.records.final_data[0].sales_calculated_by_itemwise.house_hold_expenses) ? value.records.final_data[0].sales_calculated_by_itemwise.house_hold_expenses:0 ,"derived_sales_book":(value.records.final_data[0].sales_calculated_by_monthwise && value.records.final_data[0].sales_calculated_by_monthwise.house_hold_expenses) ? value.records.final_data[0].sales_calculated_by_monthwise.house_hold_expenses:0 }); + //set disposable income + get_sumary.push({"sno":'g. ',"label":'Disposable Income ',"declared_by_customer":(value.records.final_data[0].sales_declared_by_customer && value.records.final_data[0].sales_declared_by_customer.disposable_income) ? value.records.final_data[0].sales_declared_by_customer.disposable_income:0, "derived_item_wise":(value.records.final_data[0].sales_calculated_by_itemwise && value.records.final_data[0].sales_calculated_by_itemwise.disposable_income) ? value.records.final_data[0].sales_calculated_by_itemwise.disposable_income:0 ,"derived_sales_book":(value.records.final_data[0].sales_calculated_by_monthwise && value.records.final_data[0].sales_calculated_by_monthwise.disposable_income) ? value.records.final_data[0].sales_calculated_by_monthwise.disposable_income:0 }); + //set net margin + get_sumary.push({"sno":'h. ',"label":'Net Margin ',"declared_by_customer":(value.records.final_data[0].sales_declared_by_customer && value.records.final_data[0].sales_declared_by_customer.netmargin) ? value.records.final_data[0].sales_declared_by_customer.netmargin:0, "derived_item_wise":(value.records.final_data[0].sales_calculated_by_itemwise && value.records.final_data[0].sales_calculated_by_itemwise.netmargin) ? value.records.final_data[0].sales_calculated_by_itemwise.netmargin:0 ,"derived_sales_book":(value.records.final_data[0].sales_calculated_by_monthwise && value.records.final_data[0].sales_calculated_by_monthwise.netmargin) ? value.records.final_data[0].sales_calculated_by_monthwise.netmargin:0 }); + + // get conslidate sales / revenue details + (value.records.final_data[0].consolidated_report && value.records.final_data[0].sales_declared_by_customer!=null && value.records.final_data[0].sales_calculated_by_itemwise!=null && value.records.final_data[0].sales_calculated_by_monthwise!=null) ? get_sumary.push({"sno":'',"label":'Considered Sales / Revenue ',"declared_by_customer":value.records.final_data[0].consolidated_report.consolidated_sales_revenue, "derived_item_wise":'' ,"derived_sales_book":'' }) + : (value.records.final_data[0].consolidated_report &&value.records.final_data[0].sales_declared_by_customer!=null && value.records.final_data[0].sales_calculated_by_itemwise!=null && value.records.final_data[0].sales_calculated_by_monthwise==null) ? get_sumary.push({"sno":'',"label":'Considered Sales / Revenue ',"declared_by_customer":value.records.final_data[0].consolidated_report.consolidated_sales_revenue, "derived_item_wise":'' ,"derived_sales_book":'' }) + : (value.records.final_data[0].consolidated_report &&value.records.final_data[0].sales_declared_by_customer!=null && value.records.final_data[0].sales_calculated_by_itemwise==null && value.records.final_data[0].sales_calculated_by_monthwise!=null) ? get_sumary.push({"sno":'',"label":'Considered Sales / Revenue ',"declared_by_customer":value.records.final_data[0].consolidated_report.consolidated_sales_revenue, "derived_item_wise":'' ,"derived_sales_book":'' }) + : (value.records.final_data[0].consolidated_report &&value.records.final_data[0].sales_declared_by_customer==null && value.records.final_data[0].sales_calculated_by_itemwise!=null && value.records.final_data[0].sales_calculated_by_monthwise!=null) ? get_sumary.push({"sno":'',"label":'Considered Sales / Revenue ',"declared_by_customer":'', "derived_item_wise":value.records.final_data[0].consolidated_report.consolidated_sales_revenue ,"derived_sales_book":'' }) + : (value.records.final_data[0].consolidated_report &&value.records.final_data[0].sales_declared_by_customer!=null && value.records.final_data[0].sales_calculated_by_itemwise==null && value.records.final_data[0].sales_calculated_by_monthwise==null) ? get_sumary.push({"sno":'',"label":'Considered Sales / Revenue ',"declared_by_customer":value.records.final_data[0].consolidated_report.consolidated_sales_revenue, "derived_item_wise":'' ,"derived_sales_book":'' }) + : (value.records.final_data[0].consolidated_report &&value.records.final_data[0].sales_declared_by_customer==null && value.records.final_data[0].sales_calculated_by_itemwise!=null && value.records.final_data[0].sales_calculated_by_monthwise==null) ? get_sumary.push({"sno":'',"label":'Considered Sales / Revenue ',"declared_by_customer":'', "derived_item_wise":value.records.final_data[0].consolidated_report.consolidated_sales_revenue ,"derived_sales_book":'' }) + : (value.records.final_data[0].consolidated_report &&value.records.final_data[0].sales_declared_by_customer==null && value.records.final_data[0].sales_calculated_by_itemwise==null && value.records.final_data[0].sales_calculated_by_monthwise!=null) ? get_sumary.push({"sno":'',"label":'Considered Sales / Revenue ',"declared_by_customer":'', "derived_item_wise":'' ,"derived_sales_book":value.records.final_data[0].consolidated_report.consolidated_sales_revenue }) + :''; + // get conslidate net margin details + (value.records.final_data[0].consolidated_report && value.records.final_data[0].sales_declared_by_customer!=null && value.records.final_data[0].sales_calculated_by_itemwise!=null && value.records.final_data[0].sales_calculated_by_monthwise!=null) ? get_sumary.push({"sno":'',"label":'Considered Net Margin % ',"declared_by_customer":value.records.final_data[0].consolidated_report.consolidated_nermagin, "derived_item_wise":'' ,"derived_sales_book":'' }) + : (value.records.final_data[0].consolidated_report &&value.records.final_data[0].sales_declared_by_customer!=null && value.records.final_data[0].sales_calculated_by_itemwise!=null && value.records.final_data[0].sales_calculated_by_monthwise==null) ? get_sumary.push({"sno":'',"label":'Considered Net Margin % ',"declared_by_customer":value.records.final_data[0].consolidated_report.consolidated_nermagin, "derived_item_wise":'' ,"derived_sales_book":'' }) + : (value.records.final_data[0].consolidated_report &&value.records.final_data[0].sales_declared_by_customer!=null && value.records.final_data[0].sales_calculated_by_itemwise==null && value.records.final_data[0].sales_calculated_by_monthwise!=null) ? get_sumary.push({"sno":'',"label":'Considered Net Margin % ',"declared_by_customer":value.records.final_data[0].consolidated_report.consolidated_nermagin, "derived_item_wise":'' ,"derived_sales_book":'' }) + : (value.records.final_data[0].consolidated_report &&value.records.final_data[0].sales_declared_by_customer==null && value.records.final_data[0].sales_calculated_by_itemwise!=null && value.records.final_data[0].sales_calculated_by_monthwise!=null) ? get_sumary.push({"sno":'',"label":'Considered Net Margin % ',"declared_by_customer":'', "derived_item_wise":value.records.final_data[0].consolidated_report.consolidated_nermagin ,"derived_sales_book":'' }) + : (value.records.final_data[0].consolidated_report &&value.records.final_data[0].sales_declared_by_customer!=null && value.records.final_data[0].sales_calculated_by_itemwise==null && value.records.final_data[0].sales_calculated_by_monthwise==null) ? get_sumary.push({"sno":'',"label":'Considered Net Margin % ',"declared_by_customer":value.records.final_data[0].consolidated_report.consolidated_nermagin, "derived_item_wise":'' ,"derived_sales_book":'' }) + : (value.records.final_data[0].consolidated_report &&value.records.final_data[0].sales_declared_by_customer==null && value.records.final_data[0].sales_calculated_by_itemwise!=null && value.records.final_data[0].sales_calculated_by_monthwise==null) ? get_sumary.push({"sno":'',"label":'Considered Net Margin % ',"declared_by_customer":'', "derived_item_wise":value.records.final_data[0].consolidated_report.consolidated_nermagin ,"derived_sales_book":'' }) + : (value.records.final_data[0].consolidated_report &&value.records.final_data[0].sales_declared_by_customer==null && value.records.final_data[0].sales_calculated_by_itemwise==null && value.records.final_data[0].sales_calculated_by_monthwise!=null) ? get_sumary.push({"sno":'',"label":'Considered Net Margin % ',"declared_by_customer":'', "derived_item_wise":'' ,"derived_sales_book":value.records.final_data[0].consolidated_report.consolidated_nermagin }) + :''; + // get conslidate net profit details + (value.records.final_data[0].consolidated_report && value.records.final_data[0].sales_declared_by_customer!=null && value.records.final_data[0].sales_calculated_by_itemwise!=null && value.records.final_data[0].sales_calculated_by_monthwise!=null) ? get_sumary.push({"sno":'',"label":'Considered Net Profit ',"declared_by_customer":value.records.final_data[0].consolidated_report.consolidated_nerprofit, "derived_item_wise":'' ,"derived_sales_book":'' }) + : (value.records.final_data[0].consolidated_report &&value.records.final_data[0].sales_declared_by_customer!=null && value.records.final_data[0].sales_calculated_by_itemwise!=null && value.records.final_data[0].sales_calculated_by_monthwise==null) ? get_sumary.push({"sno":'',"label":'Considered Net Profit ',"declared_by_customer":value.records.final_data[0].consolidated_report.consolidated_nerprofit, "derived_item_wise":'' ,"derived_sales_book":'' }) + : (value.records.final_data[0].consolidated_report &&value.records.final_data[0].sales_declared_by_customer!=null && value.records.final_data[0].sales_calculated_by_itemwise==null && value.records.final_data[0].sales_calculated_by_monthwise!=null) ? get_sumary.push({"sno":'',"label":'Considered Net Profit ',"declared_by_customer":value.records.final_data[0].consolidated_report.consolidated_nerprofit, "derived_item_wise":'' ,"derived_sales_book":'' }) + : (value.records.final_data[0].consolidated_report &&value.records.final_data[0].sales_declared_by_customer==null && value.records.final_data[0].sales_calculated_by_itemwise!=null && value.records.final_data[0].sales_calculated_by_monthwise!=null) ? get_sumary.push({"sno":'',"label":'Considered Net Profit ',"declared_by_customer":'', "derived_item_wise":value.records.final_data[0].consolidated_report.consolidated_nerprofit ,"derived_sales_book":'' }) + : (value.records.final_data[0].consolidated_report &&value.records.final_data[0].sales_declared_by_customer!=null && value.records.final_data[0].sales_calculated_by_itemwise==null && value.records.final_data[0].sales_calculated_by_monthwise==null) ? get_sumary.push({"sno":'',"label":'Considered Net Profit ',"declared_by_customer":value.records.final_data[0].consolidated_report.consolidated_nerprofit, "derived_item_wise":'' ,"derived_sales_book":'' }) + : (value.records.final_data[0].consolidated_report &&value.records.final_data[0].sales_declared_by_customer==null && value.records.final_data[0].sales_calculated_by_itemwise!=null && value.records.final_data[0].sales_calculated_by_monthwise==null) ? get_sumary.push({"sno":'',"label":'Considered Net Profit ',"declared_by_customer":'', "derived_item_wise":value.records.final_data[0].consolidated_report.consolidated_nerprofit ,"derived_sales_book":'' }) + : (value.records.final_data[0].consolidated_report &&value.records.final_data[0].sales_declared_by_customer==null && value.records.final_data[0].sales_calculated_by_itemwise==null && value.records.final_data[0].sales_calculated_by_monthwise!=null) ? get_sumary.push({"sno":'',"label":'Considered Net Profit ',"declared_by_customer":'', "derived_item_wise":'' ,"derived_sales_book":value.records.final_data[0].consolidated_report.consolidated_nerprofit }) + :''; + this.summaryItemSource=get_sumary; + } } diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/sales-calculation/sales-calculation.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/sales-calculation/sales-calculation.component.html index 19c2839e9..2566a4a81 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/sales-calculation/sales-calculation.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/sales-calculation/sales-calculation.component.html @@ -3,7 +3,7 @@ Sales Calculation - {{activateMariginCalculation}} +