From f01a97005af261706b30ee0da09797399afd62d5 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Mon, 11 Feb 2019 15:08:53 +0530 Subject: [PATCH] AI Total fileds changes --- .../business-expense-details.component.html | 13 +++++++++- .../business-expense-details.component.scss | 4 +++ .../business-expense-details.component.ts | 6 +++++ .../house-hold-details.component.html | 14 +++++++++- .../house-hold-details.component.scss | 4 +++ .../house-hold-details.component.ts | 5 ++++ ...her-business-income-details.component.html | 14 +++++++++- ...her-business-income-details.component.scss | 4 +++ ...other-business-income-details.component.ts | 5 ++++ .../purchase-details.component.html | 18 ++++++++++++- .../purchase-details.component.scss | 4 +++ .../purchase-details.component.ts | 4 +++ .../sales-details.component.html | 26 +++++++++++++++++-- .../sales-details.component.scss | 7 ++++- .../sales-details/sales-details.component.ts | 9 ++++++- 15 files changed, 129 insertions(+), 8 deletions(-) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/business-expense-details/business-expense-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/business-expense-details/business-expense-details.component.html index 4aa869563..4aa9df820 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/business-expense-details/business-expense-details.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/business-expense-details/business-expense-details.component.html @@ -11,27 +11,35 @@ -
+
+ + + + + + + + @@ -43,10 +51,13 @@ delete + + +
Buiness Expense {{element.expense_item}} Total of Expense Amount (Rs) {{element.expense_value}} Frequency {{element.frequency_name}} Annual Expenses {{element.annual_expenses_value}} {{getTotalCost(businessItemSource.data)}}
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/business-expense-details/business-expense-details.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/business-expense-details/business-expense-details.component.scss index a464130a1..9f9eb0eeb 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/business-expense-details/business-expense-details.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/business-expense-details/business-expense-details.component.scss @@ -27,4 +27,8 @@ .mat-table-sticky:last-child { border-left: 1px solid #e0e0e0; + } + .mat-footer-cell { + font-weight: bold; + font-size: 1.2rem !important; } \ No newline at end of file diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/business-expense-details/business-expense-details.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/business-expense-details/business-expense-details.component.ts index 6b54e794f..63ac287a3 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/business-expense-details/business-expense-details.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/business-expense-details/business-expense-details.component.ts @@ -78,7 +78,13 @@ removeExpenseItem(value: any) : void{ }, error => { this.notifier.notify('warning', 'Something Wents Wrong Try Again.!'); }); + } +// sum all annual expense values +getTotalCost(getItems:any) { + return getItems.map(t => t.annual_expenses_value).reduce((acc, value) => acc + Number(value), 0); +} + // detect chnges from parent ngOnChanges(changes: SimpleChanges) { diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/house-hold-details/house-hold-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/house-hold-details/house-hold-details.component.html index 031f03552..e1986a043 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/house-hold-details/house-hold-details.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/house-hold-details/house-hold-details.component.html @@ -11,27 +11,35 @@
-
+
+ + + + + + + + @@ -43,10 +51,14 @@ delete + + + +
Expense Particulars {{element.expense_item}} Total of Expenses Amount (Rs) {{element.expense_value}} Frequency {{element.frequency_name}} Annual Expenses {{element.annual_expense_value}} {{getTotalCost(houseItemSource.data)}}
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/house-hold-details/house-hold-details.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/house-hold-details/house-hold-details.component.scss index a464130a1..9f9eb0eeb 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/house-hold-details/house-hold-details.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/house-hold-details/house-hold-details.component.scss @@ -27,4 +27,8 @@ .mat-table-sticky:last-child { border-left: 1px solid #e0e0e0; + } + .mat-footer-cell { + font-weight: bold; + font-size: 1.2rem !important; } \ No newline at end of file diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/house-hold-details/house-hold-details.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/house-hold-details/house-hold-details.component.ts index 1a168c080..b1e87eaaa 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/house-hold-details/house-hold-details.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/house-hold-details/house-hold-details.component.ts @@ -81,6 +81,11 @@ removeHouseItem(value: any) : void{ }); } +// sum all house hold values +getTotalCost(getItems:any) { + return getItems.map(t => t.annual_expense_value).reduce((acc, value) => acc + Number(value), 0); +} + // detect chnges from parent ngOnChanges(changes: SimpleChanges) { diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/other-business-income-details/other-business-income-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/other-business-income-details/other-business-income-details.component.html index 49e26601d..245e549e7 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/other-business-income-details/other-business-income-details.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/other-business-income-details/other-business-income-details.component.html @@ -11,27 +11,35 @@
-
+
+ + + + + + + + @@ -43,10 +51,14 @@ delete + + + +
Buiness Income {{element.business_income_item}} Total of Income Amount (Rs) {{element.income_value}} Frequency {{element.frequency_name}} Annual Income {{element.annual_income_value}} {{getTotalCost(businessIncomeItemSource.data)}}
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/other-business-income-details/other-business-income-details.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/other-business-income-details/other-business-income-details.component.scss index a464130a1..9f9eb0eeb 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/other-business-income-details/other-business-income-details.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/other-business-income-details/other-business-income-details.component.scss @@ -27,4 +27,8 @@ .mat-table-sticky:last-child { border-left: 1px solid #e0e0e0; + } + .mat-footer-cell { + font-weight: bold; + font-size: 1.2rem !important; } \ No newline at end of file diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/other-business-income-details/other-business-income-details.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/other-business-income-details/other-business-income-details.component.ts index f7dd09c2a..3c19d5936 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/other-business-income-details/other-business-income-details.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/other-business-income-details/other-business-income-details.component.ts @@ -79,6 +79,11 @@ removeIncomeItem(value: any) : void{ }); } +// sum all annual income values +getTotalCost(getItems:any) { + return getItems.map(t => t.annual_income_value).reduce((acc, value) => acc + Number(value), 0); +} + // detect chnges from parent ngOnChanges(changes: SimpleChanges) { this.businessIncomeItemSource.data = changes.parentData.currentValue; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/purchase-details/purchase-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/purchase-details/purchase-details.component.html index 766e42c2d..ec327a7ba 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/purchase-details/purchase-details.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/purchase-details/purchase-details.component.html @@ -11,38 +11,50 @@
-
+
+ + + + + + + + + + + + @@ -54,10 +66,14 @@ delete + + + +
Raw Material/Trading Item {{element.purchase_item}} Total of Purchase Purchase Quantity {{element.purchase_qty}} UOM {{element.uom_name}} Rate/Unit of Purchase {{element.rate_per_unit}} Frequency {{element.frequency_name}} Annual Purchase {{element.annual_purchase_value}} {{getTotalCost(purchaseItemSource.data)}}
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/purchase-details/purchase-details.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/purchase-details/purchase-details.component.scss index a464130a1..9f9eb0eeb 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/purchase-details/purchase-details.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/purchase-details/purchase-details.component.scss @@ -27,4 +27,8 @@ .mat-table-sticky:last-child { border-left: 1px solid #e0e0e0; + } + .mat-footer-cell { + font-weight: bold; + font-size: 1.2rem !important; } \ No newline at end of file diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/purchase-details/purchase-details.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/purchase-details/purchase-details.component.ts index bb5475978..44c6a6058 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/purchase-details/purchase-details.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/purchase-details/purchase-details.component.ts @@ -79,6 +79,10 @@ removePurchaseItem(value: any) : void{ this.notifier.notify('warning', 'Something Wents Wrong Try Again.!'); }); } +// sum all annual Purchase values +getTotalCost(getItems:any) { + return getItems.map(t => t.annual_purchase_value).reduce((acc, value) => acc + Number(value), 0); +} // do check component bases ngDoCheck() { diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/sales-details/sales-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/sales-details/sales-details.component.html index bc1f00af6..57c1e733a 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/sales-details/sales-details.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/sales-details/sales-details.component.html @@ -14,53 +14,70 @@
-
+
+ + + + + + + + + + + + + + + + + @@ -74,12 +91,17 @@ delete + + +
Product/Services {{element.sales_item}} Total of Sales Sale Quantity {{element.sales_qty}} UOM {{element.uom_name}} Rate/Unit of Sale {{element.rate_per_unit}} Frequency {{element.frequency_name}} Annual Sales {{element.annual_sale_value}} {{getTotalCost(salesItemSource.data)}} Margin Percentage % {{element.margin_per}} Margin Amount {{element.margin_per_uom}} Final Value {{element.margin_final_value}}
-
+
+ + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/sales-details/sales-details.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/sales-details/sales-details.component.scss index f78501e65..172fb36bd 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/sales-details/sales-details.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/sales-details/sales-details.component.scss @@ -27,4 +27,9 @@ .mat-table-sticky:last-child { border-left: 1px solid #e0e0e0; - } \ No newline at end of file + } + .mat-footer-cell { + font-weight: bold; + font-size: 1.2rem !important; + } + \ No newline at end of file diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/sales-details/sales-details.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/sales-details/sales-details.component.ts index 79171bfa0..b41ccdac5 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/sales-details/sales-details.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/sales-details/sales-details.component.ts @@ -97,7 +97,14 @@ ngDoCheck() { this.displayedColumns = ['product_services','sale_quantity','UOM','rate_per_unit_sale','frequency','annual_sales','action']; } - }} + } +} + +// sum all annual sale values +getTotalCost(getItems:any) { + return getItems.map(t => t.annual_sale_value).reduce((acc, value) => acc + Number(value), 0); +} + // detect chnges from parent // ngOnChanges(changes: SimpleChanges) {