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 bf89d1114..1c4500bf1 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
@@ -25,7 +25,7 @@
a) Cost of Goods Sold
-
{{sumary_details.sales_revenue !='' && sumary_details.sales_revenue!=null ? sumary_details.sales_revenue : '0'}}
+
{{sumary_details.sales_revenue ? sumary_details.sales_revenue : 0}}
@@ -34,7 +34,7 @@
{{subDetails.sales_item}}
-
{{subDetails.annual_sale_value !='' && subDetails.annual_sale_value!=null ? subDetails.annual_sale_value : '0'}}
+
{{subDetails.annual_sale_value ? subDetails.annual_sale_value : 0}}
@@ -47,7 +47,7 @@
b) Purchases
-
{{sumary_details.purchase !='' && sumary_details.purchase!=null ? sumary_details.purchase : '0'}}
+
{{sumary_details.purchase ? sumary_details.purchase : 0}}
@@ -56,7 +56,7 @@
{{subDetails.purchase_item}}
-
{{subDetails.annual_purchase_value !='' && subDetails.annual_purchase_value!=null ? subDetails.annual_purchase_value : '0'}}
+
{{subDetails.annual_purchase_value ? subDetails.annual_purchase_value : 0}}
@@ -68,7 +68,7 @@
c) Gross Profit (a-b)
-
{{sumary_details.gross_profit}}
+
{{sumary_details.gross_profit ? sumary_details.gross_profit : 0}}
@@ -81,7 +81,7 @@
d) Other Income
-
{{sumary_details.other_business_income !='' && sumary_details.other_business_income !=null ? sumary_details.other_business_income : '0' }}
+
{{sumary_details.other_business_income ? sumary_details.other_business_income : 0 }}
@@ -90,7 +90,7 @@
{{subDetails.business_income_item}}
-
{{subDetails.annual_income_value !='' && subDetails.annual_income_value!=null ? subDetails.annual_income_value : '0'}}
+
{{subDetails.annual_income_value ? subDetails.annual_income_value : 0}}
@@ -102,7 +102,7 @@
e) Other Expenses
-
{{sumary_details.business_expense !='' && sumary_details.business_expense !=null ? sumary_details.business_expense : '0'}}
+
{{sumary_details.business_expense ? sumary_details.business_expense : 0}}
@@ -111,7 +111,7 @@
{{subDetails.expense_item}}
-
{{subDetails.annual_expenses_value !='' && subDetails.annual_expenses_value!=null ? subDetails.annual_expenses_value : '0'}}
+
{{subDetails.annual_expenses_value ? subDetails.annual_expenses_value : 0}}
@@ -124,7 +124,7 @@
-
{{sumary_details.net_profit_value!='' && sumary_details.net_profit_value!=null ? sumary_details.net_profit_value : '0'}}
+
{{sumary_details.net_profit ? sumary_details.net_profit : 0}}
@@ -138,7 +138,7 @@
-
{{sumary_details.household_expenses}}
+
{{sumary_details.household_expenses ? sumary_details.household_expenses : 0}}
@@ -147,7 +147,7 @@
{{subDetails.expense_item}}
-
{{subDetails.annual_expense_value !='' && subDetails.annual_expense_value!=null ? subDetails.annual_expense_value : '0'}}
+
{{subDetails.annual_expense_value ? subDetails.annual_expense_value : 0}}
@@ -161,7 +161,7 @@
-
{{sumary_details.net_disable_income_value !='' && sumary_details.net_disable_income_value !=null ? sumary_details.net_disable_income_value : 0}}
+
{{sumary_details.net_disable_income_value ? sumary_details.net_disable_income_value : 0}}
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 1659b3031..a3287574f 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
@@ -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);
}
}