Sineedge/sparqsineedge
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ai Fixes

Browse Source
This commit is contained in:
gandhimathi 2019-02-08 19:01:51 +05:30
parent d7f6a4890d
commit 6baab0941e
2 changed files with 29 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.html
View File

@ -25,7 +25,7 @@
<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>
<p matLine> {{sumary_details.sales_revenue ? sumary_details.sales_revenue : 0}} </p>
</div>
</mat-list-item>
@ -34,7 +34,7 @@
<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>
<p matLine> {{subDetails.annual_sale_value ? subDetails.annual_sale_value : 0}} </p>
</div>
</mat-list-item>
@ -47,7 +47,7 @@
<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>
<p matLine> {{sumary_details.purchase ? sumary_details.purchase : 0}} </p>
</div>
</mat-list-item>
@ -56,7 +56,7 @@
<p matLine> {{subDetails.purchase_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_purchase_value !='' && subDetails.annual_purchase_value!=null ? subDetails.annual_purchase_value : '0'}} </p>
<p matLine> {{subDetails.annual_purchase_value ? subDetails.annual_purchase_value : 0}} </p>
</div>
</mat-list-item>
@ -68,7 +68,7 @@
<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>
<p matLine> {{sumary_details.gross_profit ? sumary_details.gross_profit : 0}} </p>
</div>
</mat-list-item>
@ -81,7 +81,7 @@
<p matLine> d) Other Income </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.other_business_income !='' && sumary_details.other_business_income !=null ? sumary_details.other_business_income : '0' }}</p>
<p matLine> {{sumary_details.other_business_income ? sumary_details.other_business_income : 0 }}</p>
</div>
</mat-list-item>
@ -90,7 +90,7 @@
<p matLine> {{subDetails.business_income_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_income_value !='' && subDetails.annual_income_value!=null ? subDetails.annual_income_value : '0'}} </p>
<p matLine> {{subDetails.annual_income_value ? subDetails.annual_income_value : 0}} </p>
</div>
</mat-list-item>
@ -102,7 +102,7 @@
<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>
<p matLine> {{sumary_details.business_expense ? sumary_details.business_expense : 0}} </p>
</div>
</mat-list-item>
@ -111,7 +111,7 @@
<p matLine> {{subDetails.expense_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_expenses_value !='' && subDetails.annual_expenses_value!=null ? subDetails.annual_expenses_value : '0'}} </p>
<p matLine> {{subDetails.annual_expenses_value ? subDetails.annual_expenses_value : 0}} </p>
</div>
</mat-list-item>
@ -124,7 +124,7 @@
</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>
<p matLine> {{sumary_details.net_profit ? sumary_details.net_profit : 0}} </p>
</div>
</mat-list-item>
@ -138,7 +138,7 @@
</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.household_expenses}} </p>
<p matLine> {{sumary_details.household_expenses ? sumary_details.household_expenses : 0}} </p>
</div>
</mat-list-item>
@ -147,7 +147,7 @@
<p matLine> {{subDetails.expense_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_expense_value !='' && subDetails.annual_expense_value!=null ? subDetails.annual_expense_value : '0'}} </p>
<p matLine> {{subDetails.annual_expense_value ? subDetails.annual_expense_value : 0}} </p>
</div>
</mat-list-item>
@ -161,7 +161,7 @@
</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>
<p matLine> {{sumary_details.net_disable_income_value ? sumary_details.net_disable_income_value : 0}} </p>
</div>
</mat-list-item>

34
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.ts
View File

@ -25,8 +25,9 @@ export class AssessedIncomeComponent implements OnInit {
// @Input() form_id: number;
pdid: number;
form_id: 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};
emptyArray: any=[];
sumary_details: {[k: string]: any} = {};
// sumary_details:any={"sales_revenue":0,"sales_revenue_details":[],"purchase":0,"purchase_details":[],"gross_profit":0,"other_business_income":0,"other_business_income_details":[]
public salesCaluatedItem:any= [];
public salesItemMonthWise:any= [];
public purchaseDetails:any= [];
@ -34,7 +35,6 @@ export class AssessedIncomeComponent implements OnInit {
public houseHoldExpenses:any= [];
public otherBusinessIncome: any=[];
// Sales Item MonthWise declare table header,body andd footer elements
salesMonthWiseTable:any=[];
salesItemMonthWiseBody: any[];
@ -148,21 +148,19 @@ public viewerOptions: any = {
}
if(value.records.final_data.length >0){
// this.finalData = value.records.final_data[0];
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);
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);
}
}