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 @@
Show all data
{% if request.user.is_staff %}
Edit{% 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 %}
Decoder |
- {{ rolling_stock.decoder }} |
+ {{ rolling_stock.decoder }}
+ {% if rolling_stock.decoder.sound %}
+ |
+
+
+ {% endif %}
+ |
Address |
@@ -348,24 +354,26 @@
{{ rolling_stock.get_decoder_interface }} |
- Address |
- {{ rolling_stock.address }} |
+ Manufacturer |
+ {{ rolling_stock.decoder.manufacturer | default:"-" }} |
Name |
- {{ rolling_stock.decoder.name }} |
-
-
- Manufacturer |
- {{ rolling_stock.decoder.manufacturer | default:"-" }} |
+ {{ rolling_stock.decoder.name }}
+ {% if rolling_stock.decoder.sound %}
+ |
+
+
+ {% endif %}
+ |
Version |
{{ rolling_stock.decoder.version | default:"-"}} |
- Sound |
- {{ rolling_stock.decoder.sound | yesno:"Yes,No" }} |
+ Address |
+ {{ rolling_stock.address }} |
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 = (
+ '
'
+ if self.decoder.sound
+ else '
'
+ )
+ dcc = f'
{dcc}' # noqa: E501
+ elif self.decoder_interface:
+ dcc = f'
' # noqa: E501
+ else:
+ dcc = f'
' # noqa: E501
+ return dcc
+
@property
def country(self):
return self.rolling_class.company.country