assessed income sumary changes
This commit is contained in:
gandhimathi
parent
a290a07617
commit
bafcea1556
@ -17,87 +17,155 @@
|
||||
<ng-template matTabContent>
|
||||
<mat-card>
|
||||
<mat-card-content>
|
||||
<mat-nav-list>
|
||||
<!-- this is for sales revenue -->
|
||||
<mat-nav-list>
|
||||
<mat-list-item (click)='matgroup.selectedIndex = 1'>
|
||||
<div fxFlex.xs="70" fxFlex.sm="70" fxFlex.md="60" fxFlex.lg="60" fxFlex.xl="60">
|
||||
<p matLine> a) Cost of Goods Sold </p>
|
||||
</div>
|
||||
<div fxFlex.xs="30" fxFlex.sm="30" fxFlex.md="40" fxFlex.lg="40" fxFlex.xl="40" class="mat_list_center_div">
|
||||
<p matLine> {{sumary_details.sales_revenue !='' && sumary_details.sales_revenue!=null ? sumary_details.sales_revenue : '0'}} </p>
|
||||
</div>
|
||||
|
||||
<mat-list-item (click)='matgroup.selectedIndex = 1'>
|
||||
<div fxFlex.xs="70" fxFlex.sm="70" fxFlex.md="50" fxFlex.lg="40" fxFlex.xl="40">
|
||||
<p matLine> a) Cost of Goods Sold </p>
|
||||
</mat-list-item>
|
||||
<mat-list-item *ngFor="let subDetails of sumary_details.sales_revenue_details">
|
||||
<div fxFlex.xs="70" fxFlex.sm="70" fxFlex.md="60" fxFlex.lg="60" fxFlex.xl="60" class="sub_item">
|
||||
<p matLine> {{subDetails.sales_item}} </p>
|
||||
</div>
|
||||
<div fxFlex.xs="30" fxFlex.sm="30" fxFlex.md="40" fxFlex.lg="40" fxFlex.xl="40" class="mat_list_center_div">
|
||||
<p matLine> {{subDetails.annual_sale_value !='' && subDetails.annual_sale_value!=null ? subDetails.annual_sale_value : '0'}} </p>
|
||||
</div>
|
||||
|
||||
</mat-list-item>
|
||||
</mat-nav-list>
|
||||
|
||||
<!-- this is for purchase -->
|
||||
<mat-nav-list>
|
||||
<mat-list-item (click)='matgroup.selectedIndex = 2'>
|
||||
<div fxFlex.xs="70" fxFlex.sm="70" fxFlex.md="60" fxFlex.lg="60" fxFlex.xl="60">
|
||||
<p matLine> b) Purchases </p>
|
||||
</div>
|
||||
<div fxFlex.xs="30" fxFlex.sm="30" fxFlex.md="40" fxFlex.lg="40" fxFlex.xl="40" class="mat_list_center_div">
|
||||
<p matLine> {{sumary_details.purchase !='' && sumary_details.purchase!=null ? sumary_details.purchase : '0'}} </p>
|
||||
</div>
|
||||
|
||||
</mat-list-item>
|
||||
<mat-list-item *ngFor="let subDetails of sumary_details.purchase_details">
|
||||
<div fxFlex.xs="70" fxFlex.sm="70" fxFlex.md="60" fxFlex.lg="60" fxFlex.xl="60" class="sub_item">
|
||||
<p matLine> {{subDetails.purchase_item}} </p>
|
||||
</div>
|
||||
<div fxFlex.xs="30" fxFlex.sm="30" fxFlex.md="20" fxFlex.lg="25" fxFlex.xl="25" class="mat_list_center_div">
|
||||
<p matLine> {{sales_value}} </p>
|
||||
<div fxFlex.xs="30" fxFlex.sm="30" fxFlex.md="40" fxFlex.lg="40" fxFlex.xl="40" class="mat_list_center_div">
|
||||
<p matLine> {{subDetails.annual_purchase_value !='' && subDetails.annual_purchase_value!=null ? subDetails.annual_purchase_value : '0'}} </p>
|
||||
</div>
|
||||
|
||||
</mat-list-item>
|
||||
<mat-list-item (click)='matgroup.selectedIndex = 2'>
|
||||
<div fxFlex.xs="70" fxFlex.sm="70" fxFlex.md="50" fxFlex.lg="40" fxFlex.xl="40">
|
||||
<p matLine> b) Purchases </p>
|
||||
</mat-nav-list>
|
||||
<!-- gross profit -->
|
||||
<mat-nav-list>
|
||||
<mat-list-item>
|
||||
<div fxFlex.xs="70" fxFlex.sm="70" fxFlex.md="60" fxFlex.lg="60" fxFlex.xl="60">
|
||||
<p matLine> c) Gross Profit (a-b) </p>
|
||||
</div>
|
||||
<div fxFlex.xs="30" fxFlex.sm="30" fxFlex.md="40" fxFlex.lg="40" fxFlex.xl="40" class="mat_list_center_div">
|
||||
<p matLine> {{sumary_details.gross_profit}} </p>
|
||||
</div>
|
||||
|
||||
</mat-list-item>
|
||||
</mat-nav-list>
|
||||
|
||||
<!-- other income -->
|
||||
<mat-nav-list>
|
||||
<mat-list-item (click)='matgroup.selectedIndex = 5'>
|
||||
<div fxFlex.xs="70" fxFlex.sm="70" fxFlex.md="60" fxFlex.lg="60" fxFlex.xl="60">
|
||||
<p matLine> d) Other Income </p>
|
||||
</div>
|
||||
<div fxFlex.xs="30" fxFlex.sm="30" fxFlex.md="20" fxFlex.lg="25" fxFlex.xl="25" class="mat_list_center_div">
|
||||
<p matLine> {{purchase_value}} </p>
|
||||
<div fxFlex.xs="30" fxFlex.sm="30" fxFlex.md="40" fxFlex.lg="40" fxFlex.xl="40" class="mat_list_center_div">
|
||||
<p matLine> {{sumary_details.other_business_income !='' && sumary_details.other_business_income !=null ? sumary_details.other_business_income : '0' }}</p>
|
||||
</div>
|
||||
|
||||
</mat-list-item>
|
||||
<mat-list-item>
|
||||
<div fxFlex.xs="70" fxFlex.sm="70" fxFlex.md="50" fxFlex.lg="40" fxFlex.xl="40">
|
||||
<p matLine> c) Gross Profit (a-b) </p>
|
||||
<mat-list-item *ngFor="let subDetails of sumary_details.other_business_income_details">
|
||||
<div fxFlex.xs="70" fxFlex.sm="70" fxFlex.md="60" fxFlex.lg="60" fxFlex.xl="60" class="sub_item">
|
||||
<p matLine> {{subDetails.business_income_item}} </p>
|
||||
</div>
|
||||
<div fxFlex.xs="30" fxFlex.sm="30" fxFlex.md="20" fxFlex.lg="25" fxFlex.xl="25" class="mat_list_center_div">
|
||||
<p matLine> {{gross_profit_value}} </p>
|
||||
<div fxFlex.xs="30" fxFlex.sm="30" fxFlex.md="40" fxFlex.lg="40" fxFlex.xl="40" class="mat_list_center_div">
|
||||
<p matLine> {{subDetails.annual_income_value !='' && subDetails.annual_income_value!=null ? subDetails.annual_income_value : '0'}} </p>
|
||||
</div>
|
||||
|
||||
</mat-list-item>
|
||||
<mat-list-item (click)='matgroup.selectedIndex = 5'>
|
||||
<div fxFlex.xs="70" fxFlex.sm="70" fxFlex.md="50" fxFlex.lg="40" fxFlex.xl="40">
|
||||
<p matLine> d) Other Income </p>
|
||||
</mat-nav-list>
|
||||
<!-- this is expense -->
|
||||
<mat-nav-list>
|
||||
<mat-list-item (click)='matgroup.selectedIndex = 3'>
|
||||
<div fxFlex.xs="70" fxFlex.sm="70" fxFlex.md="60" fxFlex.lg="60" fxFlex.xl="60">
|
||||
<p matLine> e) Other Expenses </p>
|
||||
</div>
|
||||
<div fxFlex.xs="30" fxFlex.sm="30" fxFlex.md="40" fxFlex.lg="40" fxFlex.xl="40" class="mat_list_center_div">
|
||||
<p matLine> {{sumary_details.business_expense !='' && sumary_details.business_expense !=null ? sumary_details.business_expense : '0'}} </p>
|
||||
</div>
|
||||
|
||||
</mat-list-item>
|
||||
<mat-list-item *ngFor="let subDetails of sumary_details.business_expense_details">
|
||||
<div fxFlex.xs="70" fxFlex.sm="70" fxFlex.md="60" fxFlex.lg="60" fxFlex.xl="60" class="sub_item">
|
||||
<p matLine> {{subDetails.expense_item}} </p>
|
||||
</div>
|
||||
<div fxFlex.xs="30" fxFlex.sm="30" fxFlex.md="20" fxFlex.lg="25" fxFlex.xl="25" class="mat_list_center_div">
|
||||
<p matLine> {{other_income_value}}</p>
|
||||
<div fxFlex.xs="30" fxFlex.sm="30" fxFlex.md="40" fxFlex.lg="40" fxFlex.xl="40" class="mat_list_center_div">
|
||||
<p matLine> {{subDetails.annual_expenses_value !='' && subDetails.annual_expenses_value!=null ? subDetails.annual_expenses_value : '0'}} </p>
|
||||
</div>
|
||||
|
||||
</mat-list-item>
|
||||
<mat-list-item (click)='matgroup.selectedIndex = 3'>
|
||||
<div fxFlex.xs="70" fxFlex.sm="70" fxFlex.md="50" fxFlex.lg="40" fxFlex.xl="40">
|
||||
<p matLine> e) Other Expenses </p>
|
||||
</mat-nav-list>
|
||||
<!-- this is for net profit -->
|
||||
<mat-nav-list>
|
||||
<mat-list-item>
|
||||
<div fxFlex.xs="70" fxFlex.sm="70" fxFlex.md="60" fxFlex.lg="60" fxFlex.xl="60">
|
||||
<p matLine> f) Net Profit (c+d-e) </p>
|
||||
|
||||
</div>
|
||||
<div fxFlex.xs="30" fxFlex.sm="30" fxFlex.md="40" fxFlex.lg="40" fxFlex.xl="40" class="mat_list_center_div">
|
||||
<p matLine> {{sumary_details.net_profit_value!='' && sumary_details.net_profit_value!=null ? sumary_details.net_profit_value : '0'}} </p>
|
||||
</div>
|
||||
|
||||
</mat-list-item>
|
||||
</mat-nav-list>
|
||||
|
||||
<!-- house hold -->
|
||||
<mat-nav-list>
|
||||
<mat-list-item (click)='matgroup.selectedIndex = 4'>
|
||||
<div fxFlex.xs="70" fxFlex.sm="70" fxFlex.md="60" fxFlex.lg="60" fxFlex.xl="60">
|
||||
<p matLine> g) Household Expenses </p>
|
||||
|
||||
</div>
|
||||
<div fxFlex.xs="30" fxFlex.sm="30" fxFlex.md="20" fxFlex.lg="25" fxFlex.xl="25" class="mat_list_center_div">
|
||||
<p matLine> {{other_expense_value}} </p>
|
||||
<div fxFlex.xs="30" fxFlex.sm="30" fxFlex.md="40" fxFlex.lg="40" fxFlex.xl="40" class="mat_list_center_div">
|
||||
<p matLine> {{sumary_details.household_expenses}} </p>
|
||||
</div>
|
||||
|
||||
</mat-list-item>
|
||||
<mat-list-item>
|
||||
<div fxFlex.xs="70" fxFlex.sm="70" fxFlex.md="50" fxFlex.lg="40" fxFlex.xl="40">
|
||||
<p matLine> f) Net Profit (c+d-e) </p>
|
||||
|
||||
<mat-list-item *ngFor="let subDetails of sumary_details.house_hold_expense_details">
|
||||
<div fxFlex.xs="70" fxFlex.sm="70" fxFlex.md="60" fxFlex.lg="60" fxFlex.xl="60" class="sub_item">
|
||||
<p matLine> {{subDetails.expense_item}} </p>
|
||||
</div>
|
||||
<div fxFlex.xs="30" fxFlex.sm="30" fxFlex.md="20" fxFlex.lg="25" fxFlex.xl="25" class="mat_list_center_div">
|
||||
<p matLine> {{net_profit_value}} </p>
|
||||
<div fxFlex.xs="30" fxFlex.sm="30" fxFlex.md="40" fxFlex.lg="40" fxFlex.xl="40" class="mat_list_center_div">
|
||||
<p matLine> {{subDetails.annual_expense_value !='' && subDetails.annual_expense_value!=null ? subDetails.annual_expense_value : '0'}} </p>
|
||||
</div>
|
||||
|
||||
</mat-list-item>
|
||||
<mat-list-item (click)='matgroup.selectedIndex = 4'>
|
||||
<div fxFlex.xs="70" fxFlex.sm="70" fxFlex.md="50" fxFlex.lg="40" fxFlex.xl="40">
|
||||
<p matLine> g) Household Expenses </p>
|
||||
|
||||
</div>
|
||||
<div fxFlex.xs="30" fxFlex.sm="30" fxFlex.md="20" fxFlex.lg="25" fxFlex.xl="25" class="mat_list_center_div">
|
||||
<p matLine> {{house_hold_value}} </p>
|
||||
</div>
|
||||
|
||||
</mat-list-item>
|
||||
<mat-list-item>
|
||||
<div fxFlex.xs="70" fxFlex.sm="70" fxFlex.md="50" fxFlex.lg="40" fxFlex.xl="40">
|
||||
<p matLine> h) Net Disposable Income (f-g) </p>
|
||||
</mat-nav-list>
|
||||
<!-- disposal value -->
|
||||
<mat-nav-list>
|
||||
<mat-list-item>
|
||||
<div fxFlex.xs="70" fxFlex.sm="70" fxFlex.md="60" fxFlex.lg="60" fxFlex.xl="60" class="sub_item">
|
||||
<p matLine> h) Net Disposable Income (f-g) </p>
|
||||
|
||||
|
||||
</div>
|
||||
<div fxFlex.xs="30" fxFlex.sm="30" fxFlex.md="20" fxFlex.lg="25" fxFlex.xl="25" class="mat_list_center_div">
|
||||
<p matLine> {{net_disable_income_value}} </p>
|
||||
</div>
|
||||
</div>
|
||||
<div fxFlex.xs="30" fxFlex.sm="30" fxFlex.md="40" fxFlex.lg="40" fxFlex.xl="40" class="mat_list_center_div">
|
||||
<p matLine> {{sumary_details.net_disable_income_value !='' && sumary_details.net_disable_income_value !=null ? sumary_details.net_disable_income_value : 0}} </p>
|
||||
</div>
|
||||
|
||||
</mat-list-item>
|
||||
</mat-list-item>
|
||||
</mat-nav-list>
|
||||
|
||||
|
||||
</mat-nav-list>
|
||||
</mat-card-content>
|
||||
</mat-card>
|
||||
|
||||
|
||||
@ -120,20 +120,34 @@
|
||||
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: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{
|
||||
margin-left: 35% !important;
|
||||
}
|
||||
p{
|
||||
font-size: 1rem !important;
|
||||
}
|
||||
|
||||
}
|
||||
mat-list-item:first-child {
|
||||
background-color: papayawhip;
|
||||
}
|
||||
|
||||
.mat_list_right_div {
|
||||
text-align: left;
|
||||
}
|
||||
.mat_list_center_div {
|
||||
text-align: center;
|
||||
text-align: right;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -21,15 +21,8 @@ export class AssessedIncomeComponent implements OnInit {
|
||||
// @Input() form_id: number;
|
||||
pdid: number;
|
||||
form_id: number;
|
||||
displayedColumns = ['sno','list','amount'];
|
||||
sales_value: number;
|
||||
purchase_value: number;
|
||||
gross_profit_value: number;
|
||||
other_income_value: number;
|
||||
other_expense_value: number;
|
||||
net_profit_value: number;
|
||||
house_hold_value: number;
|
||||
net_disable_income_value: number;
|
||||
sumary_details:any={"sales_revenue":0,"sales_revenue_details":[],"purchase":0,"purchase_details":[],"gross_profit":0,"other_business_income":0,"other_business_income_details":[]
|
||||
,"business_expense":0,"business_expense_details":[],"net_profit_value":0,"household_expenses":0,"house_hold_expense_details":[],"net_disable_income_value":0};
|
||||
public salesCaluatedItem:any= [];
|
||||
public salesItemMonthWise:any= [];
|
||||
public purchaseDetails:any= [];
|
||||
@ -65,14 +58,6 @@ public getCustomValues:any = { UOMList: this.UOMList,frequencyList: this.frequen
|
||||
this.getAIMaster('BUSINESSEXPENSES',3);
|
||||
this.getAIMaster('BUSINESSINCOME',4);
|
||||
this.getCustomValues.pdid = this.pd_all_details.pdmaster_details.pd_id;
|
||||
this.sales_value=0;
|
||||
this.purchase_value=0;
|
||||
this.gross_profit_value=0;
|
||||
this.other_income_value=0;
|
||||
this.other_expense_value=0;
|
||||
this.net_profit_value=0;
|
||||
this.house_hold_value=0;
|
||||
this.net_disable_income_value=0;
|
||||
|
||||
}
|
||||
public viewerOptions: any = {
|
||||
@ -117,35 +102,6 @@ public viewerOptions: any = {
|
||||
}
|
||||
if(value.records.sales_items_by_monthwise){
|
||||
this.salesItemMonthWise = value.records.sales_items_by_monthwise;
|
||||
// hide table format start
|
||||
|
||||
// this.salesItemMonthWise.forEach((itemElement, itemIndex) => {
|
||||
// this.salesItemMonthWiseBody= Object.keys(itemElement.items).map(key => ({ header:key, value: itemElement.items[key] }));
|
||||
// let combineTableColumn = Object.keys(itemElement.items).map(key => (itemElement.items[key]));
|
||||
// let sumItems: any=[];
|
||||
// combineTableColumn.forEach((sumValue, sumIndex) => {
|
||||
// let calculateItems = sumValue.reduce((acc, calculate) => acc + Number(calculate.sales_value), 0);
|
||||
// sumItems.push({bodyElement:sumValue, bodyElementTotal:calculateItems});
|
||||
// })
|
||||
// let calculateAllItemsTotal:number=sumItems.reduce((racc, rcalculate) => racc + Number(rcalculate.bodyElementTotal), 0);
|
||||
// let convertYear : number = 12 / sumItems.length;
|
||||
// let tableFooterMessage: any=[];
|
||||
// tableFooterMessage.push({
|
||||
// message: sumItems.length + ' Months ' + itemElement.sales_item + ' Sales ',
|
||||
// value:calculateAllItemsTotal,
|
||||
// cols_span_length:sumItems.length * 2 -1,
|
||||
// })
|
||||
// tableFooterMessage.push({
|
||||
// message: ' Yearly ' + itemElement.sales_item + ' Sales Arrived',
|
||||
// value: calculateAllItemsTotal * convertYear,
|
||||
// cols_span_length:sumItems.length * 2 -1 ,
|
||||
// })
|
||||
// this.salesMonthWiseTable.push({salesItem:itemElement.sales_item,headerElement:this.salesItemMonthWiseBody, bodyElements:sumItems, parentTableFooter:tableFooterMessage});
|
||||
// //console.log(this.salesMonthWiseTable)
|
||||
// });
|
||||
// hide table format end
|
||||
|
||||
|
||||
this.salesItemMonthWise.forEach((itemElement, itemIndex) => {
|
||||
let expandBodyContent= Object.keys(itemElement.items).map(key => ({ header:key, value: itemElement.items[key] }));
|
||||
let listItems: any=[];
|
||||
@ -185,26 +141,26 @@ public viewerOptions: any = {
|
||||
|
||||
if(value.records.final_data.length >0){
|
||||
// this.finalData = value.records.final_data[0];
|
||||
|
||||
this.sales_value = value.records.final_data[0].income.sales_revenue !='' && value.records.final_data[0].income.sales_revenue !=null ? value.records.final_data[0].income.sales_revenue : 0;
|
||||
this.purchase_value = value.records.final_data[0].expense.purchase !='' && value.records.final_data[0].expense.purchase !=null ? value.records.final_data[0].expense.purchase : 0;
|
||||
this.gross_profit_value = value.records.final_data[0].gross_profit !='' && value.records.final_data[0].gross_profit !=null ? value.records.final_data[0].gross_profit : 0;
|
||||
this.other_income_value = value.records.final_data[0].income.other_business_income !='' && value.records.final_data[0].income.other_business_income !=null ? value.records.final_data[0].income.other_business_income : 0;
|
||||
this.other_expense_value = value.records.final_data[0].expense.business_expense !='' && value.records.final_data[0].expense.business_expense !=null ? value.records.final_data[0].expense.business_expense : 0;
|
||||
this.net_profit_value = value.records.final_data[0].expense.net_profit !='' && value.records.final_data[0].expense.net_profit !=null ? value.records.final_data[0].expense.net_profit : 0;
|
||||
this.house_hold_value = 0;
|
||||
this.net_disable_income_value = this.net_profit_value-this.house_hold_value;
|
||||
this.sumary_details = value.records.final_data[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"] = value.records.final_data[0].net_profit_value !='' && value.records.final_data[0].net_profit_value!=null ? value.records.final_data[0].net_profit_value : 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_value) - Number(this.sumary_details.household_expenses);
|
||||
}
|
||||
}
|
||||
|
||||
})
|
||||
}
|
||||
|
||||
// get total cost
|
||||
getTotalCost(getItems:any) {
|
||||
return getItems.map(t => t.sales_value).reduce((acc, value) => acc + Number(value), 0);
|
||||
}
|
||||
|
||||
// get common drop down list
|
||||
getAIMaster(table:string, type:Number):void {
|
||||
this._pd.getAllMasterDatas(table).subscribe(
|
||||
|
||||
Loading…
Reference in New Issue
Block a user