kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-12-15 19:09:50 +00:00
Code Issues Projects Releases Wiki Activity

Improved sorting in various views.

Browse Source
This commit is contained in:
James Cole
2016-11-20 17:36:11 +01:00
parent 0b613c3b8c
commit c56f937521
16 changed files with 82 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
resources/views/reports/category/month.twig
View File

@@ -276,13 +276,13 @@
<td data-value="{{ row.name }}">
<a href="{{ route('accounts.show', row.id) }}">{{ row.name }}</a>
</td>
<td>
<td data-value="{{ row.average }}">
{{ row.average|formatAmount }}
</td>
<td>
<td data-value="{{ row.sum }}">
{{ row.sum|formatAmount }}
</td>
<td>
<td data-value="{{ row.count }}">
{{ row.count }}
</td>
</tr>
@@ -304,9 +304,9 @@
<thead>
<tr>
<th data-defaultsort="disabled">{{ 'description'|_ }}</th>
<th>{{ 'date'|_ }}</th>
<th data-defaultsign="month">{{ 'date'|_ }}</th>
<th data-defaultsign="az">{{ 'account'|_ }}</th>
<th>{{ 'amount'|_ }}</th>
<th data-defaultsign="_19">{{ 'amount'|_ }}</th>
</tr>
</thead>
<tbody>
@@ -325,15 +325,15 @@
{% endif %}
</a>
</td>
<td>
<td data-value="{{ row.date.format('Y-m-d H-i-s') }}">
{{ row.date.formatLocalized(monthAndDayFormat) }}
</td>
<td>
<td data-value="{{ row.opposing_account_name }}">
<a href="{{ route('accounts.show', row.opposing_account_id) }}">
{{ row.opposing_account_name }}
</a>
</td>
<td>
<td data-value="{{ row.transaction_amount }}">
{{ row.transaction_amount|formatAmount }}
</td>
</tr>

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

@@ -115,6 +115,7 @@
{% endblock %}
{% block scripts %}
<script type="text/javascript" src="js/lib/bootstrap-sortable.js"></script>
<script type="text/javascript" src="js/lib/Chart.bundle.min.js"></script>
<script type="text/javascript" src="js/ff/charts.defaults.js"></script>
<script type="text/javascript" src="js/ff/charts.js"></script>
@@ -140,3 +141,6 @@
<script type="text/javascript" src="js/ff/reports/default/year.js"></script>
{% endblock %}
{% block styles %}
<link rel="stylesheet" href="css/bootstrap-sortable.css" type="text/css" media="all"/>
{% endblock %}

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

@@ -1,16 +1,16 @@
<table class="table table-hover sortable">
<thead>
<tr>
<th>{{ 'name'|_ }}</th>
<th class="hidden-xs">{{ 'balanceStart'|_ }}</th>
<th class="hidden-xs">{{ 'balanceEnd'|_ }}</th>
<th>{{ 'difference'|_ }}</th>
<th data-defaultsign="az">{{ 'name'|_ }}</th>
<th data-defaultsign="_19" class="hidden-xs">{{ 'balanceStart'|_ }}</th>
<th data-defaultsign="_19" class="hidden-xs">{{ 'balanceEnd'|_ }}</th>
<th data-defaultsign="_19">{{ 'difference'|_ }}</th>
</tr>
</thead>
<tbody>
{% for account in accountReport.getAccounts %}
<tr>
<td>
<td data-value="{{ account.name }}">
<a href="{{ route('accounts.show',account.id) }}" title="{{ account.name }}">{{ account.name }}</a>
</td>
<td class="hidden-xs" data-value="{{ account.startBalance }}">{{ account.startBalance|formatAmount }}</td>

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

@@ -6,11 +6,11 @@
<table class="table table-hover sortable">
<thead>
<tr>
<th>{{ trans('form.name') }}</th>
<th class="hidden-xs">{{ trans('form.amount_min') }}</th>
<th class="hidden-xs">{{ trans('form.amount_max') }}</th>
<th>{{ trans('form.amount') }}</th>
<th>{{ trans('form.under') }}</th>
<th data-defaultsign="az">{{ trans('form.name') }}</th>
<th data-defaultsign="_19" class="hidden-xs">{{ trans('form.amount_min') }}</th>
<th data-defaultsign="_19" class="hidden-xs">{{ trans('form.amount_max') }}</th>
<th data-defaultsign="_19">{{ trans('form.amount') }}</th>
<th data-defaultsign="_19">{{ trans('form.under') }}</th>
</tr>
</thead>
<tbody>

8
resources/views/reports/partials/budget-period.twig
View File

@@ -1,17 +1,17 @@
<table class="table table-hover sortable">
<thead>
<tr>
<th>{{ 'budget'|_ }}</th>
<th data-defaultsign="az">{{ 'budget'|_ }}</th>
{% for period in periods %}
<th>{{ period }}</th>
<th data-defaultsign="_19">{{ period }}</th>
{% endfor %}
<th>{{ 'sum'|_ }}</th>
<th data-defaultsign="_19">{{ 'sum'|_ }}</th>
</tr>
</thead>
<tbody>
{% for id, info in budgets %}
<tr>
<td>
<td data-value="{{ info.name }}">
<a title="{{ info.name }}" href="#" data-budget="{{ id }}" class="budget-chart-activate">{{ info.name }}</a>
</td>
{% for amount in info.entries %}