From c56f937521085356a11b5feffa55e72a19e6fb2b Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sun, 20 Nov 2016 17:36:11 +0100
Subject: [PATCH] Improved sorting in various views.

---
 resources/views/admin/users/index.twig           |  2 +-
 resources/views/list/accounts.twig               |  6 +++---
 resources/views/list/bills.twig                  | 16 ++++++++--------
 resources/views/list/categories.twig             | 10 +++++-----
 resources/views/reports/category/month.twig      | 16 ++++++++--------
 resources/views/reports/default/year.twig        |  4 ++++
 resources/views/reports/partials/accounts.twig   | 10 +++++-----
 resources/views/reports/partials/bills.twig      | 10 +++++-----
 .../views/reports/partials/budget-period.twig    |  8 ++++----
 resources/views/rules/index.twig                 |  2 +-
 resources/views/search/index.twig                | 15 ++++++++++-----
 resources/views/search/partials/accounts.twig    | 12 +++++++-----
 resources/views/search/partials/budgets.twig     |  6 ++++--
 resources/views/search/partials/categories.twig  |  6 ++++--
 resources/views/search/partials/tags.twig        |  8 +++++---
 .../views/search/partials/transactions.twig      | 16 ++++++++--------
 16 files changed, 82 insertions(+), 65 deletions(-)

diff --git a/resources/views/admin/users/index.twig b/resources/views/admin/users/index.twig
index f71843647c..af0a04df9f 100644
--- a/resources/views/admin/users/index.twig
+++ b/resources/views/admin/users/index.twig
@@ -37,7 +37,7 @@
                                 <td class="hidden-xs" data-value="{{ user.id }}">#{{ user.id }}</td>
                                 <td data-value="{{ user.email }}">
                                     <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.format('H:i') }}
                                 </td>
diff --git a/resources/views/list/accounts.twig b/resources/views/list/accounts.twig
index 995ae450ee..2f0eb6544f 100644
--- a/resources/views/list/accounts.twig
+++ b/resources/views/list/accounts.twig
@@ -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 %}
diff --git a/resources/views/list/bills.twig b/resources/views/list/bills.twig
index 02ae6daedb..2bf6f5b128 100644
--- a/resources/views/list/bills.twig
+++ b/resources/views/list/bills.twig
@@ -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">
diff --git a/resources/views/list/categories.twig b/resources/views/list/categories.twig
index 16deef6773..5e97abe7e4 100644
--- a/resources/views/list/categories.twig
+++ b/resources/views/list/categories.twig
@@ -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 %}
diff --git a/resources/views/reports/category/month.twig b/resources/views/reports/category/month.twig
index 7e860d70c5..49556850ac 100644
--- a/resources/views/reports/category/month.twig
+++ b/resources/views/reports/category/month.twig
@@ -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>
diff --git a/resources/views/reports/default/year.twig b/resources/views/reports/default/year.twig
index de0a4df7bb..8ef09d32af 100644
--- a/resources/views/reports/default/year.twig
+++ b/resources/views/reports/default/year.twig
@@ -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 %}
\ No newline at end of file
diff --git a/resources/views/reports/partials/accounts.twig b/resources/views/reports/partials/accounts.twig
index cbdeaa68f5..ef3ad787e7 100644
--- a/resources/views/reports/partials/accounts.twig
+++ b/resources/views/reports/partials/accounts.twig
@@ -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>
diff --git a/resources/views/reports/partials/bills.twig b/resources/views/reports/partials/bills.twig
index 22c84668f3..fe234655ef 100644
--- a/resources/views/reports/partials/bills.twig
+++ b/resources/views/reports/partials/bills.twig
@@ -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>
diff --git a/resources/views/reports/partials/budget-period.twig b/resources/views/reports/partials/budget-period.twig
index e801a6e1b6..53308f4606 100644
--- a/resources/views/reports/partials/budget-period.twig
+++ b/resources/views/reports/partials/budget-period.twig
@@ -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 %}
diff --git a/resources/views/rules/index.twig b/resources/views/rules/index.twig
index 86e530da0f..f126463521 100644
--- a/resources/views/rules/index.twig
+++ b/resources/views/rules/index.twig
@@ -64,7 +64,7 @@
                         </p>
 
                         {% if ruleGroup.rules.count > 0 %}
-                            <table class="table table-hover table-striped sortable">
+                            <table class="table table-hover table-striped">
                                 <thead>
                                 <tr>
                                     <th colspan="2">{{ 'rule_name'|_ }}</th>
diff --git a/resources/views/search/index.twig b/resources/views/search/index.twig
index 88107c52d6..e2e3a76ffe 100644
--- a/resources/views/search/index.twig
+++ b/resources/views/search/index.twig
@@ -104,8 +104,13 @@
 
 
 {% endblock %}
-    {% block scripts %}
-        <script type="text/javascript">
-            var query = '{{ query }}';
-        </script>
-    {% endblock %}
+{% block scripts %}
+    <script type="text/javascript" src="js/lib/bootstrap-sortable.js"></script>
+    <script type="text/javascript">
+        var query = '{{ query }}';
+    </script>
+{% endblock %}
+
+{% block styles %}
+    <link rel="stylesheet" href="css/bootstrap-sortable.css" type="text/css" media="all"/>
+{% endblock %}
\ No newline at end of file
diff --git a/resources/views/search/partials/accounts.twig b/resources/views/search/partials/accounts.twig
index e21b443d59..45c4a2466a 100644
--- a/resources/views/search/partials/accounts.twig
+++ b/resources/views/search/partials/accounts.twig
@@ -2,10 +2,10 @@
     <thead>
     <tr>
         <th class="hidden-sm hidden-xs" data-defaultsort="disabled">&nbsp;</th>
-        <th>{{ trans('list.name') }}</th>
-        <th class="hidden-sm hidden-xs">{{ trans('list.type') }}</th>
-        <th class="hidden-sm hidden-xs">{{ trans('list.role') }}</th>
-        <th class="hidden-sm hidden-xs">{{ trans('list.iban') }}</th>
+        <th data-defaultsign="az">{{ trans('list.name') }}</th>
+        <th data-defaultsign="az" class="hidden-sm hidden-xs">{{ trans('list.type') }}</th>
+        <th data-defaultsign="az" class="hidden-sm hidden-xs">{{ trans('list.role') }}</th>
+        <th data-defaultsign="az" class="hidden-sm hidden-xs">{{ trans('list.iban') }}</th>
     </tr>
     </thead>
     <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>
                 </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>
             <td>{{ trans('firefly.'~account.accountType.type) }}</td>
             <td class="hidden-sm hidden-xs">
                 {% for entry in account.accountmeta %}
diff --git a/resources/views/search/partials/budgets.twig b/resources/views/search/partials/budgets.twig
index ad14e57747..5d6c4008d4 100644
--- a/resources/views/search/partials/budgets.twig
+++ b/resources/views/search/partials/budgets.twig
@@ -2,7 +2,7 @@
     <thead>
     <tr>
         <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>
     </thead>
     <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>
                 </div>
             </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>
     {% endfor %}
     </tbody>
diff --git a/resources/views/search/partials/categories.twig b/resources/views/search/partials/categories.twig
index 4176de3240..7dfef5da15 100644
--- a/resources/views/search/partials/categories.twig
+++ b/resources/views/search/partials/categories.twig
@@ -2,7 +2,7 @@
     <thead>
     <tr>
         <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>
     </thead>
     <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>
                 </div>
             </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>
     {% endfor %}
     </tbody>
diff --git a/resources/views/search/partials/tags.twig b/resources/views/search/partials/tags.twig
index c4b3e21a2c..919fa19daf 100644
--- a/resources/views/search/partials/tags.twig
+++ b/resources/views/search/partials/tags.twig
@@ -2,8 +2,8 @@
     <thead>
     <tr>
         <th class="hidden-sm hidden-xs" data-defaultsort="disabled">&nbsp;</th>
-        <th>{{ trans('list.name') }}</th>
-        <th>{{ trans('list.type') }}</th>
+        <th data-defaultsign="az">{{ trans('list.name') }}</th>
+        <th data-defaultsign="az">{{ trans('list.type') }}</th>
     </tr>
     </thead>
     <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>
                 </div>
             </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>
         </tr>
     {% endfor %}
diff --git a/resources/views/search/partials/transactions.twig b/resources/views/search/partials/transactions.twig
index c20da1ff07..279a336a3c 100644
--- a/resources/views/search/partials/transactions.twig
+++ b/resources/views/search/partials/transactions.twig
@@ -1,17 +1,17 @@
 {{ journals.render|raw }}
 
-<table class="table table-hover table-compressed {% if sorting %}sortable-table{% endif %}">
+<table class="table table-hover table-compressed sortable">
     <thead>
     <tr class="ignore">
-        <th class="hidden-xs" colspan="2">&nbsp;</th>
-        <th>{{ trans('list.description') }}</th>
-        <th>{{ trans('list.amount') }}</th>
-        <th class="hidden-sm hidden-xs">{{ trans('list.date') }}</th>
+        <th data-defaultsort="disabled" class="hidden-xs" colspan="2">&nbsp;</th>
+        <th data-defaultsort="disabled">{{ trans('list.description') }}</th>
+        <th data-defaultsign="_19">{{ trans('list.amount') }}</th>
+        <th data-defaultsign="month" class="hidden-sm hidden-xs">{{ trans('list.date') }}</th>
     </tr>
     </thead>
     <tbody>
     {% 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">
                 <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>
@@ -38,7 +38,7 @@
                 {% endif %}
 
             </td>
-            <td>
+            <td data-value="{{ transaction.transaction_amount }}">
                 <!-- format amount of transaction -->
                 {{ formatAmountWithCode(transaction.transaction_amount, transaction.transaction_currency_code) }}
                 <!-- and then amount of journal itself. -->
@@ -47,7 +47,7 @@
 
 
             </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) }}
             </td>
         </tr>