From cc2e374558bc4a920a6799d25f76a160ca9d757c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniele=20Vigan=C3=B2?= <daniele@vigano.me>
Date: Mon, 26 May 2025 00:04:07 +0200
Subject: [PATCH] Simplify cards, use icons for DCC

---
 ram/portal/templates/cards/roster.html | 29 ++++----------------------
 ram/portal/templates/rollingstock.html | 28 ++++++++++++++++---------
 ram/ram/__init__.py                    |  2 +-
 ram/roster/models.py                   | 16 +++++++++++++-
 4 files changed, 38 insertions(+), 37 deletions(-)

diff --git a/ram/portal/templates/cards/roster.html b/ram/portal/templates/cards/roster.html
index 4eecc96..b30456f 100644
--- a/ram/portal/templates/cards/roster.html
+++ b/ram/portal/templates/cards/roster.html
@@ -73,33 +73,12 @@
                     <th scope="row">Item number</th>
                     <td>{{ d.item.item_number }}{%if d.item.set %} | <a class="badge text-bg-primary" href="{% url 'manufacturer' manufacturer=d.item.manufacturer.slug search=d.item.item_number_slug %}">SET</a>{% endif %}</td>
                   </tr>
+                  <tr>
+                    <th scope="row">DCC</th>
+                    <td>{{ d.item.dcc|safe }}</td>
+                  </tr>
                 </tbody>
               </table>
-              {% if d.item.decoder or d.item.decoder_interface %}
-              <table class="table table-striped">
-                <thead>
-                  <tr>
-                    <th colspan="2" scope="row">DCC data</th>
-                  </tr>
-                </thead>
-                <tbody class="table-group-divider">
-                  <tr>
-                    <th class="w-33" scope="row">Interface</th>
-                    <td>{{ d.item.get_decoder_interface }}</td>
-                  </tr>
-                  {% if d.item.decoder %}
-                  <tr>
-                    <th scope="row">Decoder</th>
-                    <td>{{ d.item.decoder }}</td>
-                  </tr>
-                  <tr>
-                    <th scope="row">Address</th>
-                    <td>{{ d.item.address }}</td>
-                  </tr>
-                  {% endif %}
-                </tbody>
-              </table>
-              {% endif %}
               <div class="d-grid gap-2 mb-1 d-md-block">
                <a class="btn btn-sm btn-outline-primary" href="{{d.item.get_absolute_url}}">Show all data</a>
                 {% if request.user.is_staff %}<a class="btn btn-sm btn-outline-danger" href="{% url 'admin:roster_rollingstock_change' d.item.pk %}">Edit</a>{% endif %}
diff --git a/ram/portal/templates/rollingstock.html b/ram/portal/templates/rollingstock.html
index 60eca37..3bfc32f 100644
--- a/ram/portal/templates/rollingstock.html
+++ b/ram/portal/templates/rollingstock.html
@@ -153,7 +153,13 @@
                       {% if rolling_stock.decoder %}
                       <tr>
                         <th scope="row">Decoder</th>
-                        <td>{{ rolling_stock.decoder }}</td>
+                        <td>{{ rolling_stock.decoder }}
+                        {% if rolling_stock.decoder.sound %}
+                        | <span class="badge text-bg-secondary">
+                        <abbr title="Sound decoder"<i class="bi bi-volume-up-fill"></i></abbr>
+                        </span>
+                        {% endif %}
+                        </td>
                       </tr>
                       <tr>
                         <th scope="row">Address</th>
@@ -348,24 +354,26 @@
                         <td>{{ rolling_stock.get_decoder_interface }}</td>
                       </tr>
                       <tr>
-                        <th class="w-33" scope="row">Address</th>
-                        <td>{{ rolling_stock.address }}</td>
+                        <th scope="row">Manufacturer</th>
+                        <td>{{ rolling_stock.decoder.manufacturer | default:"-" }}</td>
                       </tr>
                       <tr>
                         <th scope="row">Name</th>
-                        <td>{{ rolling_stock.decoder.name }}</td>
-                      </tr>
-                      <tr>
-                        <th scope="row">Manufacturer</th>
-                        <td>{{ rolling_stock.decoder.manufacturer | default:"-" }}</td>
+                        <td>{{ rolling_stock.decoder.name }}
+                        {% if rolling_stock.decoder.sound %}
+                        | <span class="badge text-bg-secondary">
+                        <abbr title="Sound decoder"<i class="bi bi-volume-up-fill"></i></abbr>
+                        </span>
+                        {% endif %}
+                        </td>
                       </tr>
                       <tr>
                         <th scope="row">Version</th>
                         <td>{{ rolling_stock.decoder.version | default:"-"}}</td>
                       </tr>
                       <tr>
-                        <th scope="row">Sound</th>
-                        <td>{{ rolling_stock.decoder.sound | yesno:"Yes,No" }}</td>
+                        <th class="w-33" scope="row">Address</th>
+                        <td>{{ rolling_stock.address }}</td>
                       </tr>
                     </tbody>
                   </table>
diff --git a/ram/ram/__init__.py b/ram/ram/__init__.py
index 1cc3c4c..7e21cdd 100644
--- a/ram/ram/__init__.py
+++ b/ram/ram/__init__.py
@@ -1,4 +1,4 @@
 from ram.utils import git_suffix
 
-__version__ = "0.17.10"
+__version__ = "0.17.11"
 __version__ += git_suffix(__file__)
diff --git a/ram/roster/models.py b/ram/roster/models.py
index 27f374d..861c2a4 100644
--- a/ram/roster/models.py
+++ b/ram/roster/models.py
@@ -135,9 +135,23 @@ class RollingStock(BaseModel):
     def get_decoder_interface(self):
         return str(
             dict(settings.DECODER_INTERFACES).get(self.decoder_interface)
-            or "-"
+            or "No interface"
         )
 
+    def dcc(self):
+        if self.decoder:
+            dcc = (
+                '<i class="bi bi-volume-up-fill"></i>'
+                if self.decoder.sound
+                else '<i class="bi bi-cpu-fill"></i>'
+            )
+            dcc = f'<abbr title="{self.decoder} ({self.get_decoder_interface()})">{dcc}</abbr>'  # noqa: E501
+        elif self.decoder_interface:
+            dcc = f'<abbr title="{self.get_decoder_interface()}"><i class="bi bi-cpu"></i></abbr>'  # noqa: E501
+        else:
+            dcc = f'<abbr title="{self.get_decoder_interface()}"><i class="bi bi-ban"></i></abbr>'  # noqa: E501
+        return dcc
+
     @property
     def country(self):
         return self.rolling_class.company.country