From bf0ffc52f22888aea45e0ec86a80ed4b2b6f38da Mon Sep 17 00:00:00 2001
From: Thomas Rusiecki <rusieckithomas@gmail.com>
Date: Fri, 21 Feb 2025 20:45:39 -0300
Subject: [PATCH] better filter dropdown

---
 lot/templates/lots.html | 50 +++++++++++++++++++++++------------------
 lot/views.py            |  9 +++++---
 2 files changed, 34 insertions(+), 25 deletions(-)

diff --git a/lot/templates/lots.html b/lot/templates/lots.html
index 47c9ce6..5b4a6b6 100644
--- a/lot/templates/lots.html
+++ b/lot/templates/lots.html
@@ -28,33 +28,39 @@
     </form>
   </div>
 
-  <!-- Filter Dropdown -->
-  <div class="col-md-6 text-md-end">
-    <div class="dropdown">
-      <button class="btn btn-outline-secondary dropdown-toggle" type="button" id="filterDropdown" data-bs-toggle="dropdown" aria-expanded="false">
-        <i class="bi bi-filter me-2"></i>
-        {% trans 'Filter' %}
-      </button>
-      <ul class="dropdown-menu" aria-labelledby="filterDropdown">
+<div class="col-md-6 text-md-end">
+  <div class="dropdown">
+    <button class="btn btn-outline-secondary dropdown-toggle" type="button" id="filterDropdown" data-bs-toggle="dropdown" aria-expanded="false">
+      <i class="bi bi-filter me-2"></i>
+      {% trans 'Filter' %}
+    </button>
+    <ul class="dropdown-menu" aria-labelledby="filterDropdown">
 
-        <li>
-          <a class="dropdown-item {% if show_closed %}border border-info rounded{% endif %} " href="?show_closed={% if show_closed %}false{% else %}true{% endif %}{% if search_query %}&q={{ search_query }}{% endif %}">
-            {% trans 'Closed Lots' %}
-            {% if show_closed %}<i class="bi bi-check"></i>{% endif %}
-          </a>
-        </li>
+      <li>
+        <a class="dropdown-item" href="?{% if search_query %}q={{ search_query }}&{% endif %}show_closed=false">
+          {% trans 'Open Lots' %}
+          {% if show_closed == 'false' %}<i class="bi bi-check"></i>{% endif %}
+        </a>
+      </li>
 
-        <li>
-          <a class="dropdown-item" href="?{% if search_query %}q={{ search_query }}{% endif %}">
-            {% trans 'Clear Filters' %}
-          </a>
-        </li>
-      </ul>
-    </div>
+      <li>
+        <a class="dropdown-item" href="?{% if search_query %}q={{ search_query }}&{% endif %}show_closed=true">
+          {% trans 'Closed Lots' %}
+          {% if show_closed == 'true' %}<i class="bi bi-check"></i>{% endif %}
+        </a>
+      </li>
+
+      <li>
+        <a class="dropdown-item" href="?{% if search_query %}q={{ search_query }}&{% endif %}show_closed=both">
+          {% trans 'All Lots' %}
+          {% if show_closed == 'both' %}<i class="bi bi-check"></i>{% endif %}
+        </a>
+      </li>
+
+     </ul>
   </div>
 </div>
 
-  <!-- Lots Table -->
 {% render_table table %}
 <div class="mt-5 d-flex align-items-center justify-content-center">
   {% if table.page and table.paginator.num_pages > 1 %}
diff --git a/lot/views.py b/lot/views.py
index 5c34539..324f09f 100644
--- a/lot/views.py
+++ b/lot/views.py
@@ -172,13 +172,16 @@ class LotsTagsView(DashboardView, tables.SingleTableView):
     def get_queryset(self):
         self.pk = self.kwargs.get('pk')
         self.tag = get_object_or_404(LotTag, owner=self.request.user.institution, id=self.pk)
-        self.show_closed = self.request.GET.get('show_closed', 'false') == 'true'
+        self.show_open = self.request.GET.get('show_open', 'false') == 'true'
+        self.show_closed = self.request.GET.get('show_closed', 'false')
         self.search_query = self.request.GET.get('q', '').strip()
 
         queryset = Lot.objects.filter(owner=self.request.user.institution, type=self.tag)
 
-        if not self.show_closed:
+        if self.show_closed == 'true':
             queryset = queryset.filter(closed=True)
+        elif self.show_closed == 'false':
+            queryset = queryset.filter(closed=False)
 
         if self.search_query:
             queryset = queryset.filter(
@@ -200,7 +203,7 @@ class LotsTagsView(DashboardView, tables.SingleTableView):
             'title': self.title + " " + self.tag.name,
             'breadcrumb': self.breadcrumb + " " + self.tag.name,
             'show_closed': self.show_closed,
-            'search_query': self.search_query,  # Pass the search query to the template
+            'search_query': self.search_query,
         })
         return context