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 f6b85d4b4..e94b46460 100644 --- 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 @@ -61,8 +61,11 @@ - Sales Calculate Items Wise + Sales Calculate Item Wise + + {{salesCaluatedItem.length}}  Items +
@@ -103,11 +106,14 @@ - Sales Calculate Items Month Wise + Sales Calculate Month Wise + + {{salesMonthWiseExpandedItems.length}}  Items + - + - - Amount - {{itemValue.sales_value}} - {{getTotalCost(eachItem.value)}} - - - - - - -
- - - +
@@ -152,7 +134,47 @@
- + --> + + + {{expandDetails.salesItem}} + +
+ {{footer.month_message}}   {{footer.year_message}} +
+ +
+
+ + + +
+ +

{{eachItem.header}}

+ + + + + + + + + + + + + + + + +
Date{{itemValue.sales_date | date: 'dd-MM-yyyy'}} Total Amount{{itemValue.sales_value}} {{getTotalCost(eachItem.value)}}
+
+ +
+ +
+ @@ -161,6 +183,9 @@ Purchase Details + + {{purchaseDetails.length}}  Items +
@@ -203,6 +228,9 @@ Business Expenses + + {{businessExpenses.length}}  Items +
@@ -240,6 +268,9 @@ House Hold Expenses + + {{houseHoldExpenses.length}}  Items +
@@ -272,10 +303,7 @@ - - + - - 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 1ca16c276..340230c9f 100644 --- 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,5 +1,5 @@ .example-container { - max-height: 300px; + max-height: 500px; overflow: auto; } @@ -29,6 +29,9 @@ tr.mat-footer-row { .h4_font { font-size: 18px; } + .subtitle_message { + color:#e00201 !important; + } // table, th, td { // border: 1px solid rgba(0, 0, 0, 0.12); @@ -43,4 +46,9 @@ tr.mat-footer-row { // text-align: center; // } +.row_border { + display: flex; + border:1px solid rgba(0, 0, 0, 0.12); +} + \ 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 e2aebdb6b..87470a02e 100644 --- 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 @@ -104,9 +104,9 @@ salesMonthWiseExpandedItems: any=[] let convertYear : number = 12 / listItems.length; let footerMessage: any=[]; footerMessage.push({ - month_message: listItems.length + ' Months ' + itemElement.sales_item + ' Sales : '+ calculateAllItemsTotal, + month_message: listItems.length + ' Month Sales : '+ calculateAllItemsTotal, month_value:calculateAllItemsTotal, - year_message: ' Yearly ' + itemElement.sales_item + ' Sales Arrived : '+ calculateAllItemsTotal * convertYear, + year_message: ' Yearly Sales Arrived : '+ calculateAllItemsTotal * convertYear, year_value: calculateAllItemsTotal * convertYear, }) // footerMessage.push({