IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Better view for expenses.

Browse Source
This commit is contained in:
James Cole 2016-10-26 19:32:19 +02:00
parent f999257095
commit dc0c1b73bc
4 changed files with 62 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
resources/views/reports/default/month.twig
View File

@ -31,7 +31,14 @@
</div>
</div>
</div>
<div class="col-lg-3 col-md-3 col-sm-3 loading" id="expenseReport">
<div class="col-lg-3 col-md-3 col-sm-3">
<div class="box">
<div class="box-header with-border">
<h3 class="box-title">{{ 'expenses'|_ }}</h3>
</div>
<div class="box-body table-responsive no-padding loading" id="expenseReport">
</div>
</div>
</div>
</div>
<div class="row">

9
resources/views/reports/default/multi-year.twig
View File

@ -42,7 +42,14 @@
</div>
</div>
</div>
<div class="col-lg-3 col-md-3 col-sm-3 loading" id="expenseReport">
<div class="col-lg-3 col-md-3 col-sm-3">
<div class="box">
<div class="box-header with-border">
<h3 class="box-title">{{ 'expenses'|_ }}</h3>
</div>
<div class="box-body table-responsive no-padding loading" id="expenseReport">
</div>
</div>
</div>
</div>
<div class="row">

9
resources/views/reports/default/year.twig
View File

@ -45,7 +45,14 @@
</div>
</div>
</div>
<div class="col-lg-3 col-md-3 col-sm-3 loading" id="expenseReport">
<div class="col-lg-3 col-md-3 col-sm-3">
<div class="box">
<div class="box-header with-border">
<h3 class="box-title">{{ 'expenses'|_ }}</h3>
</div>
<div class="box-body table-responsive no-padding loading" id="expenseReport">
</div>
</div>
</div>
</div>
<div class="row">

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

@ -1,46 +1,39 @@
<div class="box">
<div class="box-header with-border">
<h3 class="box-title">{{ 'expenses'|_ }}</h3>
</div>
<div class="box-body table-responsive no-padding">
<table class="table table-hover">
<tbody>
{% for expense in expenses.getExpenses %}
{% if loop.index > listLength %}
<tr class="overListLength">
{% else %}
<tr>
{% endif %}
<td>
<a href="{{ route('accounts.show',expense.id) }}">{{ expense.name }}</a>
{% if expense.count > 1 %}
<br/>
<small>
{{ expense.count }} {{ 'transactions'|_|lower }}
<i class="fa fa-fw text-muted fa-info-circle firefly-info-button" data-location="expense-entry"
data-account-id="{{ expense.id }}"></i>
</small>
{% endif %}
</td>
<td>
{{ (expense.amount)|formatAmount }}
</td>
</tr>
{% endfor %}
</tbody>
<tfoot>
{% if expenses.getExpenses|length > expenseTopLength %}
<tr>
<td colspan="2" class="active">
<a href="#" class="listLengthTrigger">{{ trans('firefly.show_full_list',{number:incomeTopLength}) }}</a>
</td>
</tr>
{% endif %}
<table class="table table-hover">
<tbody>
{% for expense in expenses.getExpenses %}
{% if loop.index > listLength %}
<tr class="overListLength">
{% else %}
<tr>
<td><em>{{ 'sum'|_ }}</em></td>
<td>{{ (expenses.getTotal)|formatAmount }}</td>
</tr>
</tfoot>
</table>
</div>
</div>
{% endif %}
<td>
<a href="{{ route('accounts.show',expense.id) }}">{{ expense.name }}</a>
{% if expense.count > 1 %}
<br/>
<small>
{{ expense.count }} {{ 'transactions'|_|lower }}
<i class="fa fa-fw text-muted fa-info-circle firefly-info-button" data-location="expense-entry"
data-account-id="{{ expense.id }}"></i>
</small>
{% endif %}
</td>
<td>
{{ (expense.amount)|formatAmount }}
</td>
</tr>
{% endfor %}
</tbody>
<tfoot>
{% if expenses.getExpenses|length > expenseTopLength %}
<tr>
<td colspan="2" class="active">
<a href="#" class="listLengthTrigger">{{ trans('firefly.show_full_list',{number:incomeTopLength}) }}</a>
</td>
</tr>
{% endif %}
<tr>
<td><em>{{ 'sum'|_ }}</em></td>
<td>{{ (expenses.getTotal)|formatAmount }}</td>
</tr>
</tfoot>
</table>