Added 'All incomes' tab

Author: janimattiellonen

src/Stats/BankBundle/Resources/views/Partial/stats-table.html.twig

@@ -0,0 +1,21 @@
+<table>
+{% for row in data %}
+    <thead>    
+        <tr>        
+            <th colspan="2">{{row.receiver}}</h3>
+        </tr>
+    </thead>
+    <tbody>
+        <tr>
+            <th>{{'Amount'|trans}}:</th><td>{{row.amount}}</td>
+        </tr>
+        <tr>
+            <th>{{'Date'|trans}}:</th><td>{{row.entryDate|date('d.m.Y')}}</td>
+        </tr>
+        <tr>
+            <th>{{'Event'|trans}}:</th><td>{{row.event}}</td>
+        </tr>
+    </tbody> 
+
+{% endfor %}
+</table>

src/Stats/BankBundle/Resources/views/stats/monthly.html.twig

@@ -55,54 +55,16 @@
     <ul>
         <li><a href="#tabs-1">{{ 'Biggest expenses this month'|trans }}</a></li>
         <li><a href="#tabs-2">{{ 'All expenses this month'|trans }}</a></li>
+        <li><a href="#tabs-3">{{ 'All incomes this month'|trans }}</a></li>
     </ul>
     <div id="tabs-1">
-
-        <table>
-        {% for expense in stats.top_expenses %}
-            <thead>    
-                <tr>        
-                    <th colspan="2">{{expense.receiver}}</h3>
-                </tr>
-            </thead>
-            <tbody>
-                <tr>
-                    <th>{{'Amount'|trans}}:</th><td>{{expense.amount}}</td>
-                </tr>
-                <tr>
-                    <th>{{'Date'|trans}}:</th><td>{{expense.entryDate|date('d.m.Y')}}</td>
-                </tr>
-                <tr>
-                    <th>{{'Event'|trans}}:</th><td>{{expense.event}}</td>
-                </tr>
-            </tbody> 
-
-        {% endfor %}
-        </table>
-
+        {% include 'StatsBankBundle:Partial:stats-table.html.twig' with {"data": stats.top_expenses} %}
     </div>
     <div id="tabs-2">
-        <table>
-        {% for expense in stats.all_expenses %}
-            <thead>    
-                <tr>        
-                    <th colspan="2">{{expense.receiver}}&nbsp;</h3>
-                </tr>
-            </thead>
-            <tbody>
-                <tr>
-                    <th>{{'Amount'|trans}}:</th><td>{{expense.amount}}</td>
-                </tr>
-                <tr>
-                    <th>{{'Date'|trans}}:</th><td>{{expense.entryDate|date('d.m.Y')}}</td>
-                </tr>
-                <tr>
-                    <th>{{'Event'|trans}}:</th><td>{{expense.event}}</td>
-                </tr>
-            </tbody> 
-
-        {% endfor %}
-        </table>
+        {% include 'StatsBankBundle:Partial:stats-table.html.twig' with {"data": stats.all_expenses} %}
+    </div>
+    <div id="tabs-3">
+        {% include 'StatsBankBundle:Partial:stats-table.html.twig' with {"data": stats.all_incomes} %}
     </div>
 </div>
 

src/Stats/BankBundle/Service/AccountService.php

@@ -205,6 +205,7 @@ public function getStatisticsForPeriod(\DateTime $start, \DateTime $end)
         $results['difference'] = $statistics->calculateDifference();
         $results['top_expenses'] = $this->repository->getHighestWithdrawals(5, $start, $end);
         $results['all_expenses'] = $this->repository->getWithdrawalsFor($start, $end);
+        $results['all_incomes'] = $this->repository->getDepositsFor($start, $end);
 
         return $results;
     }