From 97989c3384bcf4009bce25be7381f51d30595e35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniele=20Vigan=C3=B2?= <daniele@vigano.me>
Date: Tue, 17 Oct 2023 13:44:30 +0200
Subject: [PATCH] Improve UX and filtering

---
 ram/portal/templates/base.html                | 36 +++++++++----------
 ram/portal/templates/cards.html               |  2 +-
 .../cards/{rolling_stock.html => roster.html} |  0
 ram/portal/templates/rollingstock.html        |  2 +-
 ram/portal/views.py                           |  5 ++-
 ram/ram/__init__.py                           |  2 +-
 ram/ram/urls.py                               |  4 +++
 7 files changed, 28 insertions(+), 23 deletions(-)
 rename ram/portal/templates/cards/{rolling_stock.html => roster.html} (100%)

diff --git a/ram/portal/templates/base.html b/ram/portal/templates/base.html
index c16101b..97126fc 100644
--- a/ram/portal/templates/base.html
+++ b/ram/portal/templates/base.html
@@ -151,29 +151,27 @@
             </button>
             <div class="collapse navbar-collapse" id="navbarSupportedContent">
               <ul class="navbar-nav me-auto mb-2 mb-lg-0">
-                <li class="nav-item dropdown">
-                  <a class="nav-link dropdown-toggle" href="#" id="rosterDropdownMenu" role="button" data-bs-toggle="dropdown" aria-expanded="false">
-                    Roster
-                  </a>
-                  <ul class="dropdown-menu" aria-labelledby="rosterDropdownMenu">
-                    <li><a class="dropdown-item" href="{% url 'roster' %}">Rolling stock</a></li>
-                    <li><a class="dropdown-item" href="{% url 'companies' %}">Companies</a></li>
-                    <li><a class="dropdown-item" href="{% url 'types' %}">Types</a></li>
-                    <li><a class="dropdown-item" href="{% url 'scales' %}">Scales</a></li>
-                  </ul>
-                </li>
-                <li class="nav-item dropdown">
-                  <a class="nav-link dropdown-toggle" href="#" id="manufacturersDropdownMenu" role="button" data-bs-toggle="dropdown" aria-expanded="false">
-                    Manufacturers
-                  </a>
-                  <ul class="dropdown-menu" aria-labelledby="manufacturersDropdownMenu">
-                    <li><a class="dropdown-item" href="{% url 'manufacturers' category='model' %}">Models</a></li>
-                    <li><a class="dropdown-item" href="{% url 'manufacturers' category='real' %}">Real</a></li>
-                  </ul>
+                <li class="nav-item">
+                  <a class="nav-link" href="{% url 'roster' %}">Roster</a>
                 </li>
                 <li class="nav-item">
                   <a class="nav-link" href="{% url 'consists' %}">Consists</a>
                 </li>
+                <li class="nav-item dropdown">
+                  <a class="nav-link dropdown-toggle" href="#" id="filterDropdownMenu" role="button" data-bs-toggle="dropdown" aria-expanded="false">
+                    Search by
+                  </a>
+                  <ul class="dropdown-menu" aria-labelledby="filterDropdownMenu">
+                    <li class="ps-2 text-secondary">Model</li>
+                    <li><a class="dropdown-item" href="{% url 'scales' %}">Scale</a></li>
+                    <li><a class="dropdown-item" href="{% url 'manufacturers' category='model' %}">Manufacturer</a></li>
+                    <li><hr class="dropdown-divider"></li>
+                    <li class="ps-2 text-secondary">Prototype</li>
+                    <li><a class="dropdown-item" href="{% url 'types' %}">Type</a></li>
+                    <li><a class="dropdown-item" href="{% url 'companies' %}">Company</a></li>
+                    <li><a class="dropdown-item" href="{% url 'manufacturers' category='real' %}">Manufacturer</a></li>
+                  </ul>
+                </li>
                 {% show_bookshelf_menu %}
                 {% show_flatpages_menu %}
               </ul>
diff --git a/ram/portal/templates/cards.html b/ram/portal/templates/cards.html
index 4a0a790..cef0722 100644
--- a/ram/portal/templates/cards.html
+++ b/ram/portal/templates/cards.html
@@ -7,7 +7,7 @@
       {% block cards %}
         {% for d in data %}
         {% if d.type == "rolling_stock" %}
-        {% include "cards/rolling_stock.html" %}
+        {% include "cards/roster.html" %}
         {% elif d.type == "company" %}
         {% include "cards/company.html" %}
         {% elif d.type == "rolling_stock_type" %}
diff --git a/ram/portal/templates/cards/rolling_stock.html b/ram/portal/templates/cards/roster.html
similarity index 100%
rename from ram/portal/templates/cards/rolling_stock.html
rename to ram/portal/templates/cards/roster.html
diff --git a/ram/portal/templates/rollingstock.html b/ram/portal/templates/rollingstock.html
index a08ab12..47e6345 100644
--- a/ram/portal/templates/rollingstock.html
+++ b/ram/portal/templates/rollingstock.html
@@ -358,7 +358,7 @@
                   {{ rolling_stock.notes | safe }}
                 </div>
                 <div class="tab-pane" id="nav-consists" role="tabpanel" aria-labelledby="nav-cosists-tab">
-                  <div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 g-3">
+                  <div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 g-3 mb-3">
                   {% for d in consists %}
                   {% include "cards/consist.html" %}
                   {% endfor %}
diff --git a/ram/portal/views.py b/ram/portal/views.py
index 0ccbd9e..b2595e1 100644
--- a/ram/portal/views.py
+++ b/ram/portal/views.py
@@ -78,7 +78,7 @@ class GetData(View):
 
 
 class GetRoster(GetData):
-    title = "Rolling stock"
+    title = "Roster"
     item_type = "rolling_stock"
     queryset = RollingStock.objects.order_by(*order_by_fields())
 
@@ -234,6 +234,9 @@ class GetRosterFiltered(View):
         elif _filter == "scale":
             title = get_object_or_404(Scale, slug__iexact=search)
             query = Q(scale__slug__iexact=search)
+            query_2nd = Q(
+                consist_item__rolling_stock__scale__slug__iexact=search
+            )
         elif _filter == "tag":
             title = get_object_or_404(Tag, slug__iexact=search)
             query = Q(tags__slug__iexact=search)
diff --git a/ram/ram/__init__.py b/ram/ram/__init__.py
index b6ec74c..17e4b5b 100644
--- a/ram/ram/__init__.py
+++ b/ram/ram/__init__.py
@@ -1,4 +1,4 @@
 from ram.utils import git_suffix
 
-__version__ = "0.8.0"
+__version__ = "0.9.0"
 __version__ += git_suffix(__file__)
diff --git a/ram/ram/urls.py b/ram/ram/urls.py
index e58db03..3759359 100644
--- a/ram/ram/urls.py
+++ b/ram/ram/urls.py
@@ -60,3 +60,7 @@ if settings.DEBUG:
             name="openapi-schema",
         ),
     ]
+    if apps.is_installed("debug_toolbar"):
+        urlpatterns += [
+            path("__debug__/", include("debug_toolbar.urls")),
+        ]