From 6fe5ce048543b1cecca212c08a6ca3d424ae915e Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Fri, 12 Jan 2018 21:08:59 +0100
Subject: [PATCH] Expand budget report #1106

---
 .../Report/Budget/MonthReportGenerator.php    |  5 ++-
 app/Generator/Report/Support.php              |  7 +++--
 resources/views/reports/budget/month.twig     | 31 +++++++++++++++++++
 3 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/app/Generator/Report/Budget/MonthReportGenerator.php b/app/Generator/Report/Budget/MonthReportGenerator.php
index 1ac4532632..adf6639de0 100644
--- a/app/Generator/Report/Budget/MonthReportGenerator.php
+++ b/app/Generator/Report/Budget/MonthReportGenerator.php
@@ -194,7 +194,9 @@ class MonthReportGenerator extends Support implements ReportGeneratorInterface
      */
     private function summarizeByBudget(Collection $collection): array
     {
-        $result = [];
+        $result = [
+            'sum' => '0',
+        ];
         /** @var Transaction $transaction */
         foreach ($collection as $transaction) {
             $jrnlBudId         = intval($transaction->transaction_journal_budget_id);
@@ -202,6 +204,7 @@ class MonthReportGenerator extends Support implements ReportGeneratorInterface
             $budgetId          = max($jrnlBudId, $transBudId);
             $result[$budgetId] = $result[$budgetId] ?? '0';
             $result[$budgetId] = bcadd($transaction->transaction_amount, $result[$budgetId]);
+            $result['sum']     = bcadd($result['sum'], $transaction->transaction_amount);
         }
 
         return $result;
diff --git a/app/Generator/Report/Support.php b/app/Generator/Report/Support.php
index f169bc59bc..aca9c005ba 100644
--- a/app/Generator/Report/Support.php
+++ b/app/Generator/Report/Support.php
@@ -133,7 +133,7 @@ class Support
             }
 
             $return[$objectId]['earned'] = $entry;
-            $return['sum']['earned'] = bcadd($return['sum']['earned'], $entry);
+            $return['sum']['earned']     = bcadd($return['sum']['earned'], $entry);
         }
 
         return $return;
@@ -146,12 +146,15 @@ class Support
      */
     protected function summarizeByAccount(Collection $collection): array
     {
-        $result = [];
+        $result = [
+            'sum' => '0',
+        ];
         /** @var Transaction $transaction */
         foreach ($collection as $transaction) {
             $accountId          = $transaction->account_id;
             $result[$accountId] = $result[$accountId] ?? '0';
             $result[$accountId] = bcadd($transaction->transaction_amount, $result[$accountId]);
+            $result['sum']      = bcadd($result['sum'], $transaction->transaction_amount);
         }
 
         return $result;
diff --git a/resources/views/reports/budget/month.twig b/resources/views/reports/budget/month.twig
index 4939a20eba..e1e1dcd757 100644
--- a/resources/views/reports/budget/month.twig
+++ b/resources/views/reports/budget/month.twig
@@ -35,6 +35,12 @@
                             </tr>
                         {% endfor %}
                         </tbody>
+                        <tfoot>
+                        <tr>
+                            <td>{{ 'sum'|_ }}</td>
+                            <td style="text-align: right;">{{ accountSummary.sum|formatAmount }}</td>
+                        </tr>
+                        </tfoot>
                     </table>
                 </div>
             </div>
@@ -65,6 +71,12 @@
                             </tr>
                         {% endfor %}
                         </tbody>
+                        <tfoot>
+                        <tr>
+                            <td>{{ 'sum'|_ }}</td>
+                            <td style="text-align: right;">{{ budgetSummary.sum|formatAmount }}</td>
+                        </tr>
+                        </tfoot>
                     </table>
                 </div>
             </div>
@@ -140,7 +152,11 @@
                             </tr>
                             </thead>
                             <tbody>
+                            {% set totalCount = 0 %}
+                            {% set totalSum = 0 %}
                             {% for row in averageExpenses %}
+                                {% set totalCount = totalCount+ row.count %}
+                                {% set totalSum = totalSum + row.sum %}
                                 {% if loop.index > listLength %}
                                     <tr class="overListLength">
                                 {% else %}
@@ -169,6 +185,13 @@
                                     </td>
                                 </tr>
                             {% endif %}
+                            <tr>
+                                <td colspan="2">
+                                    {{ 'sum'|_ }}
+                                </td>
+                                <td style="text-align:right">{{ totalSum|formatAmount }}</td>
+                                <td>{{ totalCount }}</td>
+                            </tr>
                             </tfoot>
                         </table>
                     </div>
@@ -193,7 +216,9 @@
                             </tr>
                             </thead>
                             <tbody>
+                            {% set totalSum = 0 %}
                             {% for row in topExpenses %}
+                                {% set totalSum = totalSum + row.transaction_amount %}
                                 {% if loop.index > listLength %}
                                     <tr class="overListLength">
                                 {% else %}
@@ -230,6 +255,12 @@
                                     </td>
                                 </tr>
                             {% endif %}
+                            <tr>
+                                <td colspan="3">
+                                    {{ 'sum'|_ }}
+                                </td>
+                                <td style="text-align:right">{{ totalSum|formatAmount }}</td>
+                            </tr>
                             </tfoot>
                         </table>
                     </div>