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

6
resources/views/list/accounts.twig
View File

@@ -22,7 +22,7 @@
<a class="btn btn-danger btn-xs" href="{{ route('accounts.delete',account.id) }}"><i class="fa fa-fw fa-trash-o"></i></a>
</div>
</td>
<td><a href="{{ route('accounts.show',account.id) }}">{{ account.name }}</a></td>
<td data-value="{{ account.name }}"><a href="{{ route('accounts.show',account.id) }}">{{ account.name }}</a></td>
{% if what == "asset" %}
<td class="hidden-sm hidden-xs">
{% for entry in account.accountmeta %}
@@ -42,11 +42,11 @@
{% endif %}
</td>
{% if account.lastActivityDate %}
<td class="hidden-sm hidden-xs" data-value="{{ account.lastActivityDate.format('Y-m-d-H-i-s') }} ">
<td class="hidden-sm hidden-xs" data-value="{{ account.lastActivityDate.format('Y-m-d H-i-s') }} ">
{{ account.lastActivityDate.formatLocalized(monthAndDayFormat) }}
</td>
{% else %}
<td class="hidden-sm hidden-xs" data-value="0000-00-00-00-00-00">
<td class="hidden-sm hidden-xs" data-value="0000-00-00 00-00-00">
<em>{{ 'never'|_ }}</em>
</td>
{% endif %}

16
resources/views/list/bills.twig
View File

@@ -21,7 +21,7 @@
<a href="{{ route('bills.delete',entry.id) }}" class="btn btn-danger btn-xs"><i class="fa fa-fw fa-trash-o"></i></a>
</div>
</td>
<td>
<td data-value="{{ entry.name }}">
<a href="{{ route('bills.show',entry.id) }}" title="{{ entry.name }}">{{ entry.name }}</a>
</td>
<td class="hidden-sm hidden-xs" data-value="{{ entry.match }}">
@@ -37,33 +37,33 @@
</td>
{% if entry.paidDates.count() == 0 and entry.payDates.count() == 0 and entry.active %}
<td class="text-muted" data-value="0001-00-00-00-00-00">
<td class="text-muted" data-value="0001-00-00 00-00-00">
{{ 'not_expected_period'|_ }}
</td>
<td class=" hidden-sm hidden-xs" data-value="{{ entry.nextExpectedMatch.format('Y-m-d-H-i-s') }}">
<td class=" hidden-sm hidden-xs" data-value="{{ entry.nextExpectedMatch.format('Y-m-d H-i-s') }}">
{{ entry.nextExpectedMatch.formatLocalized(monthAndDayFormat) }}
</td>
{% endif %}
{% if entry.paidDates.count() == 0 and entry.payDates.count() > 0 and entry.active %}
<td class="text-danger" data-value="0002-00-00-00-00-00">
<td class="text-danger" data-value="0002-00-00 00-00-00">
{{ 'not_or_not_yet'|_ }}
</td>
<td class=" hidden-sm hidden-xs" data-value="{{ entry.nextExpectedMatch.format('Y-m-d-H-i-s') }}">
<td class=" hidden-sm hidden-xs" data-value="{{ entry.nextExpectedMatch.format('Y-m-d H-i-s') }}">
{{ entry.nextExpectedMatch.formatLocalized(monthAndDayFormat) }}
</td>
{% endif %}
{% if entry.paidDates.count() == entry.payDates.count() and entry.payDates.count() > 0 and entry.active %}
<td class="text-success" data-value="{{ entry.paidDates.first.format('Y-m-d-H-i-s') }}">
<td class="text-success" data-value="{{ entry.paidDates.first.format('Y-m-d H-i-s') }}">
{% for date in entry.paidDates %}
{{ date.formatLocalized(monthAndDayFormat) }}<br/>
{% endfor %}
</td>
<td class=" hidden-sm hidden-xs" data-value="{{ entry.nextExpectedMatch.format('Y-m-d-H-i-s') }}">
<td class=" hidden-sm hidden-xs" data-value="{{ entry.nextExpectedMatch.format('Y-m-d H-i-s') }}">
{{ entry.nextExpectedMatch.formatLocalized(monthAndDayFormat) }}
</td>
{% endif %}
{% if not entry.active %}
<td class="text-muted" data-value="0000-00-00-00-00-00">
<td class="text-muted" data-value="0000-00-00 00-00-00">
~
</td>
<td class="text-muted hidden-sm hidden-xs" data-value="0">

10
resources/views/list/categories.twig
View File

@@ -2,8 +2,8 @@
<thead>
<tr>
<th data-defaultsort="disabled">&nbsp;</th>
<th>{{ trans('list.name') }}</th>
<th class="hidden-sm hidden-xs">{{ trans('list.lastActivity') }}</th>
<th data-defaultsign="az">{{ trans('list.name') }}</th>
<th data-defaultsign="month" class="hidden-sm hidden-xs">{{ trans('list.lastActivity') }}</th>
</tr>
</thead>
<tbody>
@@ -20,15 +20,15 @@
<a href="{{ route('categories.delete', category.id) }}" class="btn btn-danger btn-xs"><i class="fa fa-fw fa-trash-o"></i></a>
</div>
</td>
<td>
<td data-value="{{ category.name }}">
<a href="{{ route('categories.show', category.id) }}" title="{{ category.name }}">{{ category.name }}</a>
</td>
{% if category.lastActivity.year != "1900" %}
<td class="hidden-sm hidden-xs" data-value="{{ category.lastActivity.format('Y-m-d-H-i-s') }}">
<td class="hidden-sm hidden-xs" data-value="{{ category.lastActivity.format('Y-m-d H-i-s') }}">
{{ category.lastActivity.formatLocalized(monthAndDayFormat) }}
</td>
{% else %}
<td class="hidden-sm hidden-xs" data-value="0000-00-00-00-00-00">
<td class="hidden-sm hidden-xs" data-value="0000-00-00 00-00-00">
<em>{{ 'never'|_ }}</em>
</td>
{% endif %}