From b1ad0668cc5b8dd12f10fcb1ee8ecb4fca9412f2 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sat, 7 Apr 2018 05:58:59 +0200
Subject: [PATCH] Clean overview for bills.

---
 app/Http/Controllers/BillController.php |  9 +++++--
 resources/views/list/bills.twig         | 34 ++++++-------------------
 2 files changed, 15 insertions(+), 28 deletions(-)

diff --git a/app/Http/Controllers/BillController.php b/app/Http/Controllers/BillController.php
index 1aeeb7b8bb..0ce8312fcd 100644
--- a/app/Http/Controllers/BillController.php
+++ b/app/Http/Controllers/BillController.php
@@ -80,7 +80,7 @@ class BillController extends Controller
     {
         $periods = [];
         foreach (config('firefly.bill_periods') as $current) {
-            $periods[$current] = trans('firefly.' . $current);
+            $periods[$current] = strtolower((string)trans('firefly.repeat_freq_' . $current));
         }
         $subTitle = trans('firefly.create_new_bill');
 
@@ -186,6 +186,11 @@ class BillController extends Controller
                 return $transformer->transform($bill);
             }
         );
+        $bills = $bills->sortBy(
+            function (array $bill) {
+                return (int)!$bill['active'] . strtolower($bill['name']);
+            }
+        );
 
         $paginator->setPath(route('bills.index'));
 
@@ -238,7 +243,7 @@ class BillController extends Controller
         $overallAverage = $repository->getOverallAverage($bill);
         $manager        = new Manager();
         $manager->setSerializer(new DataArraySerializer());
-        $manager->parseIncludes(['attachments','notes']);
+        $manager->parseIncludes(['attachments', 'notes']);
 
         // Make a resource out of the data and
         $parameters = new ParameterBag();
diff --git a/resources/views/list/bills.twig b/resources/views/list/bills.twig
index 0d37fddde7..128476957b 100644
--- a/resources/views/list/bills.twig
+++ b/resources/views/list/bills.twig
@@ -7,11 +7,9 @@
         <th class="hidden-sm hidden-xs" data-defaultsort="disabled">&nbsp;</th>
         <th>{{ trans('list.name') }}</th>
         <th data-defaultsign="az" class="hidden-sm hidden-md hidden-xs">{{ trans('list.matchesOn') }}</th>
-        <th data-defaultsign="_19" colspan="2">{{ trans('list.matchingAmount') }}</th>
+        <th data-defaultsign="_19" style="text-align: right;">{{ trans('list.matchingAmount') }}</th>
         <th data-defaultsign="month" class="hidden-sm hidden-xs">{{ trans('list.paid_current_period') }}</th>
         <th data-defaultsign="month" class="hidden-sm hidden-xs">{{ trans('list.next_expected_match') }}</th>
-        <th class="hidden-sm hidden-xs hidden-md">{{ trans('list.active') }}</th>
-        <th class="hidden-sm hidden-xs hidden-md">{{ trans('list.automatch') }}</th>
         <th data-defaultsign="az" class="hidden-sm hidden-xs">{{ trans('list.repeat_freq') }}</th>
     </tr>
     </thead>
@@ -34,6 +32,9 @@
                                 class="fa fa-fw fa-trash-o"></i></a></div>
             </td>
             <td data-value="{{ entry.name }}">
+                {% if not entry.active %}
+                    <i class="fa fa-fw fa-ban"></i>
+                {% endif %}
                 <a href="{{ route('bills.show',entry.id) }}" title="{{ entry.name }}">{{ entry.name }}</a>
                 {# count attachments #}
                 {% if entry.attachments_count > 0 %}
@@ -47,13 +48,8 @@
                 {% endfor %}
             </td>
             <td data-value="{{ entry.amount_min }}" style="text-align: right;">
-                <span style="margin-right:5px;">
-                {{ entry.amount_min|formatAmount }}
-                </span>
-            </td>
-            <td data-value="{{ entry.amount_max }}" style="text-align: right;">
-                <span style="margin-right:5px;">
-                {{ entry.amount_max|formatAmount }}
+                <span style="margin-right:5px;" title="{{ entry.amount_min|formatAmountPlain }} - {{ entry.amount_max|formatAmountPlain }}">
+                    ~ {{ ((entry.amount_max+ entry.amount_min)/2)|formatAmount }}
                 </span>
             </td>
 
@@ -108,22 +104,8 @@
                     ~
                 </td>
             {% endif %}
-            <td class="hidden-sm hidden-xs hidden-md" data-value="{{ entry.active }}">
-                {% if entry.active %}
-                    <i class="fa fa-fw fa-check"></i>
-                {% else %}
-                    <i class="fa fa-fw fa-ban"></i>
-                {% endif %}
-            </td>
-            <td class="hidden-sm hidden-xs hidden-md" data-value="{{ entry.automatch }}">
-                {% if entry.automatch %}
-                    <i class="fa fa-fw fa-check"></i>
-                {% else %}
-                    <i class="fa fa-fw fa-ban"></i>
-                {% endif %}
-            </td>
             <td class="hidden-sm hidden-xs" data-value="{{ entry.repeat_freq }}{{ entry.skip }}">
-                {{ entry.repeat_freq|_ }}
+                {{ ('repeat_freq_'~entry.repeat_freq)|_ }}
                 {% if entry.skip > 0 %}
                     {{ 'skips_over'|_ }} {{ entry.skip }}
                 {% endif %}
@@ -174,7 +156,7 @@
         <td style="text-align:right;" colspan="3">{{ 'expected_total'|_ }} ({{ 'active_bills_only'|_ }})</td>
         <td style="text-align:right;" colspan="1">
             <span style="margin-right:5px;">
-                {{ expected_total|formatAmount }}
+                ~ {{ expected_total|formatAmount }}
             </span>
         </td>
         <td colspan="6">&nbsp;</td>