From 67c8412ab3c880a59ece2b0df8a15fe3fe9fe2ed Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Wed, 10 Aug 2022 09:43:36 +0200 Subject: [PATCH] conference: use publication date and duration --- teleforma/models/core.py | 4 ++++ teleforma/templates/teleforma/course_media.html | 6 ++++-- teleforma/templates/teleforma/inc/media_list.html | 3 ++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/teleforma/models/core.py b/teleforma/models/core.py index cb654fd4..04bac4ed 100755 --- a/teleforma/models/core.py +++ b/teleforma/models/core.py @@ -402,6 +402,10 @@ class Conference(models.Model): def description(self): return str(self) + @property + def duration(self): + return self.date_end - self.date_begin + @property def slug(self): slug = '-'.join([self.course.department.slug, diff --git a/teleforma/templates/teleforma/course_media.html b/teleforma/templates/teleforma/course_media.html index 1336b0eb..a45e6d3a 100644 --- a/teleforma/templates/teleforma/course_media.html +++ b/teleforma/templates/teleforma/course_media.html @@ -162,11 +162,13 @@ $(document).ready(function(){
{% trans "Professor" %}
{{ media.conference.professor }}
{% endif %} {% if media.conference.comment %}
{% trans "Comment" %}
{{ media.conference.comment }}
{% endif %} -
{% trans "Begin date" %}
{{ media.conference.date_begin }}
-
{% trans "End date" %}
{{ media.conference.date_end }}
{% if media.conference.room %}
{% trans "Room" %}
{{ media.conference.room }}
{% endif %} +
{% trans "Publication date" %}
{{ media.conference.date_publish }}
+
{% trans "Duration" %}
{{ media.conference.duration }}
{% if user.is_staff or user.is_superuser %}
{% trans "Mime type" %}
{{ media.mime_type }}
+
{% trans "Begin date" %}
{{ media.conference.date_begin }}
+
{% trans "End date" %}
{{ media.conference.date_end }}
{% trans "Date added" %}
{{ media.date_added }}
{% trans "Date modified" %}
{{ media.date_modified }}
{% trans "Media ID" %}
{{ media.id }}
diff --git a/teleforma/templates/teleforma/inc/media_list.html b/teleforma/templates/teleforma/inc/media_list.html index 9b8c27fe..d788050f 100644 --- a/teleforma/templates/teleforma/inc/media_list.html +++ b/teleforma/templates/teleforma/inc/media_list.html @@ -36,7 +36,8 @@ {% if media.conference.professor %}
{% trans "Professor" %}
{{ media.conference.professor }}
{% endif %} -
{% trans "Begin" %}
{{ media.conference.date_begin }}
+
{% trans "Publication date" %}
{{ media.conference.date_publish }}
+
{% trans "Duration" %}
{{ media.conference.duration }}
{% if media.conference.comment %}
{% trans "Comment" %}
{{ media.conference.comment }}
{% endif %} -- 2.39.5