diff --git a/home/models.py b/home/models.py index 0dd820799754e4973d361e97a2b3f77b53ce6f67..e8522ccaa97d7cbde5b54b44e3b73886b950d556 100644 --- a/home/models.py +++ b/home/models.py @@ -65,8 +65,22 @@ class InterludesActivity(models.Model): @property def nb_participants(self) -> str: if self.max_participants == 0: - return "Illimité" - return "{} - {}".format(self.min_paricipants, self.max_participants) + ret = "Illimités" + else: + ret = "{} - {}".format(self.min_participants, self.max_participants) + if self.must_subscribe: + ret += " (sur inscription)" + return ret + + @property + def pretty_duration(self) -> str: + hours, rem = divmod(self.duration.seconds, 3600) + minutes = "{:02}".format(rem // 60) if rem // 60 else "" + return "{}h{}".format(hours, minutes) + + @property + def pretty_type(self) -> str: + return self.Types(self.act_type).label def __str__(self): return self.title diff --git a/home/static/css/style.css b/home/static/css/style.css index 47c2ae616eb4a85eaf14e47e5d14060a4433f282..f191d57d9867871f8bb4bc7907f68633943c00d9 100644 --- a/home/static/css/style.css +++ b/home/static/css/style.css @@ -201,10 +201,11 @@ main a:link { dl { list-style: none; display: grid; - grid-template-columns: 1fr 4fr; + grid-template-columns: auto auto; + justify-content: left; + padding-left: 10px; } dl dt { - grid-column: 1 / span 1; justify-self: end; text-align: right; font-weight: bold; diff --git a/home/templates/activites.html b/home/templates/activites.html index a5170b69b99c6bb515165b565a8960974dd696c1..8d9ee0d05203330eaa81e9cdff8a28cfa23f96af 100644 --- a/home/templates/activites.html +++ b/home/templates/activites.html @@ -98,11 +98,12 @@ {% for activity in activities %} <h3 id="act-{{ activity.id }}"">{{ activity.title }}</h3> + {{ activity.html_display }} <dl> - <dt>Durée :</dt><dd>{{ activity.duration }}</dd> - <dt>MJ :</dt><dd>{{ activity.host_name }}</dd> - <dt>Nombre de places :</dt><dd>{{ activity.nb_participants }}</dd> - <dt>Sur inscription :</dt><dd>{% if activity.must_subscribe %} Oui {% else %} Non {% endif %}</dd> + <dt>Durée :</dt><dd>{{ activity.pretty_duration }}</dd> + <dt>Orga :</dt><dd>{{ activity.host_name }}</dd> + <dt>Type :</dt><dd>{{ activity.pretty_type }}</dd> + <dt>Places :</dt><dd>{{ activity.nb_participants }}</dd> <dt>Description :</dt><dd>{{ activity.description|linebreaksbr }}</dd> </dl> {% endfor %}