diff --git a/proposals/models.py b/proposals/models.py index abe0ca8..a21a6d4 100644 --- a/proposals/models.py +++ b/proposals/models.py @@ -1,4 +1,5 @@ from enum import IntEnum +from datetime import timedelta from django.contrib.auth.models import User from django.contrib.sites.models import Site @@ -162,6 +163,11 @@ class Talk(PonyConfModel): else: return 0 + + @property + def end_date(self): + return self.start_date + timedelta(minutes=self.duration) + class Meta: ordering = ('event__id',) diff --git a/proposals/templates/proposals/talk_detail.html b/proposals/templates/proposals/talk_detail.html index 6167041..efefe7c 100644 --- a/proposals/templates/proposals/talk_detail.html +++ b/proposals/templates/proposals/talk_detail.html @@ -19,7 +19,7 @@
{% trans "Format" %}
{{ talk.event }}
-
{% trans "Topics:" %}
+
{% trans "Topics" %}
{% for topic in talk.topics.all %} {{ topic }}{% if not forloop.last %}, {% endif %} {% empty %} @@ -37,7 +37,7 @@
{% if talk.start_date %} {{ talk.start_date|date:"l d b" }}, {{ talk.start_date|date:"H:i" }} – - {{ talk.slot.end|date:"H:i" }} + {{ talk.end_date|date:"H:i" }} {% else %}{% trans "not defined" %} {% endif %}