kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-08 15:05:29 +00:00
Code Issues Projects Releases Wiki Activity

Fixed some issues with expense/income overview.

Browse Source
This commit is contained in:
James Cole
2016-12-05 20:19:26 +01:00
parent 098cc88d5f
commit b713eae009
3 changed files with 106 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
resources/views/reports/partials/expenses.twig
View File

@@ -1,6 +1,8 @@
<table class="table table-hover">
<tbody>
{% for expense in expenses.getExpenses %}
{% set sum = 0 %}
{% for expense in expenses %}
{% set sum = sum + expense.sum %}
{% if loop.index > listLength %}
<tr class="overListLength">
{% else %}
@@ -18,13 +20,13 @@
{% endif %}
</td>
<td>
{{ (expense.amount)|formatAmount }}
{{ (expense.sum)|formatAmount }}
</td>
</tr>
{% endfor %}
</tbody>
<tfoot>
{% if expenses.getExpenses|length > listLength %}
{% if expenses|length > listLength %}
<tr>
<td colspan="2" class="active">
<a href="#" class="listLengthTrigger">{{ trans('firefly.show_full_list',{number:incomeTopLength}) }}</a>
@@ -33,7 +35,7 @@
{% endif %}
<tr>
<td><em>{{ 'sum'|_ }}</em></td>
<td>{{ (expenses.getTotal)|formatAmount }}</td>
<td>{{ (sum)|formatAmount }}</td>
</tr>
</tfoot>
</table>

18
resources/views/reports/partials/income.twig
View File

@@ -1,30 +1,32 @@
<table class="table table-hover">
<tbody>
{% for income in incomes.getIncomes %}
{% set sum = 0 %}
{% for row in income %}
{% set sum = sum + row.sum %}
{% if loop.index > listLength %}
<tr class="overListLength">
{% else %}
<tr>
{% endif %}
<td>
<a href="{{ route('accounts.show',income.id) }}" title="{{ income.name }}">{{ income.name }}</a>
{% if income.count > 1 %}
<a href="{{ route('accounts.show',row.id) }}" title="{{ row.name }}">{{ row.name }}</a>
{% if row.count > 1 %}
<br/>
<small>
{{ income.count }} {{ 'transactions'|_|lower }}
{{ row.count }} {{ 'transactions'|_|lower }}
<i class="fa fa-fw text-muted fa-info-circle firefly-info-button" data-location="income-entry"
data-account-id="{{ income.id }}"></i>
data-account-id="{{ row.id }}"></i>
</small>
{% endif %}
</td>
<td>{{ income.amount|formatAmount }}</td>
<td>{{ row.sum|formatAmount }}</td>
</tr>
{% endfor %}
</tbody>
<tfoot>
{% if incomes.getIncomes|length > listLength %}
{% if income|length > listLength %}
<tr>
<td colspan="2" class="active">
<a href="#" class="listLengthTrigger">{{ trans('firefly.show_full_list',{ number:listLength } ) }}</a>
@@ -33,7 +35,7 @@
{% endif %}
<tr>
<td><em>{{ 'sum'|_ }}</em></td>
<td>{{ incomes.getTotal|formatAmount }}</td>
<td>{{ sum|formatAmount }}</td>
</tr>
</tfoot>
</table>