Improved sorting in various views.

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

View File

@@ -37,7 +37,7 @@
<td class="hidden-xs" data-value="{{ user.id }}">#{{ user.id }}</td> <td class="hidden-xs" data-value="{{ user.id }}">#{{ user.id }}</td>
<td data-value="{{ user.email }}"> <td data-value="{{ user.email }}">
<a href="{{ route('admin.users.show',user.id) }}">{{ user.email }}</a></td> <a href="{{ route('admin.users.show',user.id) }}">{{ user.email }}</a></td>
<td class="hidden-xs" data-value="{{ user.created_at.format('Y-m-d-H-i-s') }}"> <td class="hidden-xs" data-value="{{ user.created_at.format('Y-m-d H-i-s') }}">
{{ user.created_at.formatLocalized(monthAndDayFormat) }} {{ user.created_at.formatLocalized(monthAndDayFormat) }}
{{ user.created_at.format('H:i') }} {{ user.created_at.format('H:i') }}
</td> </td>

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> <a class="btn btn-danger btn-xs" href="{{ route('accounts.delete',account.id) }}"><i class="fa fa-fw fa-trash-o"></i></a>
</div> </div>
</td> </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" %} {% if what == "asset" %}
<td class="hidden-sm hidden-xs"> <td class="hidden-sm hidden-xs">
{% for entry in account.accountmeta %} {% for entry in account.accountmeta %}
@@ -42,11 +42,11 @@
{% endif %} {% endif %}
</td> </td>
{% if account.lastActivityDate %} {% 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) }} {{ account.lastActivityDate.formatLocalized(monthAndDayFormat) }}
</td> </td>
{% else %} {% 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> <em>{{ 'never'|_ }}</em>
</td> </td>
{% endif %} {% endif %}

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

View File

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

View File

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

View File

@@ -115,6 +115,7 @@
{% endblock %} {% endblock %}
{% block scripts %} {% 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/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.defaults.js"></script>
<script type="text/javascript" src="js/ff/charts.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> <script type="text/javascript" src="js/ff/reports/default/year.js"></script>
{% endblock %} {% endblock %}
{% block styles %}
<link rel="stylesheet" href="css/bootstrap-sortable.css" type="text/css" media="all"/>
{% endblock %}

View File

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

View File

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

View File

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

View File

@@ -64,7 +64,7 @@
</p> </p>
{% if ruleGroup.rules.count > 0 %} {% if ruleGroup.rules.count > 0 %}
<table class="table table-hover table-striped sortable"> <table class="table table-hover table-striped">
<thead> <thead>
<tr> <tr>
<th colspan="2">{{ 'rule_name'|_ }}</th> <th colspan="2">{{ 'rule_name'|_ }}</th>

View File

@@ -104,8 +104,13 @@
{% endblock %} {% endblock %}
{% block scripts %} {% block scripts %}
<script type="text/javascript"> <script type="text/javascript" src="js/lib/bootstrap-sortable.js"></script>
var query = '{{ query }}'; <script type="text/javascript">
</script> var query = '{{ query }}';
{% endblock %} </script>
{% endblock %}
{% block styles %}
<link rel="stylesheet" href="css/bootstrap-sortable.css" type="text/css" media="all"/>
{% endblock %}

View File

@@ -2,10 +2,10 @@
<thead> <thead>
<tr> <tr>
<th class="hidden-sm hidden-xs" data-defaultsort="disabled">&nbsp;</th> <th class="hidden-sm hidden-xs" data-defaultsort="disabled">&nbsp;</th>
<th>{{ trans('list.name') }}</th> <th data-defaultsign="az">{{ trans('list.name') }}</th>
<th class="hidden-sm hidden-xs">{{ trans('list.type') }}</th> <th data-defaultsign="az" class="hidden-sm hidden-xs">{{ trans('list.type') }}</th>
<th class="hidden-sm hidden-xs">{{ trans('list.role') }}</th> <th data-defaultsign="az" class="hidden-sm hidden-xs">{{ trans('list.role') }}</th>
<th class="hidden-sm hidden-xs">{{ trans('list.iban') }}</th> <th data-defaultsign="az" class="hidden-sm hidden-xs">{{ trans('list.iban') }}</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@@ -17,7 +17,9 @@
<a class="btn btn-danger btn-xs" href="{{ route('accounts.delete',account.id) }}"><i class="fa fa-fw fa-trash-o"></i></a> <a class="btn btn-danger btn-xs" href="{{ route('accounts.delete',account.id) }}"><i class="fa fa-fw fa-trash-o"></i></a>
</div> </div>
</td> </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>
<td>{{ trans('firefly.'~account.accountType.type) }}</td> <td>{{ trans('firefly.'~account.accountType.type) }}</td>
<td class="hidden-sm hidden-xs"> <td class="hidden-sm hidden-xs">
{% for entry in account.accountmeta %} {% for entry in account.accountmeta %}

View File

@@ -2,7 +2,7 @@
<thead> <thead>
<tr> <tr>
<th class="hidden-sm hidden-xs" data-defaultsort="disabled">&nbsp;</th> <th class="hidden-sm hidden-xs" data-defaultsort="disabled">&nbsp;</th>
<th>{{ trans('list.name') }}</th> <th data-defaultsign="az">{{ trans('list.name') }}</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@@ -14,7 +14,9 @@
<a class="btn btn-danger btn-xs" href="{{ route('budgets.delete', budget.id) }}"><i class="fa fa-fw fa-trash-o"></i></a> <a class="btn btn-danger btn-xs" href="{{ route('budgets.delete', budget.id) }}"><i class="fa fa-fw fa-trash-o"></i></a>
</div> </div>
</td> </td>
<td><a href="{{ route('budgets.show',budget.id) }}">{{ budget.name }}</a></td> <td data-value="{{ budget.name }}">
<a href="{{ route('budgets.show',budget.id) }}">{{ budget.name }}</a>
</td>
</tr> </tr>
{% endfor %} {% endfor %}
</tbody> </tbody>

View File

@@ -2,7 +2,7 @@
<thead> <thead>
<tr> <tr>
<th class="hidden-sm hidden-xs" data-defaultsort="disabled">&nbsp;</th> <th class="hidden-sm hidden-xs" data-defaultsort="disabled">&nbsp;</th>
<th>{{ trans('list.name') }}</th> <th data-defaultsign="az">{{ trans('list.name') }}</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@@ -14,7 +14,9 @@
<a class="btn btn-danger btn-xs" href="{{ route('categories.delete',category.id) }}"><i class="fa fa-fw fa-trash-o"></i></a> <a class="btn btn-danger btn-xs" href="{{ route('categories.delete',category.id) }}"><i class="fa fa-fw fa-trash-o"></i></a>
</div> </div>
</td> </td>
<td><a href="{{ route('categories.show',category.id) }}">{{ category.name }}</a></td> <td data-value="{{ category.name }}">
<a href="{{ route('categories.show',category.id) }}">{{ category.name }}</a>
</td>
</tr> </tr>
{% endfor %} {% endfor %}
</tbody> </tbody>

View File

@@ -2,8 +2,8 @@
<thead> <thead>
<tr> <tr>
<th class="hidden-sm hidden-xs" data-defaultsort="disabled">&nbsp;</th> <th class="hidden-sm hidden-xs" data-defaultsort="disabled">&nbsp;</th>
<th>{{ trans('list.name') }}</th> <th data-defaultsign="az">{{ trans('list.name') }}</th>
<th>{{ trans('list.type') }}</th> <th data-defaultsign="az">{{ trans('list.type') }}</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@@ -15,7 +15,9 @@
<a class="btn btn-danger btn-xs" href="{{ route('tags.delete', tag.id) }}"><i class="fa fa-fw fa-trash-o"></i></a> <a class="btn btn-danger btn-xs" href="{{ route('tags.delete', tag.id) }}"><i class="fa fa-fw fa-trash-o"></i></a>
</div> </div>
</td> </td>
<td><a href="{{ route('tags.show',tag.id) }}">{{ tag.tag }}</a></td> <td data-value="{{ tag.tag }}">
<a href="{{ route('tags.show',tag.id) }}">{{ tag.tag }}</a><
/td>
<td>{{ ('tag'~tag.tagMode)|_ }}</td> <td>{{ ('tag'~tag.tagMode)|_ }}</td>
</tr> </tr>
{% endfor %} {% endfor %}

View File

@@ -1,17 +1,17 @@
{{ journals.render|raw }} {{ journals.render|raw }}
<table class="table table-hover table-compressed {% if sorting %}sortable-table{% endif %}"> <table class="table table-hover table-compressed sortable">
<thead> <thead>
<tr class="ignore"> <tr class="ignore">
<th class="hidden-xs" colspan="2">&nbsp;</th> <th data-defaultsort="disabled" class="hidden-xs" colspan="2">&nbsp;</th>
<th>{{ trans('list.description') }}</th> <th data-defaultsort="disabled">{{ trans('list.description') }}</th>
<th>{{ trans('list.amount') }}</th> <th data-defaultsign="_19">{{ trans('list.amount') }}</th>
<th class="hidden-sm hidden-xs">{{ trans('list.date') }}</th> <th data-defaultsign="month" class="hidden-sm hidden-xs">{{ trans('list.date') }}</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{% for transaction in transactions %} {% for transaction in transactions %}
<tr class="drag" data-date="{{ transaction.date.format('Y-m-d') }}" data-id="{{ transaction.journal_id }}"> <tr>
<td class="hidden-xs"> <td class="hidden-xs">
<div class="btn-group btn-group-xs edit_buttons"> <div class="btn-group btn-group-xs edit_buttons">
<a href="{{ route('transactions.edit',transaction.journal_id) }}" class="btn btn-xs btn-default"><i class="fa fa-fw fa-pencil"></i></a> <a href="{{ route('transactions.edit',transaction.journal_id) }}" class="btn btn-xs btn-default"><i class="fa fa-fw fa-pencil"></i></a>
@@ -38,7 +38,7 @@
{% endif %} {% endif %}
</td> </td>
<td> <td data-value="{{ transaction.transaction_amount }}">
<!-- format amount of transaction --> <!-- format amount of transaction -->
{{ formatAmountWithCode(transaction.transaction_amount, transaction.transaction_currency_code) }} {{ formatAmountWithCode(transaction.transaction_amount, transaction.transaction_currency_code) }}
<!-- and then amount of journal itself. --> <!-- and then amount of journal itself. -->
@@ -47,7 +47,7 @@
</td> </td>
<td class="hidden-sm hidden-xs"> <td class="hidden-sm hidden-xs" data-value="{{ transaction.date.format('Y-m-d H:i:s') }}">
{{ transaction.date.formatLocalized(monthAndDayFormat) }} {{ transaction.date.formatLocalized(monthAndDayFormat) }}
</td> </td>
</tr> </tr>