From f80f74a01abd92854593218e03fdc3955688ebbf Mon Sep 17 00:00:00 2001
From: Herculino Trotta <netotrotta@gmail.com>
Date: Wed, 6 Aug 2025 11:45:43 -0300
Subject: [PATCH] refactor(transactions:all): reduce screen state by moving
 filter to top

---
 .../transactions/pages/transactions.html      | 87 ++++++++++---------
 1 file changed, 48 insertions(+), 39 deletions(-)

diff --git a/app/templates/transactions/pages/transactions.html b/app/templates/transactions/pages/transactions.html
index a06ea13..0ce989f 100644
--- a/app/templates/transactions/pages/transactions.html
+++ b/app/templates/transactions/pages/transactions.html
@@ -5,47 +5,56 @@
 {% block title %}{% translate 'Transactions' %}{% endblock %}
 
 {% block content %}
-<div class="container-fluid px-md-3 py-3 column-gap-5">
-  <div class="row gx-xl-4 gy-3">
-    <div class="col-12 col-xl-3 order-0 order-xl-0">
-      {#      Filter transactions#}
-      <div class="row mb-1">
-          <div class="col-12">
-            <div class="d-flex mb-3 align-self-center">
-              <div class="me-auto"><h4><i class="fa-solid fa-filter me-2"></i>{% translate 'Filter' %}</h4></div>
-              <div class="align-self-center">
-                <button class="btn btn-outline-danger btn-sm" _="on click call #filter.reset() then trigger change on #filter">{% translate 'Clear' %}</button>
-              </div>
+  <div class="container px-md-3 py-3 column-gap-5">
+    <div class="row gx-xl-4 gy-3">
+      <div class="col-12 col-xl-8 order-2 order-xl-1">
+        <div class="row mb-1">
+          <div class="col-sm-6 col-12">
+            {#        Filter transactions button #}
+            <button type="button" class="btn btn-sm btn-outline-primary dropdown-toggle" type="button"
+                    data-bs-toggle="collapse" data-bs-target="#collapse-filter" aria-expanded="false"
+                    aria-controls="collapse-filter">
+              <i class="fa-solid fa-filter fa-fw me-2"></i>{% translate 'Filter transactions' %}
+            </button>
+          </div>
+          {#        Ordering button#}
+          <div class="col-sm-6 col-12 tw:content-center my-3 my-sm-0">
+            <div class="text-sm-end" _="on change trigger updated on window">
+              <label for="order">{% translate "Order by" %}</label>
+              <select
+                  class="tw:border-0 tw:focus-visible:outline-0 w-full pe-2 tw:leading-normal text-bg-tertiary tw:font-medium rounded bg-body text-body"
+                  name="order" id="order">
+                <option value="default"
+                        {% if order == 'default' %}selected{% endif %}>{% translate 'Default' %}</option>
+                <option value="older"
+                        {% if order == 'older' %}selected{% endif %}>{% translate 'Oldest first' %}</option>
+                <option value="newer"
+                        {% if order == 'newer' %}selected{% endif %}>{% translate 'Newest first' %}</option>
+              </select>
             </div>
-            <hr>
-            <form hx-get="{% url 'transactions_all_list' %}" hx-trigger="change, submit, search"
-                    hx-target="#transactions" id="filter" hx-indicator="#transactions"
-                    _="install init_tom_select
-                       install init_datepicker">
-                {% crispy filter.form %}
-            </form>
           </div>
         </div>
-    </div>
-    <div class="col-12 col-xl-6 order-2 order-xl-1">
-      <div class="text-end tw:justify-end tw:flex tw:text-sm mb-3">
-        <div class="tw:content-center" _="on change trigger updated on window">
-          <label for="order">{% translate "Order by" %}</label>
-          <select class="tw:border-0 tw:focus-visible:outline-0 w-full pe-2 tw:leading-normal text-bg-tertiary tw:font-medium rounded bg-body text-body" name="order" id="order">
-            <option value="default" {% if order == 'default' %}selected{% endif %}>{% translate 'Default' %}</option>
-            <option value="older" {% if order == 'older' %}selected{% endif %}>{% translate 'Oldest first' %}</option>
-            <option value="newer" {% if order == 'newer' %}selected{% endif %}>{% translate 'Newest first' %}</option>
-          </select>
+        {#      Filter transactions form#}
+        <div class="collapse" id="collapse-filter">
+          <div class="card card-body">
+            <form _="on change or submit or search trigger updated on window end
+                   install init_tom_select
+                   install init_datepicker"
+                  id="filter">
+              {% crispy filter.form %}
+            </form>
+            <button class="btn btn-outline-danger btn-sm"
+                    _="on click call #filter.reset() then trigger change on #filter">{% translate 'Clear' %}</button>
+          </div>
+        </div>
+        <div id="transactions"
+             class="show-loading"
+             hx-get="{% url 'transactions_all_list' %}"
+             hx-trigger="load, updated from:window" hx-include="#filter, #page, #order">
         </div>
       </div>
-      <div id="transactions"
-           class="show-loading"
-           hx-get="{% url 'transactions_all_list' %}"
-           hx-trigger="load, updated from:window" hx-include="#filter, #page, #order">
-      </div>
-    </div>
-    <div class="col-12 col-xl-3 order-1 order-xl-2">
-      <ul class="nav nav-tabs" id="all-transactions-summary" role="tablist">
+      <div class="col-12 col-xl-4 order-1 order-xl-2">
+        <ul class="nav nav-tabs" id="all-transactions-summary" role="tablist">
           <li class="nav-item" role="presentation">
             <button class="nav-link {% if summary_tab == 'currency' %}active{% endif %}"
                     id="currency-tab"
@@ -73,7 +82,7 @@
             </button>
           </li>
         </ul>
-      <div class="tab-content" id="all-transactions-content">
+        <div class="tab-content" id="all-transactions-content">
           <div class="tab-pane fade {% if summary_tab == 'currency' %}show active{% endif %}"
                id="currency-tab-pane"
                role="tabpanel"
@@ -98,9 +107,9 @@
                  hx-include="#filter">
             </div>
           </div>
+        </div>
       </div>
     </div>
   </div>
-</div>
-<c-ui.transactions_fab></c-ui.transactions_fab>
+  <c-ui.transactions_fab></c-ui.transactions_fab>
 {% endblock %}