conference: use publication date and duration

diff --git a/teleforma/models/core.py b/teleforma/models/core.py
index cb654fd4c37960ffdd92d0fd0b8f9c7a73f25ee4..04bac4ed5df7007521c096a89a22fa61f0f0f6a2 100755 (executable)
--- 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 1336b0eb48c0c268db05de6e0af84bafdbb1d351..a45e6d3ad96665967a1d2cccadf15ffa26433a2d 100644 (file)
--- a/teleforma/templates/teleforma/course_media.html
+++ b/teleforma/templates/teleforma/course_media.html
@@ -162,11 +162,13 @@ $(document).ready(function(){
 <dt>{% trans "Professor" %}</dt><dd>{{ media.conference.professor }}</dd>
 {% endif %}
 {% if media.conference.comment %}<dt>{% trans "Comment" %}</dt><dd>{{ media.conference.comment }}</dd>{% endif %}
-<dt>{% trans "Begin date" %}</dt><dd>{{ media.conference.date_begin }}</dd>
-<dt>{% trans "End date" %}</dt><dd>{{ media.conference.date_end }}</dd>
 {% if media.conference.room %}<dt>{% trans "Room" %}</dt><dd>{{ media.conference.room }}</dd>{% endif %}
+<dt>{% trans "Publication date" %}</dt><dd>{{ media.conference.date_publish }}</dd>
+<dt>{% trans "Duration" %}</dt><dd>{{ media.conference.duration }}</dd>
 {% if user.is_staff or user.is_superuser %}
 <dt>{% trans "Mime type" %}</dt><dd>{{ media.mime_type }}</dd>
+<dt>{% trans "Begin date" %}</dt><dd>{{ media.conference.date_begin }}</dd>
+<dt>{% trans "End date" %}</dt><dd>{{ media.conference.date_end }}</dd>
 <dt>{% trans "Date added" %}</dt><dd>{{ media.date_added }}</dd>
 <dt>{% trans "Date modified" %}</dt><dd>{{ media.date_modified }}</dd>
 <dt>{% trans "Media ID" %}</dt><dd>{{ media.id }}</dd>

diff --git a/teleforma/templates/teleforma/inc/media_list.html b/teleforma/templates/teleforma/inc/media_list.html
index 9b8c27fedf41d5be063c9defdc9c981c85472154..d788050fac149340d9b364863b14d0576d66a511 100644 (file)
--- a/teleforma/templates/teleforma/inc/media_list.html
+++ b/teleforma/templates/teleforma/inc/media_list.html
@@ -36,7 +36,8 @@
                     {% if media.conference.professor %}
                     <dt>{% trans "Professor" %}</dt><dd>{{ media.conference.professor }}</dd>
                     {% endif %}
-                    <dt>{% trans "Begin" %}</dt><dd>{{ media.conference.date_begin }}</dd>
+                    <dt>{% trans "Publication date" %}</dt><dd>{{ media.conference.date_publish }}</dd>
+                    <dt>{% trans "Duration" %}</dt><dd>{{ media.conference.duration }}</dd>
                     {% if media.conference.comment %}
                     <dt>{% trans "Comment" %}</dt><dd>{{ media.conference.comment }}</dd>
                     {% endif %}