From 7865bf04f012c495a4cd6bda43404e4fd048b7d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniele=20Vigan=C3=B2?= <daniele@vigano.me>
Date: Mon, 16 Oct 2023 22:48:46 +0200
Subject: [PATCH] Add consists view in rolling stock and them in company filter

---
 ram/portal/static/css/main.css          |  5 ++
 ram/portal/templates/base.html          |  6 +--
 ram/portal/templates/cards/company.html |  2 +-
 ram/portal/templates/cards/consist.html |  2 +-
 ram/portal/templates/consist.html       |  4 +-
 ram/portal/templates/rollingstock.html  | 70 ++++++++++++++++++-------
 ram/portal/views.py                     | 35 +++++++++----
 ram/ram/__init__.py                     |  2 +-
 8 files changed, 89 insertions(+), 37 deletions(-)

diff --git a/ram/portal/static/css/main.css b/ram/portal/static/css/main.css
index c83f1d9..324fa29 100644
--- a/ram/portal/static/css/main.css
+++ b/ram/portal/static/css/main.css
@@ -12,6 +12,11 @@ td > img.logo {
   max-height: 48px;
 }
 
+td > img.logo-xl {
+  max-width: 400px;
+  max-height: 96px;
+}
+
 .btn > span {
   display: inline-block;
 }
diff --git a/ram/portal/templates/base.html b/ram/portal/templates/base.html
index 4aeb7da..c16101b 100644
--- a/ram/portal/templates/base.html
+++ b/ram/portal/templates/base.html
@@ -162,9 +162,6 @@
                     <li><a class="dropdown-item" href="{% url 'scales' %}">Scales</a></li>
                   </ul>
                 </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="manufacturersDropdownMenu" role="button" data-bs-toggle="dropdown" aria-expanded="false">
                     Manufacturers
@@ -174,6 +171,9 @@
                     <li><a class="dropdown-item" href="{% url 'manufacturers' category='real' %}">Real</a></li>
                   </ul>
                 </li>
+                <li class="nav-item">
+                  <a class="nav-link" href="{% url 'consists' %}">Consists</a>
+                </li>
                 {% show_bookshelf_menu %}
                 {% show_flatpages_menu %}
               </ul>
diff --git a/ram/portal/templates/cards/company.html b/ram/portal/templates/cards/company.html
index 3157a9e..558b389 100644
--- a/ram/portal/templates/cards/company.html
+++ b/ram/portal/templates/cards/company.html
@@ -14,7 +14,7 @@
                 {% if d.item.logo %}
                 <tr>
                   <th class="w-33" scope="row">Logo</th>
-                  <td><img style="max-height: 48px" src="{{ d.item.logo.url }}" /></td>
+                  <td><img class="logo" src="{{ d.item.logo.url }}" /></td>
                 </tr>
                 {% endif %}
                 <tr>
diff --git a/ram/portal/templates/cards/consist.html b/ram/portal/templates/cards/consist.html
index b8cfc31..2fad777 100644
--- a/ram/portal/templates/cards/consist.html
+++ b/ram/portal/templates/cards/consist.html
@@ -44,7 +44,7 @@
                 </tr>
                 <tr>
                   <th scope="row">Length</th>
-                  <td>{{ d.item.consist_item.all | length }}</td>
+                  <td>{{ d.item.consist_item.count }}</td>
                 </tr>
               </tbody>
             </table>
diff --git a/ram/portal/templates/consist.html b/ram/portal/templates/consist.html
index 4328606..87a5010 100644
--- a/ram/portal/templates/consist.html
+++ b/ram/portal/templates/consist.html
@@ -81,7 +81,9 @@
                   <tbody class="table-group-divider">
                     <tr>
                       <th class="w-33" scope="row">Company</th>
-                      <td><abbr title="{{ consist.company.extended_name }}">{{ consist.company }}</abbr></td>
+                      <td>
+                        <a href="{% url 'filtered' _filter="company" search=consist.company.slug %}">{{ consist.company }}</a> ({{ consist.company.extended_name }})
+                      </td>
                     </tr>
                     <tr>
                       <th scope="row">Era</th>
diff --git a/ram/portal/templates/rollingstock.html b/ram/portal/templates/rollingstock.html
index a96cc08..a08ab12 100644
--- a/ram/portal/templates/rollingstock.html
+++ b/ram/portal/templates/rollingstock.html
@@ -45,13 +45,16 @@
             <div class="mx-auto">
               <nav class="nav nav-tabs flex-column flex-md-row mb-2" id="nav-tab">
                 <button class="nav-link active" id="nav-summary-tab" data-bs-toggle="tab" data-bs-target="#nav-summary" type="button" role="tab" aria-controls="nav-summary" aria-selected="true">Summary</button>
-                <button class="nav-link" id="nav-model-tab" data-bs-toggle="tab" data-bs-target="#nav-model" type="button" role="tab" aria-controls="nav-model" aria-selected="false">Model data</button>
-                <button class="nav-link" id="nav-class-tab" data-bs-toggle="tab" data-bs-target="#nav-class" type="button" role="tab" aria-controls="nav-class" aria-selected="false">Class data</button>
+                <button class="nav-link" id="nav-model-tab" data-bs-toggle="tab" data-bs-target="#nav-model" type="button" role="tab" aria-controls="nav-model" aria-selected="false">Model</button>
+                <button class="nav-link" id="nav-class-tab" data-bs-toggle="tab" data-bs-target="#nav-class" type="button" role="tab" aria-controls="nav-class" aria-selected="false">Class</button>
+                <button class="nav-link" id="nav-company-tab" data-bs-toggle="tab" data-bs-target="#nav-company" type="button" role="tab" aria-controls="nav-company" aria-selected="false">Company</button>
                 {% if rolling_stock.decoder %}<button class="nav-link" id="nav-dcc-tab" data-bs-toggle="tab" data-bs-target="#nav-dcc" type="button" role="tab" aria-controls="nav-dcc" aria-selected="false">DCC</button>{% endif %}
                 {% if documents or decoder_documents %}<button class="nav-link" id="nav-documents-tab" data-bs-toggle="tab" data-bs-target="#nav-documents" type="button" role="tab" aria-controls="nav-documents" aria-selected="false">Documents</button>{% endif %}
                 {% if journal %}<button class="nav-link" id="nav-journal-tab" data-bs-toggle="tab" data-bs-target="#nav-journal" type="button" role="tab" aria-controls="nav-journal" aria-selected="false">Journal</button>{% endif %}
                 {% if rolling_stock.notes %}<button class="nav-link" id="nav-notes-tab" data-bs-toggle="tab" data-bs-target="#nav-notes" type="button" role="tab" aria-controls="nav-notes" aria-selected="false">Notes</button>{% endif %}
+                {% if consists %}<button class="nav-link" id="nav-consists-tab" data-bs-toggle="tab" data-bs-target="#nav-consists" type="button" role="tab" aria-controls="nav-consists" aria-selected="false">Consists</button>{% endif %}
               </nav>
+              {% with class=rolling_stock.rolling_class company=rolling_stock.rolling_class.company %}
               <div class="tab-content" id="nav-tabContent">
                 <div class="tab-pane show active" id="nav-summary" role="tabpanel" aria-labelledby="nav-summary-tab">
                   <table class="table table-striped">
@@ -63,17 +66,17 @@
                     <tbody class="table-group-divider">
                       <tr>
                         <th class="w-33" scope="row">Type</th>
-                        <td>{{ rolling_stock.rolling_class.type }}</td>
+                        <td>{{ class.type }}</td>
                       </tr>
                       <tr>
                         <th scope="row">Company</th>
                         <td>
-                            <a href="{% url 'filtered' _filter="company" search=rolling_stock.rolling_class.company.slug %}"><abbr title="{{ rolling_stock.rolling_class.company.extended_name }}">{{ rolling_stock.rolling_class.company }}</abbr></a>
+                            <a href="{% url 'filtered' _filter="company" search=company.slug %}">{{ company }}</a> ({{ company.extended_name }})
                         </td>
                       </tr>
                       <tr>
                         <th scope="row">Class</th>
-                        <td>{{ rolling_stock.rolling_class.identifier }}</td>
+                        <td>{{ class.identifier }}</td>
                       </tr>
                       <tr>
                         <th scope="row">Road number</th>
@@ -198,26 +201,16 @@
                     <tbody class="table-group-divider">
                       <tr>
                         <th class="w-33" scope="row">Class</th>
-                        <td>{{ rolling_stock.rolling_class.identifier }}</td>
+                        <td>{{ class.identifier }}</td>
                       </tr>
                       <tr>
                         <th scope="row">Type</th>
-                        <td>{{ rolling_stock.rolling_class.type }}</td>
-                      </tr>
-                      <tr>
-                        <th scope="row">Company</th>
-                        <td>
-                            <a href="{% url 'filtered' _filter="company" search=rolling_stock.rolling_class.company.slug %}">{{ rolling_stock.rolling_class.company }}</a> ({{ rolling_stock.rolling_class.company.extended_name }})
-                        </td>
-                      </tr>
-                      <tr>
-                        <th scope="row">Country</th>
-                        <td>{{ rolling_stock.rolling_class.company.country.name }}</td>
+                        <td>{{ class.type }}</td>
                       </tr>
                       <tr>
                         <th scope="row">Manufacturer</th>
-                        <td>{%if rolling_stock.rolling_class.manufacturer %}
-                          <a href="{% url 'filtered' _filter="manufacturer" search=rolling_stock.rolling_class.manufacturer.slug %}">{{ rolling_stock.rolling_class.manufacturer }}{% if rolling_stock.rolling_class.manufacturer.website %}</a> <a href="{{ rolling_stock.rolling_class.manufacturer.website }}" target="_blank"><i class="bi bi-box-arrow-up-right"></i></a>{% endif %}
+                        <td>{%if class.manufacturer %}
+                          <a href="{% url 'filtered' _filter="manufacturer" search=class.manufacturer.slug %}">{{ class.manufacturer }}{% if class.manufacturer.website %}</a> <a href="{{ class.manufacturer.website }}" target="_blank"><i class="bi bi-box-arrow-up-right"></i></a>{% endif %}
                         {% endif %}</td>
                       </tr>
                     </tbody>
@@ -240,6 +233,37 @@
                   </table>
                   {% endif %}
                 </div>
+                <div class="tab-pane" id="nav-company" role="tabpanel" aria-labelledby="nav-company-tab">
+                  <table class="table table-striped">
+                    <thead>
+                      <tr>
+                        <th colspan="2" scope="row">Company data</th>
+                      </tr>
+                    </thead>
+                    <tbody class="table-group-divider">
+                      {% if company.logo %}
+                      <tr>
+                        <th class="w-33" scope="row">Logo</th>
+                        <td><img class="logo-xl" src="{{ company.logo.url }}" /></td>
+                      </tr>
+                      {% endif %}
+                      <tr>
+                        <th class="w-33" scope="row">Name</th>
+                        <td><a href="{% url 'filtered' _filter="company" search=company.slug %}">{{ company.name }}</a> ({{ company.extended_name }})</td>
+                      </tr>
+                      <tr>
+                        <th class="w-33" scope="row">Country</th>
+                        <td>{{ company.country.name }} <img src="{{ company.country.flag }}" alt="{{ company.country }}" />
+                      </tr>
+                      {% if company.freelance %}
+                      <tr>
+                        <th class="w-33" scope="row">Notes</th>
+                        <td>A <em>freelance</em> company</td>
+                      </tr>
+                      {% endif %}
+                    </tbody>
+                  </table>
+                </div>
                 <div class="tab-pane" id="nav-dcc" role="tabpanel" aria-labelledby="nav-dcc-tab">
                   <table class="table table-striped">
                     <thead>
@@ -333,7 +357,15 @@
                 <div class="tab-pane" id="nav-notes" role="tabpanel" aria-labelledby="nav-notes-tab">
                   {{ 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">
+                  {% for d in consists %}
+                  {% include "cards/consist.html" %}
+                  {% endfor %}
+                  </div>
+                </div>
               </div>
+              {% endwith %}
               <div class="d-grid gap-2 d-md-flex justify-content-md-end">
                 {% if request.user.is_staff %}<a class="btn btn-sm btn-outline-danger" href="{% url 'admin:roster_rollingstock_change' rolling_stock.pk %}">Edit</a>{% endif %}
               </div>
diff --git a/ram/portal/views.py b/ram/portal/views.py
index 9233161..0ccbd9e 100644
--- a/ram/portal/views.py
+++ b/ram/portal/views.py
@@ -224,6 +224,7 @@ class GetRosterFiltered(View):
         elif _filter == "company":
             title = get_object_or_404(Company, slug__iexact=search)
             query = Q(rolling_class__company__slug__iexact=search)
+            query_2nd = Q(company__slug__iexact=search)
         elif _filter == "manufacturer":
             title = get_object_or_404(Manufacturer, slug__iexact=search)
             query = Q(
@@ -236,6 +237,7 @@ class GetRosterFiltered(View):
         elif _filter == "tag":
             title = get_object_or_404(Tag, slug__iexact=search)
             query = Q(tags__slug__iexact=search)
+            query_2nd = query  # For tags the 2nd level query doesn't change
         else:
             raise Http404
 
@@ -252,9 +254,9 @@ class GetRosterFiltered(View):
                 "item": item
             })
 
-        if _filter == "tag":
+        try:  # Execute only if query_2nd is defined
             consists = (
-                Consist.objects.filter(query)
+                Consist.objects.filter(query_2nd)
                 .distinct()
             )
             for item in consists:
@@ -262,15 +264,18 @@ class GetRosterFiltered(View):
                     "type": "consist",
                     "item": item
                 })
-            books = (
-                Book.objects.filter(query)
-                .distinct()
-            )
-            for item in books:
-                data.append({
-                    "type": "book",
-                    "item": item
-                })
+            if _filter == "tag":  # Books can be filtered only by tag
+                books = (
+                    Book.objects.filter(query_2nd)
+                    .distinct()
+                )
+                for item in books:
+                    data.append({
+                        "type": "book",
+                        "item": item
+                    })
+        except NameError:
+            pass
 
         paginator = Paginator(data, site_conf.items_per_page)
         data = paginator.get_page(page)
@@ -331,6 +336,13 @@ class GetRollingStock(View):
                     private=False
                 )
 
+        consists = [{
+            "type": "consist",
+            "item": c
+        } for c in Consist.objects.filter(
+            consist_item__rolling_stock=rolling_stock
+        )]  # A dict with "item" is required by the consists card
+
         return render(
             request,
             "rollingstock.html",
@@ -342,6 +354,7 @@ class GetRollingStock(View):
                 "decoder_documents": decoder_documents,
                 "documents": documents,
                 "journal": journal,
+                "consists": consists,
             },
         )
 
diff --git a/ram/ram/__init__.py b/ram/ram/__init__.py
index 4052415..b6ec74c 100644
--- a/ram/ram/__init__.py
+++ b/ram/ram/__init__.py
@@ -1,4 +1,4 @@
 from ram.utils import git_suffix
 
-__version__ = "0.7.1"
+__version__ = "0.8.0"
 __version__ += git_suffix(__file__)